texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: Structure node, section and heading list differen


From: Patrice Dumas
Subject: branch master updated: Structure node, section and heading list different from elements
Date: Sun, 11 May 2025 09:33:02 -0400

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 b9dc47db9b Structure node, section and heading list different from 
elements
b9dc47db9b is described below

commit b9dc47db9b82ec31976e39c667e8903bccf365dc
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun May 11 15:32:43 2025 +0200

    Structure node, section and heading list different from elements
    
    * tta/C/main/tree_types.h (enum directions), : rename section_number
    extra key to section_heading_number.  Update users.
    
    * tta/C/Makefile.am (C_libtexinfo_sources),
    tta/C/main/structure_list.c (new_node_structure)
    (new_section_structure, new_heading_structure)
    (setup_reallocate_structure_list, add_to_node_structure_list)
    (add_to_section_structure_list, add_to_heading_structure_list)
    (insert_into_node_structure_list), tta/C/main/build_perl_info.c
    (build_node_structure_list, build_section_structure_list)
    (fill_document_hv), tta/C/main/document.c (new_document)
    (destroy_document_information_except_tree),
    tta/C/main/document_types.h (DOCUMENT), tta/C/main/tree_types.h
    (enum directions, NODE_STRUCTURE, NODE_STRUCTURE_LIST)
    (HEADING_STRUCTURE, HEADING_STRUCTURE_LIST, SECTION_STRUCTURE)
    (SECTION_STRUCTURE_LIST), tta/C/parsetexi/end_line.c
    (end_line_misc_line), tta/C/structuring_transfo/structuring.c
    (sectioning_structure, construct_nodes_tree),
    tta/perl/Texinfo/ParserNonXS.pm (_add_to_structure_list)
    (_end_line_misc_line), tta/perl/Texinfo/Structuring.pm
    (sectioning_structure, construct_nodes_tree): do not use tree
    element in nodes_list and sections_list, but refer to the tree
    element.  Populate nodes_list and sections_list during parsing, and
    also populate headings_list.  Add NODE_STRUCTURE,
    HEADING_STRUCTURE, SECTION_STRUCTURE structs in C and associated
    lists. Add code to manage those lists for nodes_list and sections_list
    in the new file main/structure_list.c.  Add node_number,
    section_number and heading_number extra information in elements to be
    able to retrieve the list structure information.
    
    * tta/C/convert/format_html.c (html_default_format_contents)
    (contents_shortcontents_in_title, html_convert_heading_command)
    (html_convert_contents_command, html_output_internal_links),
    tta/C/convert/html_prepare_converter.c (prepare_special_units)
    (set_root_commands_targets_node_files, ids_hashmap_predicted_values),
    tta/C/structuring_transfo/structuring.c (check_nodes_are_referenced)
    (set_menus_node_directions, complete_node_tree_with_menus),
    tta/C/structuring_transfo/transformations.c
    (insert_nodes_for_sectioning_commands),
    tta/perl/Texinfo/Convert/HTML.pm
    (_set_root_commands_targets_node_files, _default_format_contents)
    (output_internal_links), tta/perl/Texinfo/Convert/IXIN.pm,
    tta/perl/Texinfo/Convert/LaTeX.pm (_begin_document, _convert),
    tta/perl/Texinfo/Convert/Plaintext.pm (_convert),
    tta/perl/Texinfo/Structuring.pm (check_nodes_are_referenced)
    (set_menus_node_directions, complete_node_tree_with_menus),
    tta/perl/Texinfo/Transformations.pm
    (insert_nodes_for_sectioning_commands), tta/perl/ext/epub3.pm,
    tta/perl/init/book.pm (book_unit_file_name), tta/perl/init/chm.pm,
    tta/perl/init/documentation_examples.pm: update converters,
    structuring and transformations for the new structures.
---
 ChangeLog                                          |  56 ++++++++++
 doc/tta_api/api_includes/Texinfo-Document.texi     |   7 +-
 doc/tta_api/api_includes/Texinfo-Parser.texi       |   4 +-
 doc/tta_api/api_includes/Texinfo-Structuring.texi  |  13 ++-
 .../api_includes/Texinfo-Transformations.texi      |   4 +-
 tta/C/Makefile.am                                  |   2 +
 tta/C/convert/format_html.c                        |  25 +++--
 tta/C/convert/html_prepare_converter.c             |  19 ++--
 tta/C/main/build_perl_info.c                       |  66 +++++++++++-
 tta/C/main/convert_utils.c                         |   2 +-
 tta/C/main/document.c                              |   9 +-
 tta/C/main/document_types.h                        |   5 +-
 tta/C/main/structure_list.c                        | 118 +++++++++++++++++++++
 tta/C/main/structure_list.h                        |  16 +++
 tta/C/main/tree.c                                  |   1 +
 tta/C/main/tree.h                                  |   2 +
 tta/C/main/tree_types.h                            |  35 +++++-
 tta/C/parsetexi/end_line.c                         |  21 ++++
 tta/C/structuring_transfo/structuring.c            |  69 +++++-------
 tta/C/structuring_transfo/structuring.h            |   4 +-
 tta/C/structuring_transfo/transformations.c        |  14 ++-
 tta/TODO                                           |   4 +
 tta/perl/Texinfo/Convert/DocBook.pm                |   5 +-
 tta/perl/Texinfo/Convert/HTML.pm                   |  19 ++--
 tta/perl/Texinfo/Convert/IXIN.pm                   |   2 +-
 tta/perl/Texinfo/Convert/LaTeX.pm                  |   6 +-
 tta/perl/Texinfo/Convert/Plaintext.pm              |  18 ++--
 tta/perl/Texinfo/Convert/Utils.pm                  |   4 +-
 tta/perl/Texinfo/Document.pm                       |   7 +-
 tta/perl/Texinfo/ParserNonXS.pm                    |  26 ++++-
 tta/perl/Texinfo/Structuring.pm                    |  67 +++++-------
 tta/perl/Texinfo/Transformations.pm                |  25 +++--
 tta/perl/ext/epub3.pm                              |   7 +-
 tta/perl/init/book.pm                              |   6 +-
 tta/perl/init/chm.pm                               |   7 +-
 tta/perl/init/documentation_examples.pm            |   3 +-
 tta/perl/t/results/alias/alias_of_added_index.pl   |   6 +-
 .../alias_of_added_index_before_added_index.pl     |   6 +-
 tta/perl/t/results/conditionals/cond.pl            |   3 +
 .../t/results/conditionals/cond_ifhtml_ifinfo.pl   |   3 +
 .../conditionals/cond_ifhtml_ifinfo_iftex.pl       |   3 +
 tta/perl/t/results/conditionals/cond_info.pl       |   3 +
 .../conditionals/cond_info_ifhtml_ifinfo_iftex.pl  |   3 +
 .../cond_info_no-ifhtml_no-ifinfo_no-iftex.pl      |   3 +
 .../cond_no-ifhtml_no-ifinfo_no-iftex.pl           |   3 +
 tta/perl/t/results/conditionals/cond_xml.pl        |   3 +
 tta/perl/t/results/conditionals/defcondx_Dbar.pl   |   1 +
 tta/perl/t/results/conditionals/defcondx_Ubar.pl   |   1 +
 .../results/converters_tests/at_commands_in_raw.pl |   6 +-
 .../t/results/converters_tests/combined_fonts.pl   |   6 +-
 .../t/results/converters_tests/commands_in_sc.pl   |   6 +-
 .../commands_in_settitle_with_title.pl             |   6 +-
 .../t/results/converters_tests/commands_in_var.pl  |   6 +-
 .../t/results/converters_tests/complex_nestings.pl |   6 +-
 .../converters_tests/contents_at_document_begin.pl |   6 +-
 .../contents_at_document_begin_inline.pl           |   6 +-
 .../contents_at_document_begin_separate_element.pl |   6 +-
 .../conversion_with_undef_customization.pl         |  10 +-
 .../converters_tests/definition_commands.pl        |   6 +-
 .../t/results/converters_tests/empty_xrefname.pl   |  13 ++-
 .../t/results/converters_tests/extension_undef.pl  |   5 +-
 .../results/converters_tests/footnote_no_number.pl |   6 +-
 .../footnote_no_number_separate.pl                 |   6 +-
 tta/perl/t/results/converters_tests/form_feeds.pl  |   2 +
 .../converters_tests/frenchspacing_and_code.pl     |  10 +-
 .../t/results/converters_tests/image_formatting.pl |   6 +-
 .../index_entry_in_preformatted.pl                 |   6 +-
 .../indices_in_begin_tables_lists.pl               |  10 +-
 ...ces_in_begin_tables_lists_entries_after_item.pl |  10 +-
 tta/perl/t/results/converters_tests/link.pl        |   3 +
 tta/perl/t/results/converters_tests/namedanchor.pl |  18 +++-
 .../t/results/converters_tests/non_empty_part.pl   |  23 +++-
 .../non_empty_part_no_top_node_output.pl           |  23 +++-
 .../printindex_merged_indices_code_style.pl        |   6 +-
 .../results/converters_tests/ref_in_sectioning.pl  |  49 ++++++---
 .../reference_for_formatting_customizations.pl     |   6 +-
 .../references_to_top_no_top_output.pl             |   6 +-
 .../t/results/converters_tests/refs_formatting.pl  |   2 +
 .../converters_tests/sections_and_printindex.pl    |  13 ++-
 .../converters_tests/setfilename_no_extension.pl   |   3 +
 .../converters_tests/simplest_test_prefix.pl       |   1 +
 .../some_at_commands_in_ref_nodes.pl               |   6 +-
 .../converters_tests/spaces_in_empty_node_names.pl |   1 +
 .../converters_tests/spaces_in_node_names.pl       |   4 +
 .../converters_tests/test_deftypefnnewline.pl      |   6 +-
 .../test_formatting_customizations.pl              |   6 +-
 .../converters_tests/things_before_setfilename.pl  |   6 +-
 tta/perl/t/results/converters_tests/top_in_ref.pl  |   2 +
 .../various_itemize_command_as_argument.pl         |   6 +-
 .../various_vtable_command_as_argument.pl          |  10 +-
 tta/perl/t/results/converters_tests/xrefname.pl    |  11 +-
 tta/perl/t/results/coverage/commands.pl            |   1 +
 .../coverage/punctuation_in_line_commands.pl       |   3 +
 .../coverage_braces/contain_plain_text_nestings.pl |   6 +-
 .../t/results/coverage_braces/footnote_no_node.pl  |   1 +
 .../results/coverage_braces/heading_in_footnote.pl |   1 +
 .../coverage_braces/inforef_too_much_args.pl       |   1 +
 .../results/coverage_braces/seeentry_no_braces.pl  |   6 +-
 tta/perl/t/results/coverage_braces/test_image.pl   |   2 +
 .../coverage_braces/two_footnotes_in_nodes.pl      |   6 +-
 .../two_footnotes_in_nodes_separate.pl             |   6 +-
 .../two_footnotes_in_nodes_separate_no_header.pl   |   6 +-
 .../def/all_commands_delimiters_printindex.pl      |   6 ++
 tta/perl/t/results/def/all_commands_printindex.pl  |   6 ++
 tta/perl/t/results/def/omit_def_space.pl           |   2 +
 tta/perl/t/results/def/ref_in_def.pl               |   1 +
 tta/perl/t/results/def/space_in_def_for_index.pl   | Bin 8667 -> 8703 bytes
 .../t/results/def/text_block_before_defline.pl     |   6 +-
 .../docbook_tests/between_node_and_section.pl      |  10 +-
 .../docbook_tests/multiple_documentlanguage.pl     |  18 +++-
 .../docbook_tests/special_docbook_unnumbered.pl    |  12 ++-
 .../results/epub_tests/chapter_before_top_epub.pl  |   5 +
 tta/perl/t/results/epub_tests/section_part_epub.pl |   3 +
 .../setfilename_on_top_and_after_node_epub.pl      |   2 +
 tta/perl/t/results/float/anchor_in_caption.pl      |   2 +
 tta/perl/t/results/float/cindex_in_caption.pl      | Bin 9119 -> 9155 bytes
 .../results/float/comment_space_comand_in_float.pl |   2 +
 tta/perl/t/results/float/complex_float.pl          |   6 +-
 tta/perl/t/results/float/float_copying.pl          |   6 +-
 tta/perl/t/results/float/footnote_in_caption.pl    |   2 +
 .../results/float/footnote_in_caption_and_error.pl |   2 +
 tta/perl/t/results/float/multiple_captions.pl      |   6 +-
 .../float/numbering_captions_listoffloats.pl       |  26 ++++-
 .../float/special_characters_in_float_type.pl      |   6 +-
 tta/perl/t/results/formats_encodings/accent.pl     |   2 +
 .../formats_encodings/accent_argument_non_ascii.pl |   6 +-
 .../formats_encodings/accent_enable_encoding.pl    |   2 +
 tta/perl/t/results/formats_encodings/accentenc.pl  |   2 +
 .../formats_encodings/accentenc_enable_encoding.pl |   2 +
 .../formats_encodings/at_commands_in_refs.pl       | 110 ++++++++++++++-----
 .../at_commands_in_refs_latin1.pl                  | 110 ++++++++++++++-----
 .../formats_encodings/at_commands_in_refs_utf8.pl  | 110 ++++++++++++++-----
 .../char_latin1_latin1_in_refs.pl                  |  22 +++-
 .../char_latin2_latin2_in_refs.pl                  |   6 +-
 .../char_us_ascii_latin1_in_refs.pl                |  22 +++-
 ...ar_us_ascii_latin1_in_refs_no_translit_files.pl |  22 +++-
 .../formats_encodings/char_utf8_latin1_in_refs.pl  |  22 +++-
 .../dotless_argument_non_ascii.pl                  |   6 +-
 .../formats_encodings/japanese_shift_jis.pl        |  10 +-
 .../manual_simple_latin1_with_error.pl             |   7 +-
 .../manual_simple_utf8_with_error.pl               |   7 +-
 .../multiple_include_encodings.pl                  |  30 ++++--
 .../t/results/formats_encodings/sample_utf8.pl     |  12 ++-
 .../formats_encodings/verb_delimiter_not_ascii.pl  |   6 +-
 .../t/results/formats_encodings/weird_accents.pl   |   6 +-
 .../weird_accents_disable_encoding.pl              |   6 +-
 tta/perl/t/results/heading/heading_in_copying.pl   |   4 +
 tta/perl/t/results/heading/heading_in_example.pl   |   1 +
 tta/perl/t/results/heading/heading_in_quotation.pl |   1 +
 tta/perl/t/results/html_tests/U_in_index.pl        |   6 +-
 .../html_tests/acronym_in_node_and_section.pl      |  14 ++-
 .../anchor_in_menu_on_sectioning_command_line.pl   |   2 +
 .../t/results/html_tests/anchor_on_vtable_item.pl  |  10 +-
 tta/perl/t/results/html_tests/automatic_menus.pl   |  14 ++-
 .../automatic_menus_format_menu_no_detailmenu.pl   |  14 ++-
 .../html_tests/base_for_css_info_in_init_test.pl   |   2 +
 .../character_number_leading_toc_stoc.pl           |   6 +-
 tta/perl/t/results/html_tests/check_htmlxref.pl    |   7 +-
 .../html_tests/check_htmlxref_ignore_ref_top_up.pl |   7 +-
 .../t/results/html_tests/check_htmlxref_menu.pl    |   7 +-
 .../html_tests/check_htmlxref_no_use_nodes.pl      |   7 +-
 .../html_tests/command_in_node_redirection.pl      |   2 +
 .../command_in_node_redirection_multiple.pl        |   2 +
 .../command_in_node_redirection_other_command.pl   |   2 +
 .../command_in_node_redirection_same_command.pl    |   2 +
 .../command_in_node_redirection_two_commands.pl    |   2 +
 tta/perl/t/results/html_tests/contents_at_end.pl   |   6 +-
 .../t/results/html_tests/contents_at_end_inline.pl |   6 +-
 .../html_tests/contents_at_end_separate_element.pl |   6 +-
 .../html_tests/contents_in_middle_chapter.pl       |  10 +-
 .../contents_in_middle_chapter_inline.pl           |  10 +-
 .../contents_in_middle_chapter_separate_element.pl |  10 +-
 .../html_tests/contents_in_middle_section.pl       |  14 ++-
 .../contents_in_middle_section_inline.pl           |  14 ++-
 .../contents_in_middle_section_separate_element.pl |  14 ++-
 .../html_tests/contents_with_only_top_node.pl      |   1 +
 .../html_tests/css_in_node_redirection_page.pl     |   2 +
 .../deftypefnnewline_for_copying_after.pl          |   6 +-
 .../deftypefnnewline_for_copying_before.pl         |   6 +-
 .../t/results/html_tests/documentdescription.pl    |   1 +
 tta/perl/t/results/html_tests/double_contents.pl   |  10 +-
 .../html_tests/double_contents_after_title.pl      |  10 +-
 .../double_contents_after_title_show_title.pl      |  10 +-
 ...double_contents_after_title_show_title_nodes.pl |  10 +-
 .../t/results/html_tests/double_contents_book.pl   |  10 +-
 .../results/html_tests/double_contents_chapter.pl  |  10 +-
 .../t/results/html_tests/double_contents_inline.pl |  10 +-
 .../html_tests/double_contents_inline_chapter.pl   |  10 +-
 .../html_tests/double_contents_inline_nodes.pl     |  10 +-
 .../html_tests/double_contents_inline_section.pl   |  10 +-
 .../t/results/html_tests/double_contents_nodes.pl  |  10 +-
 .../results/html_tests/double_contents_section.pl  |  10 +-
 .../html_tests/double_contents_separate_element.pl |  10 +-
 .../double_contents_separate_element_chapter.pl    |  10 +-
 .../double_contents_separate_element_nodes.pl      |  10 +-
 .../double_contents_separate_element_section.pl    |  10 +-
 ...sive_self_section_reference_node_no_use_node.pl |   4 +
 .../html_tests/empty_chapter_in_html_title.pl      |   6 +-
 ...y_chapter_in_html_title_no_node_no_use_nodes.pl |   5 +-
 .../empty_lines_at_beginning_no_setfilename.pl     |   2 +
 .../empty_node_in_html_title_no_sec_name.pl        |   5 +-
 .../file_name_case_insensitive_conflict_node.pl    |  18 +++-
 ...se_insensitive_conflict_node_no_redirections.pl |  18 +++-
 ..._name_case_insensitive_conflict_redirections.pl |   5 +-
 .../html_tests/file_name_conflict_with_Top.pl      |   6 +-
 .../html_tests/file_name_conflict_with_section.pl  |   5 +-
 .../file_name_conflict_with_user_defined.pl        |  10 +-
 .../html_tests/filenameconflictwithnonsplit.pl     |   2 +
 .../filenameconflictwithspecialelement.pl          |   6 +-
 tta/perl/t/results/html_tests/float_copying.pl     |   8 +-
 ...otnotestyle_separate_html_text_no_monolithic.pl |   6 +-
 .../html_tests/footnotestyle_separate_late.pl      |  10 +-
 tta/perl/t/results/html_tests/heading_between.pl   |   7 +-
 .../results/html_tests/heading_node_after_chap.pl  |   6 ++
 .../html_tests/headings_after_lone_nodes.pl        |  21 +++-
 .../html_tests/headings_nodes_before_chapter.pl    |   8 ++
 tta/perl/t/results/html_tests/html_in_copying.pl   |   2 +
 .../results/html_tests/index_and_node_same_name.pl |   2 +
 tta/perl/t/results/html_tests/index_below.pl       |   7 +-
 tta/perl/t/results/html_tests/info_js_dir_html.pl  |   6 +-
 .../t/results/html_tests/info_js_dir_html_file.pl  |   6 +-
 ...nfo_js_dir_html_file_js_weblabels_file_undef.pl |   6 +-
 .../t/results/html_tests/info_js_dir_html_text.pl  |   6 +-
 tta/perl/t/results/html_tests/inline_in_node.pl    |   6 +-
 .../results/html_tests/letter_command_in_index.pl  |   6 +-
 tta/perl/t/results/html_tests/menu.pl              |   2 +
 .../html_tests/menu_in_documentdescription.pl      |   2 +
 tta/perl/t/results/html_tests/menu_in_example.pl   |   1 +
 tta/perl/t/results/html_tests/no_content.pl        |   6 +-
 .../t/results/html_tests/no_content_do_contents.pl |   6 +-
 .../html_tests/no_content_do_contents_inline.pl    |   6 +-
 .../no_content_do_contents_separate_element.pl     |   6 +-
 tta/perl/t/results/html_tests/no_content_inline.pl |   6 +-
 .../html_tests/no_content_separate_element.pl      |   6 +-
 tta/perl/t/results/html_tests/node_footnote_end.pl |   6 ++
 .../results/html_tests/node_footnote_separated.pl  |   6 ++
 .../t/results/html_tests/node_footnote_use_node.pl |   6 ++
 .../html_tests/node_footnote_use_node_separate.pl  |   6 ++
 .../t/results/html_tests/node_heading_between.pl   |   8 +-
 .../html_tests/nodedescription_description.pl      |  14 ++-
 .../nodedescription_description_no_use_nodes.pl    |  14 ++-
 .../results/html_tests/redirection_same_labels.pl  |  13 ++-
 .../t/results/html_tests/ref_in_preformatted.pl    |   2 +
 .../html_tests/sectioning_check_menu_structure.pl  |  32 +++++-
 .../set_add_transliterated_redirection_files.pl    |  10 +-
 .../html_tests/set_unit_file_name_filepath.pl      |   6 +-
 .../t/results/html_tests/shortcontents_no_top.pl   |   5 +-
 tta/perl/t/results/html_tests/shorttitlepage.pl    |   2 +
 .../html_tests/simple_only_special_spaces_node.pl  |  13 ++-
 ...e_only_special_spaces_node_no_translit_files.pl |  13 ++-
 .../html_tests/simplest_test_date_in_header.pl     |   1 +
 tta/perl/t/results/html_tests/split_html_text.pl   |   6 +-
 .../results/html_tests/test_accents_sc_default.pl  |   6 +-
 .../html_tests/test_accents_sc_default_latin1.pl   |   6 +-
 .../html_tests/test_accents_sc_default_usascii.pl  |   6 +-
 .../html_tests/test_accents_sc_enable_encoding.pl  |   6 +-
 .../test_accents_sc_enable_encoding_latin1.pl      |   6 +-
 ...st_accents_sc_enable_encoding_to_utf8_latin1.pl |   6 +-
 ...t_accents_sc_enable_encoding_to_utf8_usascii.pl |   6 +-
 .../test_accents_sc_enable_encoding_usascii.pl     |   6 +-
 .../html_tests/test_accents_sc_to_utf8_latin1.pl   |   6 +-
 .../test_accents_sc_use_numeric_entity.pl          |   6 +-
 .../test_separated_contents_shortcontents.pl       |  10 +-
 .../html_tests/test_xrefautomaticsectiontitle.pl   |   6 +-
 .../test_xrefautomaticsectiontitle_off_first.pl    |   6 +-
 .../text_before_top_and_contents_after_title.pl    |   5 +-
 ...t_before_top_and_summarycontents_after_title.pl |   5 +-
 .../t/results/html_tests/text_css_info_in_init.pl  |   2 +
 tta/perl/t/results/html_tests/titles.pl            |   2 +
 .../top_file_name_and_node_name_collision.pl       |   5 +
 .../t/results/html_tests/top_node_top_contents.pl  |   2 +
 .../t/results/html_tests/top_node_up_explicit.pl   |   6 +-
 .../html_tests/top_node_up_explicit_no_nodes.pl    |   6 +-
 .../t/results/html_tests/top_node_up_implicit.pl   |   6 +-
 .../html_tests/top_node_up_implicit_no_nodes.pl    |   6 +-
 .../html_tests/transliterated_names_conflicts.pl   |  10 +-
 .../results/html_tests/undef_split_and_big_rule.pl |   9 +-
 .../xhtml_rule_element_already_closed.pl           |   6 +-
 tta/perl/t/results/htmlxref/htmlxref.pl            |  12 ++-
 .../htmlxref/htmlxref_no_urlprefix_first.pl        |   6 +-
 tta/perl/t/results/htmlxref/htmlxref_nodes.pl      |  12 ++-
 tta/perl/t/results/htmlxref/htmlxref_only_mono.pl  |  12 ++-
 .../t/results/htmlxref/htmlxref_only_mono_nodes.pl |  12 ++-
 tta/perl/t/results/htmlxref/htmlxref_only_split.pl |  12 ++-
 .../results/htmlxref/htmlxref_only_split_nodes.pl  |  12 ++-
 tta/perl/t/results/include/cpp_line_latin1.pl      |   3 +
 tta/perl/t/results/include/cpp_lines.pl            |   2 +
 .../macro_and_commands_in_early_commands.pl        |   3 +
 .../t/results/include/macro_in_early_commands.pl   |   3 +
 .../results/include/value_expansion_in_include.pl  |   2 +
 .../results/indices/complex_recursive_synindex.pl  |   2 +
 tta/perl/t/results/indices/def_syn_indices.pl      |   6 +-
 ...default_cp_index_and_one_letter_syncodeindex.pl | Bin 4998 -> 5034 bytes
 tta/perl/t/results/indices/double_index_entry.pl   | Bin 6140 -> 6176 bytes
 .../t/results/indices/double_seeentry_seealso.pl   | Bin 11617 -> 11703 bytes
 tta/perl/t/results/indices/double_syncodeindex.pl  | Bin 6213 -> 6249 bytes
 .../t/results/indices/empty_added_index_entry.pl   |   2 +
 tta/perl/t/results/indices/empty_cindex_entry.pl   |   2 +
 tta/perl/t/results/indices/empty_index_entry.pl    |   2 +
 .../t/results/indices/empty_string_index_entry.pl  |   2 +
 tta/perl/t/results/indices/encoding_index_ascii.pl |   3 +
 .../encoding_index_ascii_enable_encoding.pl        |   3 +
 .../t/results/indices/encoding_index_latin1.pl     |   3 +
 .../encoding_index_latin1_enable_encoding.pl       |   3 +
 tta/perl/t/results/indices/encoding_index_utf8.pl  |   3 +
 .../indices/encoding_index_utf8_enable_encoding.pl |   3 +
 .../indices/encoding_index_utf8_no_use_unicode.pl  |   3 +
 tta/perl/t/results/indices/explicit_sort_key.pl    | Bin 12584 -> 12641 bytes
 tta/perl/t/results/indices/ftable_vtable.pl        | Bin 11063 -> 11099 bytes
 .../indices/ignored_sort_char_empty_entries.pl     | Bin 6935 -> 6992 bytes
 tta/perl/t/results/indices/image_lines_count.pl    | Bin 2919 -> 2937 bytes
 .../t/results/indices/image_text_lines_count.pl    | Bin 3297 -> 3315 bytes
 .../t/results/indices/index_and_node_same_name.pl  | Bin 5896 -> 5982 bytes
 .../results/indices/index_entries_before_nodes.pl  | Bin 6825 -> 6861 bytes
 .../t/results/indices/index_entries_locations.pl   | Bin 7913 -> 7949 bytes
 .../indices/index_entry_before_first_node.pl       | Bin 3811 -> 3829 bytes
 .../t/results/indices/index_entry_before_node.pl   | Bin 6272 -> 6326 bytes
 .../t/results/indices/index_entry_in_footnote.pl   | Bin 3471 -> 3489 bytes
 .../index_entry_in_footnote_different_node_end.pl  | Bin 8450 -> 8504 bytes
 .../indices/index_entry_in_footnote_sections.pl    | Bin 6284 -> 6370 bytes
 .../index_entry_in_footnote_sections_separate.pl   | Bin 6585 -> 6671 bytes
 .../indices/index_entry_in_footnote_separate.pl    | Bin 8878 -> 8932 bytes
 tta/perl/t/results/indices/index_no_node.pl        |   9 +-
 tta/perl/t/results/indices/index_no_node_no_top.pl |   9 +-
 .../indices/index_no_node_no_top_no_node.pl        |   9 +-
 tta/perl/t/results/indices/index_nodes.pl          |   5 +
 .../indices/index_nodes_no_split_no_use_nodes.pl   |   5 +
 tta/perl/t/results/indices/index_special_region.pl |   9 +-
 .../index_special_region_no_insertcopying.pl       |   9 +-
 ...egion_no_insertcopying_no_titlepage_no_nodes.pl |   9 +-
 ...l_region_no_insertcopying_titlepage_no_nodes.pl |   9 +-
 ...copying_titlepage_no_nodes_footnotes_default.pl |   9 +-
 .../index_special_region_no_titlepage_no_nodes.pl  |   9 +-
 .../index_special_region_titlepage_no_nodes.pl     |   9 +-
 ..._region_titlepage_no_nodes_footnotes_default.pl |   9 +-
 tta/perl/t/results/indices/index_split.pl          |  33 ++++--
 .../indices/index_split_split_chapter_no_nodes.pl  |  33 ++++--
 tta/perl/t/results/indices/index_table.pl          |  18 +++-
 .../results/indices/index_table_chapter_no_node.pl |  18 +++-
 .../multiple_index_text_sortas_seeentry_seealso.pl | Bin 10511 -> 10597 bytes
 tta/perl/t/results/indices/nodes_before_top.pl     |   7 ++
 .../nodes_before_top_and_sections_chapter.pl       |  13 ++-
 ...odes_before_top_and_sections_chapter_no_node.pl |  13 ++-
 ...des_before_top_and_sections_unsplit_no_nodes.pl |  13 ++-
 .../indices/nodes_before_top_split_chapter.pl      |   7 ++
 .../nodes_before_top_split_chapter_no_nodes.pl     |   7 ++
 tta/perl/t/results/indices/print_merged_index.pl   |   2 +
 .../indices/printindex_between_node_section.pl     | Bin 10869 -> 11002 bytes
 .../indices/printindex_between_part_chapter.pl     | Bin 11821 -> 11975 bytes
 .../indices/printindex_index_entry_in_copying.pl   | Bin 21094 -> 21180 bytes
 ...rintindex_index_entry_in_copying_in_footnote.pl | Bin 8603 -> 8689 bytes
 ...ndex_index_entry_in_copying_no_insertcopying.pl |   6 +-
 .../indices/printindex_with_space_before.pl        | Bin 3696 -> 3732 bytes
 .../indices/same_index_entry_merged_indices.pl     | Bin 8614 -> 8700 bytes
 .../results/indices/same_only_seealso_seeentry.pl  | Bin 11120 -> 11206 bytes
 .../t/results/indices/same_seealso_seeentry.pl     | Bin 12095 -> 12181 bytes
 tta/perl/t/results/indices/seealso_duplicate.pl    | Bin 8431 -> 8467 bytes
 tta/perl/t/results/indices/seeentry.pl             | Bin 10602 -> 10688 bytes
 tta/perl/t/results/indices/sorted_subentries.pl    |  10 +-
 tta/perl/t/results/indices/split_chapter_index.pl  |  14 ++-
 tta/perl/t/results/indices/subentries.pl           |   6 +-
 .../t/results/indices/subentries_and_comments.pl   | Bin 6030 -> 6116 bytes
 tta/perl/t/results/indices/subentry_and_sortas.pl  | Bin 9521 -> 9607 bytes
 .../results/indices/subentry_and_sortas_spaces.pl  | Bin 11275 -> 11361 bytes
 .../t/results/indices/syncode_index_print_both.pl  | Bin 9674 -> 9760 bytes
 .../t/results/indices/syncodeindex_to_plain.pl     | Bin 6172 -> 6208 bytes
 .../t/results/indices/transparent_sort_chars.pl    | Bin 8925 -> 8982 bytes
 tta/perl/t/results/indices/w_lines_count.pl        | Bin 4590 -> 4629 bytes
 tta/perl/t/results/info_tests/anchor_and_spaces.pl |   2 +
 tta/perl/t/results/info_tests/anchor_in_command.pl |   1 +
 .../results/info_tests/before_node_and_section.pl  | Bin 6464 -> 6550 bytes
 .../info_tests/chinese_mixed_with_en_EUC_CN.pl     |   6 +-
 .../t/results/info_tests/colon_in_index_entry.pl   | Bin 4340 -> 4358 bytes
 .../info_tests/colons_in_index_entries_and_node.pl |   3 +
 .../colons_in_index_entries_and_node_no_quoting.pl |   3 +
 tta/perl/t/results/info_tests/def_in_copying.pl    | Bin 6203 -> 6242 bytes
 .../t/results/info_tests/direntry_dircategory.pl   |   6 +-
 .../direntry_dircategory_and_commands.pl           |   2 +
 tta/perl/t/results/info_tests/empty_caption.pl     |   1 +
 tta/perl/t/results/info_tests/encoding_us_ascii.pl |   1 +
 .../end_of_line_command_in_node_lines.pl           |  10 +-
 tta/perl/t/results/info_tests/error_in_footnote.pl |   1 +
 tta/perl/t/results/info_tests/file_only_png.pl     | Bin 1607 -> 1625 bytes
 .../t/results/info_tests/float_long_captions.pl    |   1 +
 .../t/results/info_tests/float_without_type.pl     |   1 +
 .../t/results/info_tests/image_and_punctuation.pl  | Bin 2420 -> 2438 bytes
 .../info_tests/image_and_spaces_formatting.pl      |   1 +
 tta/perl/t/results/info_tests/image_extension.pl   | Bin 1549 -> 1567 bytes
 .../t/results/info_tests/image_in_paragraph.pl     | Bin 1224 -> 1242 bytes
 tta/perl/t/results/info_tests/image_not_found.pl   |   1 +
 tta/perl/t/results/info_tests/image_quotes.pl      | Bin 1090 -> 1108 bytes
 .../info_tests/image_text_file_only_and_alt.pl     | Bin 1166 -> 1184 bytes
 .../results/info_tests/index_entry_at_end_node.pl  | Bin 4865 -> 4998 bytes
 .../info_tests/invalid_node_name_no_warning.pl     |   4 +
 .../info_tests/invalid_node_name_warning.pl        |   4 +
 tta/perl/t/results/info_tests/known_encoding.pl    |   1 +
 .../multitable_anchor_and_index_entry.pl           | Bin 7411 -> 7429 bytes
 .../info_tests/nested_footnotes_separate.pl        |   1 +
 .../info_tests/nested_multitable_anchor_index.pl   | Bin 5316 -> 5334 bytes
 tta/perl/t/results/info_tests/no_node_but_top.pl   |   1 +
 tta/perl/t/results/info_tests/no_top_node.pl       |   1 +
 tta/perl/t/results/info_tests/note_in_strong.pl    |   1 +
 .../info_tests/note_in_strong_end_of_line.pl       |   1 +
 .../t/results/info_tests/novalidate_empty_refs.pl  |   1 +
 .../info_tests/one_node_counted_elements.pl        | Bin 4140 -> 4158 bytes
 .../info_tests/paragraphindent_and_preamble.pl     |   2 +
 .../paragraphindent_in_preamble_and_in_document.pl |   2 +
 .../info_tests/paragraphindent_not_in_preamble.pl  |   2 +
 tta/perl/t/results/info_tests/pxref_test.pl        |   1 +
 .../t/results/info_tests/quote_node_names_info.pl  |  19 +++-
 .../t/results/info_tests/recursive_down_menu.pl    |   6 +-
 tta/perl/t/results/info_tests/ref_tests.pl         |   1 +
 .../similar_external_and_internal_node.pl          |   1 +
 tta/perl/t/results/info_tests/space_at_menu_end.pl |   1 +
 tta/perl/t/results/info_tests/space_in_menu.pl     |   6 +-
 .../t/results/info_tests/space_in_setfilename.pl   |   1 +
 tta/perl/t/results/info_tests/split_no_copying.pl  |   6 +-
 tta/perl/t/results/info_tests/split_nocopying.pl   |   6 +-
 .../t/results/info_tests/split_nocopying_split.pl  |   6 +-
 .../info_tests/split_test_before_first_node.pl     |   6 +-
 .../split_test_before_first_node_no_empty_line.pl  |   6 +-
 tta/perl/t/results/info_tests/test_index.pl        |  24 +++--
 tta/perl/t/results/info_tests/text_before_node.pl  |   6 +-
 .../t/results/info_tests/top_node_normalization.pl |   1 +
 .../info_tests/two_paragraphindent_in_preamble.pl  |   2 +
 ..._paragraphindent_in_preamble_and_in_document.pl |   2 +
 tta/perl/t/results/info_tests/unknown_encoding.pl  |   1 +
 tta/perl/t/results/info_tests/xref_test.pl         |   1 +
 .../access_document_name_in_handler.pl             |   6 +-
 .../access_global_direction_unit_in_handler.pl     |   6 +-
 .../access_output_unit_in_handler.pl               |   6 +-
 .../access_tree_output_unit_in_handler.pl          |   6 +-
 ...tton_replacement_and_direction_customization.pl |   6 +-
 ..._replacement_direction_strings_customization.pl |   6 +-
 ...utton_replacement_for_special_unit_direction.pl |   6 +-
 .../init_files_tests/customize_special_element.pl  |  10 +-
 .../init_files_tests/customize_translations.pl     |  22 +++-
 .../results/init_files_tests/directions_buttons.pl |  10 +-
 .../init_files_tests/directions_buttons_buttons.pl |  10 +-
 .../init_files_tests/directions_string_base.pl     |  22 +++-
 .../init_files_tests/directions_string_undef.pl    |  22 +++-
 .../directions_string_undef_texi2html.pl           |  22 +++-
 .../init_files_tests/documentation_examples.pl     |  18 +++-
 .../documentation_examples_texi2html.pl            |  18 +++-
 .../init_files_tests/printindex_set_direction.pl   |  18 +++-
 .../redefined_buttons_functions.pl                 |  22 +++-
 .../ref_for_special_unit_direction.pl              |   6 +-
 .../special_unit_direction_customization.pl        |   6 +-
 ...est_format_single_footnote_in_inline_content.pl |   6 +-
 .../translation_in_parser_in_translation.pl        |   6 +-
 .../init_files_tests/undefined_node_filename.pl    |   2 +
 .../init_files_tests/unknown_custom_variable.pl    |   6 +-
 .../t/results/invalid_nestings/footnote_in_ref.pl  |   1 +
 .../t/results/invalid_nestings/ignore_in_xref.pl   |   1 +
 .../t/results/invalid_nestings/ignored_text.pl     |   1 +
 tta/perl/t/results/invalid_nestings/in_table.pl    |   2 +
 .../invalid_nestings/menu_in_style_command.pl      |   1 +
 .../t/results/invalid_nestings/node_in_copying.pl  |   1 +
 .../invalid_nestings/node_in_copying_not_closed.pl |   2 +
 .../invalid_nestings/node_on_index_entry_line.pl   |   1 +
 .../t/results/invalid_nestings/on_node_line.pl     |   1 +
 .../t/results/invalid_nestings/on_section_line.pl  |   1 +
 .../results/invalid_nestings/on_subheading_line.pl |   1 +
 .../t/results/invalid_nestings/quotation_in_ref.pl |   1 +
 tta/perl/t/results/invalid_nestings/ref_in_ref.pl  |   1 +
 .../invalid_nestings/ref_to_top_in_anchor.pl       |   1 +
 .../results/invalid_nestings/section_in_copying.pl |   1 +
 .../invalid_nestings/section_in_flushright.pl      |   1 +
 .../invalid_nestings/section_in_footnote.pl        |   1 +
 .../t/results/invalid_nestings/section_in_math.pl  |   2 +
 .../section_in_nested_block_commands.pl            |   1 +
 .../t/results/invalid_nestings/section_in_table.pl |   1 +
 .../invalid_nestings/section_on_cartouche_line.pl  |   2 +
 .../invalid_nestings/section_on_def_line.pl        |   1 +
 .../invalid_nestings/section_on_defx_line.pl       |   1 +
 .../invalid_nestings/section_on_enumerate_line.pl  |   2 +
 .../invalid_nestings/section_on_float_line.pl      |   1 +
 .../section_on_index_entry_line.pl                 |   1 +
 .../invalid_nestings/section_on_itemize_line.pl    |   4 +
 .../invalid_nestings/section_on_multitable_line.pl |   3 +
 .../invalid_nestings/section_on_xtable_line.pl     |   4 +
 .../style_not_closed_before_first_node.pl          |   1 +
 .../style_not_closed_no_newline_root_commands.pl   |   6 +-
 .../style_not_closed_root_commands.pl              |   6 +-
 .../unclosed_verb_on_section_line.pl               |   1 +
 .../t/results/invalid_nestings/verbatim_in_ref.pl  |   1 +
 .../itemize/inter_item_commands_in_enumerate.pl    |   6 +-
 .../itemize/inter_item_commands_in_itemize.pl      |   6 +-
 .../t/results/languages/appendix_translated.pl     |   5 +-
 tta/perl/t/results/languages/command_translated.pl |   6 +-
 tta/perl/t/results/languages/documentlanguage.pl   |   6 +-
 .../documentlanguage_generated_master_menu.pl      |  16 ++-
 .../t/results/languages/documentlanguage_option.pl |   6 +-
 .../results/languages/documentlanguage_unknown.pl  |   6 +-
 .../results/languages/invalid_documentlanguage.pl  |   2 +
 .../results/languages/multiple_documentlanguage.pl |   6 +-
 .../t/results/languages/multiple_in_preamble.pl    |   6 +-
 .../languages/multiple_in_preamble_before_node.pl  |   6 +-
 .../t/results/languages/multiple_lang_chapters.pl  |  22 +++-
 .../languages/multiple_lang_chapters_latex.pl      |  22 +++-
 .../languages/multiple_lang_chapters_texi2html.pl  |  22 +++-
 .../t/results/languages/simple_documentlanguage.pl |   2 +
 tta/perl/t/results/languages/unknown_language.pl   |   6 +-
 tta/perl/t/results/languages/unknown_region.pl     |   2 +
 .../t/results/latex_tests/anchor_before_top.pl     |   6 +-
 .../t/results/latex_tests/anchor_in_copying.pl     |   6 +-
 .../anchor_in_copying_insertcopying_chap.pl        |   6 +-
 .../anchor_in_copying_insertcopying_titlepage.pl   |   6 +-
 ...chor_in_copying_insertcopying_titlepage_chap.pl |   6 +-
 .../anchor_links_xref_xrefautomaticsectiontitle.pl |   8 +-
 .../latex_tests/custom_heading_with_include.pl     |  58 +++++++---
 .../custom_heading_with_include_in_command.pl      |  58 +++++++---
 tta/perl/t/results/latex_tests/custom_headings.pl  |  15 ++-
 .../latex_tests/custom_headings_and_comments.pl    |  12 ++-
 .../latex_tests/customize_informative_commands.pl  |   1 +
 .../latex_tests/error_in_sectioning_command.pl     |   6 +-
 tta/perl/t/results/latex_tests/float_and_refs.pl   |  12 ++-
 tta/perl/t/results/latex_tests/fonttextsize.pl     |  21 ++--
 tta/perl/t/results/latex_tests/indices.pl          |   6 +-
 .../latex_tests/indices_disable_encoding.pl        |   6 +-
 .../informative_commands_in_top_node.pl            |   6 +-
 tta/perl/t/results/latex_tests/node_before_top.pl  |   7 +-
 tta/perl/t/results/latex_tests/pagesizes.pl        |   9 +-
 tta/perl/t/results/latex_tests/pagetype.pl         |   9 +-
 .../t/results/latex_tests/settitle_and_headings.pl |   1 +
 tta/perl/t/results/latex_tests/shorttitlepage.pl   |   6 +-
 .../t/results/latex_tests/titlepage_classical.pl   |   6 +-
 .../t/results/latex_tests/titlepage_in_top_node.pl |   6 +-
 .../t/results/latex_tests/titlepage_long_title.pl  |   6 +-
 .../t/results/latex_tests/titlepage_no_author.pl   |   6 +-
 .../t/results/latex_tests/titlepage_no_title.pl    |   6 +-
 .../titlepage_with_commands_classical.pl           |   6 +-
 .../latex_tests/top_no_sectioning_command.pl       |   3 +
 tta/perl/t/results/layout/navigation.pl            |  14 ++-
 tta/perl/t/results/layout/navigation_chapter.pl    |  14 ++-
 .../results/layout/navigation_chapter_no_header.pl |  14 ++-
 .../navigation_chapter_no_header_vertical.pl       |  14 ++-
 .../results/layout/navigation_chapter_vertical.pl  |  14 ++-
 tta/perl/t/results/layout/navigation_no_header.pl  |  14 ++-
 .../layout/navigation_no_header_vertical.pl        |  14 ++-
 tta/perl/t/results/layout/navigation_node.pl       |  14 ++-
 .../t/results/layout/navigation_node_no_header.pl  |  14 ++-
 .../layout/navigation_node_no_header_vertical.pl   |  14 ++-
 .../t/results/layout/navigation_node_vertical.pl   |  14 ++-
 tta/perl/t/results/layout/navigation_section.pl    |  14 ++-
 .../results/layout/navigation_section_no_header.pl |  14 ++-
 .../navigation_section_no_header_vertical.pl       |  14 ++-
 .../results/layout/navigation_section_vertical.pl  |  14 ++-
 .../layout/navigation_test_misc_file_collision.pl  |  14 ++-
 .../layout/navigation_test_undef_top_buttons.pl    |  14 ++-
 .../layout/navigation_test_zero_top_buttons.pl     |  14 ++-
 tta/perl/t/results/layout/navigation_vertical.pl   |  14 ++-
 tta/perl/t/results/layout/no_monolithic.pl         |   6 +-
 .../t/results/layout/no_monolithic_only_toc_out.pl |   6 +-
 .../linemacro/simple_nested_linemacro_calls.pl     |   1 +
 tta/perl/t/results/macro/backslash_in_arg.pl       |   2 +
 tta/perl/t/results/macro/bib_example.pl            |  10 +-
 tta/perl/t/results/macro/glossary.pl               |   6 +-
 .../macro/macro_alias_definfoenclose_defindex.pl   |   6 +-
 .../t/results/macro/macro_in_index_commands.pl     |   2 +
 tta/perl/t/results/macro/macro_in_misc_commands.pl |   7 +-
 ...pendix_and_associated_part_in_generated_menu.pl |  20 +++-
 .../menu/block_commands_in_menu_description.pl     |   2 +
 .../menu/commands_in_nodedescriptionblock.pl       |  10 +-
 tta/perl/t/results/menu/comment_on_menu_line.pl    |   3 +
 tta/perl/t/results/menu/detailmenu_on_subnodes.pl  |  20 +++-
 tta/perl/t/results/menu/detailmenu_unknown_node.pl |   1 +
 .../menu/direntry_dircategory_after_first_node.pl  |   2 +
 .../t/results/menu/empty_leading_menu_comment.pl   |   1 +
 tta/perl/t/results/menu/empty_menu_description.pl  |   1 +
 tta/perl/t/results/menu/empty_menu_entry_name.pl   |   2 +
 tta/perl/t/results/menu/entry_after_detailmenu.pl  |   3 +
 .../t/results/menu/example_in_menu_description.pl  |   2 +
 tta/perl/t/results/menu/format_menu_undef.pl       |   6 +-
 tta/perl/t/results/menu/formats_in_menu.pl         |   1 +
 .../results/menu/inlineraw_in_menu_description.pl  |   2 +
 tta/perl/t/results/menu/invalid_info_menu_entry.pl |   1 +
 .../results/menu/leading_space_before_menu_star.pl |   1 +
 tta/perl/t/results/menu/menu_in_deffn.pl           |   1 +
 tta/perl/t/results/menu/menu_in_example.pl         |   1 +
 tta/perl/t/results/menu/menu_node_unterminated.pl  |   1 +
 tta/perl/t/results/menu/menu_pointing_to_anchor.pl |   2 +
 .../t/results/menu/menu_title_before_entries.pl    |   2 +
 .../results/menu/missing_detailmenu_on_subnodes.pl |  20 +++-
 tta/perl/t/results/menu/multiple_menus.pl          |   1 +
 tta/perl/t/results/menu/no_colon_in_menu.pl        |   1 +
 .../t/results/menu/nodedescription_descriptions.pl |  30 ++++--
 .../menu/nodedescriptionblock_descriptions.pl      |  22 +++-
 .../menu/part_appendix_in_generated_menu.pl        |  19 +++-
 .../t/results/menu/reference_to_external_manual.pl |   1 +
 tta/perl/t/results/menu/sc_in_menu.pl              |   2 +
 .../menu/space_and_commands_in_menu_node.pl        |   6 +-
 tta/perl/t/results/menu/submenu_in_example.pl      |   2 +
 .../t/results/menu/verb_in_menu_description.pl     |   2 +
 tta/perl/t/results/misc_commands/also_not_line.pl  |   1 +
 .../codequoteundirected_codequotebacktick.pl       |   6 +-
 .../misc_commands/comment_space_command_on_line.pl |   7 +-
 .../no_empty_line_between_headings.pl              |   8 +-
 .../t/results/misc_commands/nodedescription.pl     |   6 +-
 tta/perl/t/results/misc_commands/ref_in_center.pl  |   6 +-
 .../results/misc_commands/test_allowcodebreaks.pl  |   2 +
 .../misc_commands/text_before_line_command.pl      |   2 +
 .../t/results/moresectioning/anchor_in_footnote.pl |   6 +-
 .../moresectioning/anchor_in_footnote_separate.pl  |   6 +-
 .../anchor_in_footnote_separate_split_node.pl      |   6 +-
 .../anchor_in_footnote_split_node.pl               |   6 +-
 .../t/results/moresectioning/chapter_sections.pl   |  22 ++--
 .../moresectioning/character_and_spaces_in_refs.pl |  15 ++-
 .../character_and_spaces_in_refs_out.pl            |  15 ++-
 tta/perl/t/results/moresectioning/complex.pl       |  34 +++++-
 .../moresectioning/complex_split_at_node.pl        |  34 +++++-
 tta/perl/t/results/moresectioning/contents.pl      |  27 +++--
 .../moresectioning/contents_and_shortcontents.pl   |  27 +++--
 .../contents_at_begin_chapter_without_node.pl      |   5 +-
 .../moresectioning/contents_at_end_document.pl     |   5 +-
 .../contents_at_end_document_after_node.pl         |   6 +-
 .../results/moresectioning/contents_in_document.pl |   5 +-
 .../t/results/moresectioning/empty_top_node_up.pl  |   3 +
 .../equivalent_nodes_defined_linked.pl             |   2 +
 .../results/moresectioning/internal_top_node_up.pl |   3 +
 .../moresectioning/lowered_subsubsection.pl        |  26 +++--
 .../t/results/moresectioning/loweredheading.pl     |   2 +
 .../moresectioning/more_sections_than_nodes.pl     |  42 +++++---
 .../more_sections_than_nodes_texi2html.pl          |  42 +++++---
 .../moresectioning/nodes_before_after_top_xref.pl  |   8 +-
 ...nodes_no_section_footnote_no_top_node_output.pl |   2 +
 .../non_automatic_internal_top_node_up.pl          |   3 +
 .../non_automatic_top_node_up_and_url.pl           |   3 +
 .../non_automatic_top_node_up_url.pl               |   3 +
 .../moresectioning/only_special_spaces_node.pl     |  24 +++--
 .../moresectioning/placed_things_before_element.pl |   1 +
 .../placed_things_before_element_no_use_node.pl    |   1 +
 .../moresectioning/placed_things_before_node.pl    |   6 +-
 .../t/results/moresectioning/raiselowersections.pl |  22 +++-
 tta/perl/t/results/moresectioning/rec_nodes.pl     |   5 +
 .../moresectioning/section_in_unnumbered_info.pl   |  78 ++++++++++++--
 .../section_in_unnumbered_plaintext.pl             |  78 ++++++++++++--
 .../moresectioning/sectioning_part_appendix.pl     |  27 +++--
 .../sectioning_part_appendix_no_top.pl             |  24 +++--
 .../sectioning_part_appendix_texi2html_chapter.pl  |  27 +++--
 tta/perl/t/results/moresectioning/sections_test.pl |  27 +++--
 .../moresectioning/sections_test_no_use_nodes.pl   |  27 +++--
 ...ctions_test_no_use_nodes_use_node_directions.pl |  27 +++--
 tta/perl/t/results/moresectioning/shortcontents.pl |  27 +++--
 .../moresectioning/special_spaces_in_nodes.pl      |  14 ++-
 .../results/moresectioning/top_chapter_sections.pl |  23 ++--
 .../t/results/moresectioning/top_node_up_url.pl    |   3 +
 tta/perl/t/results/moresectioning/topic_guide.pl   |  15 ++-
 .../one/res_html/test_struct.html                  |  15 ++-
 tta/perl/t/results/plaintext_tests/all_spaces.pl   |   2 +
 .../cartouche_and_paragraph_indentation.pl         |  10 +-
 .../plaintext_tests/chinese_mixed_with_en.pl       |   6 +-
 .../t/results/plaintext_tests/japanese_utf8.pl     |  10 +-
 .../plaintext_tests/line_passed_and_formats.pl     |   1 +
 .../plaintext_tests/no_empty_line_after_section.pl |  10 +-
 .../t/results/plaintext_tests/non_break_spaces.pl  |   1 +
 .../punctuation_sc_accents_ascii_glyph.pl          |   6 +-
 .../punctuation_sc_accents_ascii_glyph_latin1.pl   |   6 +-
 .../punctuation_sc_accents_ascii_glyph_usascii.pl  |   6 +-
 .../punctuation_sc_accents_default.pl              |   6 +-
 .../punctuation_sc_accents_default_latin1.pl       |   6 +-
 .../punctuation_sc_accents_default_usascii.pl      |   6 +-
 .../punctuation_sc_accents_disable_encoding.pl     |   6 +-
 ...nctuation_sc_accents_disable_encoding_latin1.pl |   6 +-
 ...ctuation_sc_accents_disable_encoding_usascii.pl |   6 +-
 ...uation_sc_accents_to_utf8_ascii_glyph_latin1.pl |   6 +-
 ...ation_sc_accents_to_utf8_ascii_glyph_usascii.pl |   6 +-
 .../punctuation_sc_accents_to_utf8_latin1.pl       |   6 +-
 .../punctuation_sc_accents_to_utf8_usascii.pl      |   6 +-
 .../t/results/plaintext_tests/quote_node_names.pl  |  19 +++-
 .../plaintext_tests/settitle_and_empty_top.pl      |   1 +
 tta/perl/t/results/raw/inlineraw_not_closed.pl     |   1 +
 tta/perl/t/results/regions/anchor_in_copying.pl    |   2 +
 .../regions/anchor_in_copying_in_footnote.pl       |   2 +
 tta/perl/t/results/regions/anchor_in_titlepage.pl  |   6 +-
 .../regions/anchor_in_titlepage_titlepage.pl       |   6 +-
 tta/perl/t/results/regions/format_in_titlepage.pl  |   2 +
 .../regions/format_in_titlepage_titlepage.pl       |   2 +
 tta/perl/t/results/regions/ref_in_copying.pl       |   6 +-
 .../regions/ref_in_copying_insert_in_chapter.pl    |  10 +-
 tta/perl/t/results/regions/today_in_copying.pl     |   3 +
 .../res_html/chap.html                             |  10 +-
 .../res_html/index.html                            |   8 +-
 .../res_html/results.html                          |   4 +-
 .../res_html/chap-for-next.html                    |   7 ++
 .../res_html/index.html                            |   7 ++
 .../t/results/sectioning/a_comma_after_node.pl     |   1 +
 tta/perl/t/results/sectioning/anchor_zero.pl       |   1 +
 .../t/results/sectioning/at_commands_in_node.pl    |   1 +
 .../sectioning/automatic_menu_referencing_node.pl  |  10 +-
 .../sectioning/automatic_menu_with_heading.pl      |   7 +-
 .../sectioning/chapter_before_and_after_part.pl    |   5 +-
 .../t/results/sectioning/chapter_before_part.pl    |   2 +
 .../t/results/sectioning/chapter_between_nodes.pl  |   9 +-
 .../sectioning/chapter_between_nodes_texi2html.pl  |   9 +-
 .../chapter_between_nodes_with_appendix.pl         |   9 +-
 .../chapter_between_nodes_with_appendix_nomenu.pl  |   9 +-
 .../chapter_node_before_and_after_part.pl          |   7 +-
 .../sectioning/character_and_spaces_in_node.pl     |   5 +
 .../t/results/sectioning/contents_and_parts.pl     |  16 ++-
 .../t/results/sectioning/contents_in_html_text.pl  |  10 +-
 .../sectioning/contents_with_only_top_node.pl      |   1 +
 .../results/sectioning/double_node_anchor_float.pl |   4 +
 tta/perl/t/results/sectioning/double_part.pl       |   8 +-
 ...double_recursive_self_section_node_reference.pl |   7 +-
 ...sive_self_section_node_reference_no_use_node.pl |   7 +-
 .../double_recursive_self_section_reference.pl     |   4 +
 tta/perl/t/results/sectioning/double_top.pl        |   2 +
 .../t/results/sectioning/double_top_in_menu.pl     |   2 +
 .../t/results/sectioning/double_top_section.pl     |   2 +
 tta/perl/t/results/sectioning/email_in_node.pl     |   1 +
 tta/perl/t/results/sectioning/empty_ref_arg.pl     |   1 +
 .../results/sectioning/empty_section_in_chapter.pl |   4 +-
 tta/perl/t/results/sectioning/equivalent_labels.pl |   1 +
 tta/perl/t/results/sectioning/equivalent_nodes.pl  |   2 +
 .../sectioning/equivalent_nodes_novalidate.pl      |   2 +
 .../results/sectioning/explicit_node_directions.pl |   3 +
 .../t/results/sectioning/external_node_in_menu.pl  |  10 +-
 .../t/results/sectioning/hole_in_sectioning.pl     |  13 ++-
 .../in_menu_only_special_ascii_spaces_node.pl      |   8 +-
 .../in_menu_only_special_ascii_spaces_node_menu.pl |   8 +-
 .../sectioning/in_menu_only_special_spaces_node.pl |  24 +++--
 .../in_menu_only_special_spaces_node_menu.pl       |  24 +++--
 tta/perl/t/results/sectioning/lone_Top_node.pl     |   3 +
 tta/perl/t/results/sectioning/loop_nodes.pl        |   5 +
 tta/perl/t/results/sectioning/menutextorder.pl     |  26 +++--
 .../t/results/sectioning/next_in_menu_is_below.pl  |  14 ++-
 .../t/results/sectioning/next_no_prev_to_node.pl   |   3 +
 .../results/sectioning/no_argument_and_contents.pl |   4 +-
 tta/perl/t/results/sectioning/no_menu.pl           |  14 ++-
 .../t/results/sectioning/node_empty_direction.pl   |   1 +
 .../t/results/sectioning/node_line_arguments.pl    |   7 ++
 .../results/sectioning/node_nested_parentheses.pl  |   1 +
 .../sectioning/node_part_chapter_after_chapter.pl  |  11 +-
 .../sectioning/node_part_chapter_after_top.pl      |   7 +-
 .../t/results/sectioning/node_referenced_in_ref.pl |   3 +
 .../node_sectop_before_chapter_no_node.pl          |   5 +-
 .../sectioning/node_sectop_before_lone_node_Top.pl |   7 +-
 tta/perl/t/results/sectioning/node_simple.pl       |   1 +
 .../t/results/sectioning/node_too_much_args.pl     |   1 +
 .../node_up_direction_for_top_with_manual.pl       |   1 +
 .../t/results/sectioning/node_up_external_node.pl  |   2 +
 .../t/results/sectioning/nodename_parentheses.pl   |  14 ++-
 ...fter_top_before_chapter_no_use_nodes_chapter.pl |   4 +
 .../nodes_after_top_before_chapter_nodes.pl        |   4 +
 .../nodes_after_top_before_chapter_not_split.pl    |   4 +
 ...ore_chapter_not_split_no_use_node_directions.pl |   4 +
 .../nodes_after_top_before_chapter_sections.pl     |   4 +
 .../nodes_after_top_before_chapter_texi2html.pl    |   4 +
 ...p_before_chapter_texi2html_use_nodes_chapter.pl |   4 +
 .../nodes_after_top_before_section_nodes.pl        |   4 +
 .../nodes_after_top_before_section_sections.pl     |   4 +
 ...s_after_top_before_section_texi2html_chapter.pl |   4 +
 ...after_top_before_section_texi2html_use_nodes.pl |   4 +
 ...p_before_section_texi2html_use_nodes_chapter.pl |   4 +
 .../t/results/sectioning/nodes_before_after_top.pl |   8 +-
 tta/perl/t/results/sectioning/nodes_before_top.pl  |   8 +-
 .../nodes_no_node_top_explicit_directions.pl       |   2 +
 tta/perl/t/results/sectioning/novalidate.pl        |   1 +
 .../one_node_explicit_directions_anchor.pl         |   1 +
 ..._node_explicit_directions_anchor_no_use_node.pl |   1 +
 tta/perl/t/results/sectioning/one_subsection.pl    |   1 +
 .../results/sectioning/one_subsection_and_node.pl  |   2 +
 .../t/results/sectioning/part_before_chapter.pl    |   4 +-
 .../t/results/sectioning/part_before_section.pl    |   4 +-
 tta/perl/t/results/sectioning/part_before_top.pl   |   2 +
 .../t/results/sectioning/part_chapter_after_top.pl |   7 +-
 .../t/results/sectioning/part_chapter_appendix.pl  |   7 +-
 .../t/results/sectioning/part_node_after_top.pl    |   4 +
 .../t/results/sectioning/part_node_before_top.pl   |   4 +
 .../sectioning/part_node_chapter_after_top.pl      |   8 +-
 .../sectioning/part_node_chapter_appendix.pl       |  10 +-
 .../sectioning/part_node_chapter_node_appendix.pl  |  11 +-
 .../sectioning/part_node_node_part_appendix.pl     |  12 ++-
 .../results/sectioning/part_node_part_appendix.pl  |  11 +-
 .../sectioning/part_node_part_node_appendix.pl     |  12 ++-
 tta/perl/t/results/sectioning/part_section_part.pl |   5 +-
 .../sectioning/protected_node_parentheses.pl       |   3 +
 .../sectioning/recursive_self_section_reference.pl |   2 +
 tta/perl/t/results/sectioning/ref_to_top.pl        |   2 +
 .../reference_to_only_special_spaces_node.pl       |  10 +-
 .../sectioning/section_before_after_top_node.pl    |   6 +-
 .../section_before_after_top_node_last_node.pl     |   7 +-
 .../t/results/sectioning/section_before_chapter.pl |   2 +
 .../t/results/sectioning/section_before_part.pl    |   2 +
 .../t/results/sectioning/section_before_top.pl     |   4 +
 .../sectioning/section_before_top_no_node.pl       |   2 +
 .../results/sectioning/section_below_unnumbered.pl |   6 ++
 .../sectioning/section_below_unnumbered_no_top.pl  |   2 +
 .../sectioning/section_chapter_before_top.pl       |   3 +
 .../sectioning/section_chapter_before_top_nodes.pl |   6 ++
 .../results/sectioning/section_node_before_part.pl |   3 +
 tta/perl/t/results/sectioning/sections.pl          |   1 +
 tta/perl/t/results/sectioning/semi_auto.pl         |  14 ++-
 .../setfilename_on_top_and_after_node.pl           |   2 +
 tta/perl/t/results/sectioning/space_in_node.pl     |   4 +
 .../sectioning/split_for_format_not_split.pl       |   1 +
 .../sectioning/top_no_argument_and_content.pl      |   1 +
 .../results/sectioning/top_no_argument_and_node.pl |   2 +
 .../sectioning/top_no_argument_and_top_node.pl     |   2 +
 .../sectioning/top_node_no_menu_direction.pl       |   2 +
 tta/perl/t/results/sectioning/top_node_part_top.pl |   3 +
 tta/perl/t/results/sectioning/top_part_chapter.pl  |   5 +-
 .../t/results/sectioning/top_without_node_nodes.pl |   5 +-
 .../sectioning/top_without_node_sections.pl        |   5 +-
 .../top_without_node_texi2html_no_use_nodes.pl     |   5 +-
 .../transliterated_split_equivalent_nodes.pl       |   5 +
 .../t/results/sectioning/two_nodes_at_the_end.pl   |   8 +-
 .../sectioning/two_nodes_at_the_end_nodes.pl       |   8 +-
 .../sectioning/two_nodes_at_the_end_texi2html.pl   |   8 +-
 .../sectioning/two_nodes_between_chapters.pl       |  11 +-
 .../sectioning/two_nodes_between_chapters_nodes.pl |  11 +-
 .../two_nodes_between_chapters_texi2html.pl        |  11 +-
 .../sectioning/two_unnumbered_no_argument.pl       |   2 +
 .../unknown_node_direction_novalidate.pl           |   1 +
 .../t/results/sectioning/unknown_node_in_menu.pl   |   1 +
 .../sectioning/unknown_node_in_menu_novalidate.pl  |   1 +
 .../sectioning/unnumbered_before_node_top_top.pl   |   3 +
 .../t/results/sectioning/unnumbered_before_top.pl  |   2 +
 .../sectioning/unnumbered_before_top_node.pl       |   2 +
 .../t/results/sectioning/unnumbered_no_argument.pl |   1 +
 .../unnumbered_top_without_node_nodes.pl           |   7 +-
 .../unnumbered_top_without_node_sections.pl        |   7 +-
 ...dex_entries_relate_to_item_no_transformation.pl | Bin 5965 -> 6051 bytes
 .../index_entries_relate_to_item_transformation.pl | Bin 5996 -> 6082 bytes
 .../insert_nodes_for_sectioning_commands.pl        |  35 ++++--
 .../t/results/transformations/master_menu_fr.pl    |  10 +-
 ...generate_master_menu_no_need_for_master_menu.pl |   6 +-
 .../regenerate_master_menu_with_menu_comment.pl    |  10 +-
 .../t/results/value/value_in_index_commands.pl     |   2 +
 tta/perl/t/results/value/value_in_misc_commands.pl |   4 +
 tta/perl/t/results/value/value_in_node.pl          |   7 +-
 tta/perl/t/results/value/value_node_directions.pl  |  10 +-
 .../t/results/xml_tests/commands_and_spaces.pl     |   1 +
 .../t/results/xml_tests/image_inline_or_not.pl     |   6 +-
 .../xml_tests/sectioning_test_no_use_nodes.pl      |  14 ++-
 .../t/results/xml_tests/sectioning_test_ref.pl     |  14 ++-
 tta/perl/t/results/xml_tests/top_node_and_bye.pl   |   1 +
 .../t/results/xml_tests/top_node_no_section.pl     |   1 +
 .../t/results/xtable/block_commands_in_table.pl    |   6 +-
 .../results/xtable/inter_item_commands_in_table.pl |   6 +-
 .../t/results/xtable/item_index_transformation.pl  |   2 +
 tta/perl/t/z_misc/no_structure_test.t              |   2 +-
 843 files changed, 5348 insertions(+), 1231 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1fc29a2113..e300d8cd9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,59 @@
+2025-05-11  Patrice Dumas  <pertusus@free.fr>
+
+       Structure node, section and heading list different from elements
+
+       * tta/C/main/tree_types.h (enum directions), : rename section_number
+       extra key to section_heading_number.  Update users.
+
+       * tta/C/Makefile.am (C_libtexinfo_sources),
+       tta/C/main/structure_list.c (new_node_structure)
+       (new_section_structure, new_heading_structure)
+       (setup_reallocate_structure_list, add_to_node_structure_list)
+       (add_to_section_structure_list, add_to_heading_structure_list)
+       (insert_into_node_structure_list), tta/C/main/build_perl_info.c
+       (build_node_structure_list, build_section_structure_list)
+       (fill_document_hv), tta/C/main/document.c (new_document)
+       (destroy_document_information_except_tree),
+       tta/C/main/document_types.h (DOCUMENT), tta/C/main/tree_types.h
+       (enum directions, NODE_STRUCTURE, NODE_STRUCTURE_LIST)
+       (HEADING_STRUCTURE, HEADING_STRUCTURE_LIST, SECTION_STRUCTURE)
+       (SECTION_STRUCTURE_LIST), tta/C/parsetexi/end_line.c
+       (end_line_misc_line), tta/C/structuring_transfo/structuring.c
+       (sectioning_structure, construct_nodes_tree),
+       tta/perl/Texinfo/ParserNonXS.pm (_add_to_structure_list)
+       (_end_line_misc_line), tta/perl/Texinfo/Structuring.pm
+       (sectioning_structure, construct_nodes_tree): do not use tree
+       element in nodes_list and sections_list, but refer to the tree
+       element.  Populate nodes_list and sections_list during parsing, and
+       also populate headings_list.  Add NODE_STRUCTURE,
+       HEADING_STRUCTURE, SECTION_STRUCTURE structs in C and associated
+       lists. Add code to manage those lists for nodes_list and sections_list
+       in the new file main/structure_list.c.  Add node_number,
+       section_number and heading_number extra information in elements to be
+       able to retrieve the list structure information.
+
+       * tta/C/convert/format_html.c (html_default_format_contents)
+       (contents_shortcontents_in_title, html_convert_heading_command)
+       (html_convert_contents_command, html_output_internal_links),
+       tta/C/convert/html_prepare_converter.c (prepare_special_units)
+       (set_root_commands_targets_node_files, ids_hashmap_predicted_values),
+       tta/C/structuring_transfo/structuring.c (check_nodes_are_referenced)
+       (set_menus_node_directions, complete_node_tree_with_menus),
+       tta/C/structuring_transfo/transformations.c
+       (insert_nodes_for_sectioning_commands),
+       tta/perl/Texinfo/Convert/HTML.pm
+       (_set_root_commands_targets_node_files, _default_format_contents)
+       (output_internal_links), tta/perl/Texinfo/Convert/IXIN.pm,
+       tta/perl/Texinfo/Convert/LaTeX.pm (_begin_document, _convert),
+       tta/perl/Texinfo/Convert/Plaintext.pm (_convert),
+       tta/perl/Texinfo/Structuring.pm (check_nodes_are_referenced)
+       (set_menus_node_directions, complete_node_tree_with_menus),
+       tta/perl/Texinfo/Transformations.pm
+       (insert_nodes_for_sectioning_commands), tta/perl/ext/epub3.pm,
+       tta/perl/init/book.pm (book_unit_file_name), tta/perl/init/chm.pm,
+       tta/perl/init/documentation_examples.pm: update converters,
+       structuring and transformations for the new structures.
+
 2025-05-04  Gavin Smith <gavinsmith0123@gmail.com>
 
        * install-info/tests/defs.in: Update test for path separator from
diff --git a/doc/tta_api/api_includes/Texinfo-Document.texi 
b/doc/tta_api/api_includes/Texinfo-Document.texi
index 3f7e68ec99..0d2ddea75a 100644
--- a/doc/tta_api/api_includes/Texinfo-Document.texi
+++ b/doc/tta_api/api_includes/Texinfo-Document.texi
@@ -203,15 +203,12 @@ to the same document with @@-commands that refer to node, 
anchors or floats.
 @item $nodes_list = nodes_list($document)
 @anchor{Texinfo@asis{::}Document $nodes_list = nodes_list($document)}
 
-Returns an array reference containing the document nodes.  In general set to
-the nodes list constructed by @ref{Texinfo@asis{::}Structuring $nodes_list = 
construct_nodes_tree($document),, Texinfo::Structuring
-construct_nodes_tree}.
+Returns an array reference containing the document nodes.
 
 @item $sections_list = sections_list($document)
 @anchor{Texinfo@asis{::}Document $sections_list = sections_list($document)}
 
-Returns an array reference containing the document sections.  In general set 
to the sections list determined by
-@ref{Texinfo@asis{::}Structuring $sections_list = 
sectioning_structure($document),, Texinfo::Structuring sectioning_structure}.
+Returns an array reference containing the document sections.
 
 @end table
 
diff --git a/doc/tta_api/api_includes/Texinfo-Parser.texi 
b/doc/tta_api/api_includes/Texinfo-Parser.texi
index 46de41f873..cd58779df6 100644
--- a/doc/tta_api/api_includes/Texinfo-Parser.texi
+++ b/doc/tta_api/api_includes/Texinfo-Parser.texi
@@ -1317,7 +1317,7 @@ if there is an associated external manual name, and a 
@emph{normalized} key for
 normalized label, built as specified in the @emph{HTML Xref} Texinfo 
documentation
 node.
 
-If you called @ref{Texinfo@asis{::}Structuring $nodes_list = 
construct_nodes_tree($document),, Texinfo::Structuring::construct_nodes_tree},
+If you called @ref{Texinfo@asis{::}Structuring 
construct_nodes_tree($document),, Texinfo::Structuring::construct_nodes_tree},
 the @emph{node_directions} hash in the @code{@@node} element @code{extra} 
associates
 @emph{up}, @emph{next} and @emph{prev} keys to the elements corresponding to 
the node
 line directions.
@@ -1378,7 +1378,7 @@ The part preceding the command is in 
@emph{associated_part}.
 If the level of the document was modified by @code{@@raisections}
 or @code{@@lowersections}, the differential level is in @emph{level_modifier}.
 
-Other @code{extra} keys are set when you call @ref{Texinfo@asis{::}Structuring 
$sections_list = sectioning_structure($document),, 
Texinfo::Structuring::sectioning_structure}.
+Other @code{extra} keys are set when you call @ref{Texinfo@asis{::}Structuring 
sectioning_structure($document),, Texinfo::Structuring::sectioning_structure}.
 
 @item @code{untranslated_def_line_arg}
 @anchor{Texinfo@asis{::}Parser @code{untranslated_def_line_arg} 1}
diff --git a/doc/tta_api/api_includes/Texinfo-Structuring.texi 
b/doc/tta_api/api_includes/Texinfo-Structuring.texi
index f4be04dabd..3a87f61600 100644
--- a/doc/tta_api/api_includes/Texinfo-Structuring.texi
+++ b/doc/tta_api/api_includes/Texinfo-Structuring.texi
@@ -141,12 +141,12 @@ Returns the Texinfo tree corresponding to a single menu 
entry pointing to
 @emph{$node}.  If @emph{$use_sections} is set, use the section name for the 
menu
 entry name.  Returns @code{undef} if the node argument is missing.
 
-@item $nodes_list = construct_nodes_tree($document)
-@anchor{Texinfo@asis{::}Structuring $nodes_list = 
construct_nodes_tree($document)}
+@item construct_nodes_tree($document)
+@anchor{Texinfo@asis{::}Structuring construct_nodes_tree($document)}
 @cindex @code{construct_nodes_tree}
 
 Goes through nodes in @emph{$document} tree and set directions.  Set the list 
of
-nodes in the @emph{$document}.  Returns the list of nodes.
+nodes in the @emph{$document}.
 
 This functions sets, in the @code{extra} node element hash:
 
@@ -175,14 +175,13 @@ Return the sectioning command name corresponding to the 
sectioning
 element @emph{$element}, adjusted in order to take into account raised
 and lowered sections, when needed.
 
-@item $sections_list = sectioning_structure($document)
-@anchor{Texinfo@asis{::}Structuring $sections_list = 
sectioning_structure($document)}
+@item sectioning_structure($document)
+@anchor{Texinfo@asis{::}Structuring sectioning_structure($document)}
 @cindex @code{sectioning_structure}
 
 This function goes through the parsed document tree and gather information
 on the document structure for sectioning commands.  It sets the sections
-elements list in the document and returns a reference
-on the sections elements list.
+elements list in the document.
 
 It sets section elements @code{extra} hash values:
 
diff --git a/doc/tta_api/api_includes/Texinfo-Transformations.texi 
b/doc/tta_api/api_includes/Texinfo-Transformations.texi
index 0465bf60b4..37fe7af142 100644
--- a/doc/tta_api/api_includes/Texinfo-Transformations.texi
+++ b/doc/tta_api/api_includes/Texinfo-Transformations.texi
@@ -38,7 +38,7 @@ Add menu entries or whole menus for nodes associated with 
sections,
 based on the sectioning tree.  If the optional
 @code{$add_section_names_in_entries} argument is set, a menu entry
 name is added using the section name.  This function should be
-called after @ref{Texinfo@asis{::}Structuring $sections_list = 
sectioning_structure($document),, sectioning_structure}.
+called after @ref{Texinfo@asis{::}Structuring 
sectioning_structure($document),, sectioning_structure}.
 
 @item complete_tree_nodes_missing_menu($document, 
$use_section_names_in_entries)
 @anchor{Texinfo@asis{::}Transformations 
complete_tree_nodes_missing_menu($document@comma{} 
$use_section_names_in_entries)}
@@ -48,7 +48,7 @@ Add whole menus for nodes associated with sections and 
without menu,
 based on the @emph{$document} sectioning tree.
 If the optional @emph{$add_section_names_in_entries} argument is set, a menu 
entry
 name is added using the section name.  This function should be
-called after @ref{Texinfo@asis{::}Structuring $sections_list = 
sectioning_structure($document),, sectioning_structure}.
+called after @ref{Texinfo@asis{::}Structuring 
sectioning_structure($document),, sectioning_structure}.
 
 @item fill_gaps_in_sectioning_in_document($document, $commands_heading_tree)
 @anchor{Texinfo@asis{::}Transformations 
fill_gaps_in_sectioning_in_document($document@comma{} $commands_heading_tree)}
diff --git a/tta/C/Makefile.am b/tta/C/Makefile.am
index 7a22491890..87054fe109 100644
--- a/tta/C/Makefile.am
+++ b/tta/C/Makefile.am
@@ -88,6 +88,8 @@ C_libtexinfo_sources = \
                      main/errors.h \
                      main/extra.c \
                      main/extra.h \
+                     main/structure_list.c \
+                     main/structure_list.h \
                      main/convert_to_texinfo.c \
                      main/convert_to_texinfo.h \
                      main/convert_to_text.c \
diff --git a/tta/C/convert/format_html.c b/tta/C/convert/format_html.c
index ea0738aa30..31b81fd8da 100644
--- a/tta/C/convert/format_html.c
+++ b/tta/C/convert/format_html.c
@@ -1922,7 +1922,8 @@ html_internal_command_tree (CONVERTER *self, const 
ELEMENT *command,
                 {
                   const char *section_number;
                   section_number
-                    = lookup_extra_string (command, AI_key_section_number);
+                    = lookup_extra_string (command,
+                                           AI_key_section_heading_number);
 
                   if (section_number
                       && self->conf->NUMBER_SECTIONS.o.integer != 0)
@@ -3031,10 +3032,9 @@ html_default_format_contents (CONVERTER *self, const 
enum command_id cmd,
   text_init (&result);
   text_append (&result, "");
 
-  if (self->document->sections_list
-      && self->document->sections_list->number > 0)
+  if (self->document->sections_list.number > 0)
     {
-      const ELEMENT *first = self->document->sections_list->list[0];
+      const ELEMENT *first = self->document->sections_list.list[0]->element;
       section_root = lookup_extra_element_oot (first, AI_key_sectioning_root);
       /* this should not happen with $sections_list as set from Structuring
          sectioning_structure, but could happen with another source.
@@ -5618,8 +5618,7 @@ contents_inline_element (CONVERTER *self, const enum 
command_id cmd,
 static void
 contents_shortcontents_in_title (CONVERTER *self, TEXT *result)
 {
-  if (self->document->sections_list
-      && self->document->sections_list->number > 0
+  if (self->document->sections_list.number > 0
       && self->conf->CONTENTS_OUTPUT_LOCATION.o.string
       && !strcmp (self->conf->CONTENTS_OUTPUT_LOCATION.o.string, 
"after_title"))
     {
@@ -7281,8 +7280,7 @@ html_convert_heading_command (CONVERTER *self, const enum 
command_id cmd,
   if (element->e.c->cmd == CM_top
       && self->conf->CONTENTS_OUTPUT_LOCATION.o.string
       && !strcmp (self->conf->CONTENTS_OUTPUT_LOCATION.o.string, "after_top")
-      && self->document->sections_list
-      && self->document->sections_list->number > 1)
+      && self->document->sections_list.number > 1)
     {
       enum command_id contents_cmds[2] = {CM_shortcontents, CM_contents};
       int i;
@@ -10946,8 +10944,7 @@ html_convert_contents_command (CONVERTER *self, const 
enum command_id cmd,
       && ((used_cmd == CM_contents && self->conf->contents.o.integer > 0)
           || (used_cmd == CM_shortcontents
               && self->conf->shortcontents.o.integer > 0))
-      && self->document->sections_list
-      && self->document->sections_list->number > 1)
+      && self->document->sections_list.number > 1)
     {
       char *contents = contents_inline_element (self, used_cmd, element);
       if (contents)
@@ -13146,12 +13143,14 @@ html_output_internal_links (CONVERTER *self)
 
   if (self->document)
     {
-      if (self->document->sections_list->number > 0)
+      if (self->document->sections_list.number > 0)
         {
           size_t i;
-          for (i = 0; i < self->document->sections_list->number; i++)
+          for (i = 0; i < self->document->sections_list.number; i++)
             {
-              const ELEMENT *command = self->document->sections_list->list[i];
+              const SECTION_STRUCTURE *section_structure
+                = self->document->sections_list.list[i];
+              const ELEMENT *command = section_structure->element;
               char *href = html_command_href (self, command, "", 0, 0);
               char *text = 0;
               TREE_ADDED_ELEMENTS *command_tree
diff --git a/tta/C/convert/html_prepare_converter.c 
b/tta/C/convert/html_prepare_converter.c
index 646ec77a6a..0b7141990d 100644
--- a/tta/C/convert/html_prepare_converter.c
+++ b/tta/C/convert/html_prepare_converter.c
@@ -3956,8 +3956,7 @@ prepare_special_units (CONVERTER *self, size_t 
output_units_descriptor)
   self->output_units_descriptors[OUDT_associated_special_units]
      = associated_special_units_descriptor;
 
-  if (self->document->sections_list
-      && self->document->sections_list->number > 1)
+  if (self->document->sections_list.number > 1)
     {
       enum command_id contents_cmds[2] = {CM_shortcontents, CM_contents};
       int i;
@@ -4607,14 +4606,15 @@ set_root_commands_targets_node_files (CONVERTER *self)
         }
     }
 
-  if (self->document->sections_list)
+  if (self->document->sections_list.number > 0)
     {
-      const CONST_ELEMENT_LIST *sections_list = self->document->sections_list;
       size_t i;
-      for (i = 0; i < sections_list->number; i++)
+      for (i = 0; i < self->document->sections_list.number; i++)
         {
-          const ELEMENT *root_element = sections_list->list[i];
-          new_sectioning_command_target (self, root_element);
+          const SECTION_STRUCTURE *section_structure
+            = self->document->sections_list.list[i];
+          const ELEMENT *section_element = section_structure->element;
+          new_sectioning_command_target (self, section_element);
         }
     }
 }
@@ -4929,7 +4929,7 @@ sort_cmd_targets (CONVERTER *self)
 static size_t
 ids_hashmap_predicted_values (CONVERTER *self)
 {
-  size_t sectioning_commands_nr = 0;
+  size_t sectioning_commands_nr;
   size_t index_entries_nr = 0;
   size_t heading_commands_nr = 0;
   size_t i;
@@ -4940,8 +4940,7 @@ ids_hashmap_predicted_values (CONVERTER *self)
    (self->document,
     self->output_units_descriptors[OUDT_associated_special_units]);
 
-  if (self->document->sections_list)
-    sectioning_commands_nr = self->document->sections_list->number;
+  sectioning_commands_nr = self->document->sections_list.number;
 
   if (self->document->indices_info.number > 0)
     {
diff --git a/tta/C/main/build_perl_info.c b/tta/C/main/build_perl_info.c
index 7ca43360fa..3ace115f19 100644
--- a/tta/C/main/build_perl_info.c
+++ b/tta/C/main/build_perl_info.c
@@ -979,6 +979,56 @@ build_elements_list (const CONST_ELEMENT_LIST *list)
   return list_av;
 }
 
+AV *
+build_node_structure_list (const NODE_STRUCTURE_LIST *list)
+{
+  AV *list_av;
+  SV *sv;
+  size_t i;
+
+  dTHX;
+
+  list_av = newAV ();
+
+  av_unshift (list_av, list->number);
+
+  for (i = 0; i < list->number; i++)
+    {
+      NODE_STRUCTURE *node = list->list[i];
+      HV *node_hv = newHV ();
+      sv = newRV_inc ((SV *) node->element->hv);
+      hv_store (node_hv, "element", strlen ("element"), sv, 0);
+      av_store (list_av, i, newRV_noinc ((SV *) node_hv));
+    }
+
+  return list_av;
+}
+
+AV *
+build_section_structure_list (const SECTION_STRUCTURE_LIST *list)
+{
+  AV *list_av;
+  SV *sv;
+  size_t i;
+
+  dTHX;
+
+  list_av = newAV ();
+
+  av_unshift (list_av, list->number);
+
+  for (i = 0; i < list->number; i++)
+    {
+      SECTION_STRUCTURE *section = list->list[i];
+      HV *section_hv = newHV ();
+      sv = newRV_inc ((SV *) section->element->hv);
+      hv_store (section_hv, "element", strlen ("element"), sv, 0);
+      av_store (list_av, i, newRV_noinc ((SV *) section_hv));
+    }
+
+  return list_av;
+}
+
 /* currently unused */
 AV *
 build_integer_stack (const INTEGER_STACK *integer_stack)
@@ -1736,11 +1786,11 @@ fill_document_hv (HV *hv, DOCUMENT *document, int 
no_store)
 
   av_labels_list = build_target_elements_list (&document->labels_list);
 
-  if (document->nodes_list)
-    av_nodes_list = build_elements_list (document->nodes_list);
+  if (document->nodes_list.number > 0)
+    av_nodes_list = build_node_structure_list (&document->nodes_list);
 
-  if (document->sections_list)
-    av_sections_list = build_elements_list (document->sections_list);
+  if (document->sections_list.number > 0)
+    av_sections_list = build_section_structure_list (&document->sections_list);
 
   if (document->indices_sort_strings)
     hv_indices_sort_strings = build_indices_sort_strings (
@@ -2317,10 +2367,14 @@ 
BUILD_PERL_DOCUMENT_ITEM(funcname,fieldname,keyname,flagname,buildname,HVAV)
 
 
 
+/*
 
BUILD_PERL_DOCUMENT_ITEM(document_nodes_list,nodes_list,"nodes_list",F_DOCM_nodes_list,build_elements_list,AV)
+ */
 
+/*
 
BUILD_PERL_DOCUMENT_ITEM(document_sections_list,sections_list,"sections_list",F_DOCM_sections_list,build_elements_list,AV)
 
+ */
 #undef BUILD_PERL_DOCUMENT_ITEM
 
 #define 
BUILD_PERL_DOCUMENT_LIST(funcname,fieldname,keyname,flagname,buildname,HVAV) \
@@ -2367,6 +2421,10 @@ funcname (SV *document_in) \
 BUILD_PERL_DOCUMENT_LIST(funcname,fieldname,keyname,flagname,buildname,HVAV)
 */
 
+BUILD_PERL_DOCUMENT_LIST(document_nodes_list,nodes_list,"nodes_list",F_DOCM_nodes_list,build_node_structure_list,AV)
+
+BUILD_PERL_DOCUMENT_LIST(document_sections_list,sections_list,"sections_list",F_DOCM_sections_list,build_section_structure_list,AV)
+
 
BUILD_PERL_DOCUMENT_LIST(document_floats_information,listoffloats,"listoffloats_list",F_DOCM_floats,build_listoffloats_list,HV)
 
 
BUILD_PERL_DOCUMENT_LIST(document_internal_references_information,internal_references,"internal_references",F_DOCM_internal_references,build_internal_xref_list,AV)
diff --git a/tta/C/main/convert_utils.c b/tta/C/main/convert_utils.c
index 58fe8d1f8d..51765e227a 100644
--- a/tta/C/main/convert_utils.c
+++ b/tta/C/main/convert_utils.c
@@ -260,7 +260,7 @@ add_heading_number (const ELEMENT *current, char *text,
   TEXT result;
   char *number = 0;
   if (numbered != 0)
-    number = lookup_extra_string (current, AI_key_section_number);
+    number = lookup_extra_string (current, AI_key_section_heading_number);
 
   text_init (&result);
 
diff --git a/tta/C/main/document.c b/tta/C/main/document.c
index 6d74945f88..ac73cce71b 100644
--- a/tta/C/main/document.c
+++ b/tta/C/main/document.c
@@ -172,7 +172,7 @@ new_document (void)
   document->modified_information |= F_DOCM_tree | F_DOCM_index_names
      | F_DOCM_floats | F_DOCM_internal_references | F_DOCM_labels_list
      | F_DOCM_identifiers_target | F_DOCM_global_info
-     | F_DOCM_global_commands;
+     | F_DOCM_global_commands | F_DOCM_nodes_list | F_DOCM_sections_list;
 
   /*
   fprintf (stderr, "NEW DOCUMENT %zu %p\n", document_index +1, document);
@@ -538,10 +538,9 @@ destroy_document_information_except_tree (DOCUMENT 
*document)
   free_indices_info (&document->indices_info);
   wipe_error_message_list (&document->error_messages);
   wipe_error_message_list (&document->parser_error_messages);
-  if (document->nodes_list)
-    destroy_const_element_list (document->nodes_list);
-  if (document->sections_list)
-    destroy_const_element_list (document->sections_list);
+  free (document->nodes_list.list);
+  free (document->headings_list.list);
+  free (document->sections_list.list);
   if (document->sorted_options)
     {
       size_t i;
diff --git a/tta/C/main/document_types.h b/tta/C/main/document_types.h
index 7aac968b38..544f189f3a 100644
--- a/tta/C/main/document_types.h
+++ b/tta/C/main/document_types.h
@@ -271,8 +271,9 @@ typedef struct DOCUMENT {
     GLOBAL_INFO global_info;
     GLOBAL_COMMANDS global_commands;
 
-    CONST_ELEMENT_LIST *nodes_list;
-    CONST_ELEMENT_LIST *sections_list;
+    NODE_STRUCTURE_LIST nodes_list;
+    HEADING_STRUCTURE_LIST headings_list;
+    SECTION_STRUCTURE_LIST sections_list;
 
     MERGED_INDICES *merged_indices;
     INDICES_SORT_STRINGS *indices_sort_strings;
diff --git a/tta/C/main/structure_list.c b/tta/C/main/structure_list.c
new file mode 100644
index 0000000000..7315b598bf
--- /dev/null
+++ b/tta/C/main/structure_list.c
@@ -0,0 +1,118 @@
+/* Copyright 2010-2025 Free Software Foundation, Inc.
+ 
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+ 
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+ 
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+ 
+#include <config.h>
+
+#include <stdlib.h>
+#include <string.h>
+#include <stddef.h>
+ 
+#include "tree_types.h"
+#include "base_utils.h"
+
+NODE_STRUCTURE *
+new_node_structure (ELEMENT *element)
+{
+  NODE_STRUCTURE *node = (NODE_STRUCTURE *) malloc (sizeof (NODE_STRUCTURE));
+  memset (node, 0, sizeof (NODE_STRUCTURE));
+  node->element = element;
+  return node;
+}
+
+SECTION_STRUCTURE *
+new_section_structure (ELEMENT *element)
+{
+  SECTION_STRUCTURE *section
+    = (SECTION_STRUCTURE *) malloc (sizeof (SECTION_STRUCTURE));
+  memset (section, 0, sizeof (SECTION_STRUCTURE));
+  section->element = element;
+  return section;
+}
+
+HEADING_STRUCTURE *
+new_heading_structure (ELEMENT *element)
+{
+  HEADING_STRUCTURE *heading
+    = (HEADING_STRUCTURE *) malloc (sizeof (HEADING_STRUCTURE));
+  memset (heading, 0, sizeof (HEADING_STRUCTURE));
+  heading->element = element;
+  return heading;
+}
+
+/* Make sure there is space for at least one more element. */
+#define setup_reallocate_structure_list(name, type) \
+static void \
+reallocate_##name##_structure_list (type##_STRUCTURE_LIST *list) \
+{ \
+  if (list->number + 1 >= list->space) \
+    { \
+      list->space += 10; \
+      list->list = realloc (list->list, \
+                            list->space * sizeof (type##_STRUCTURE *)); \
+      if (!list->list) \
+        fatal ("realloc failed"); \
+    } \
+}
+
+setup_reallocate_structure_list(node,NODE)
+setup_reallocate_structure_list(section,SECTION)
+setup_reallocate_structure_list(heading,HEADING)
+
+void
+add_to_node_structure_list (NODE_STRUCTURE_LIST *list, ELEMENT *e)
+{
+  NODE_STRUCTURE *node = new_node_structure (e);
+  /* NOTE there could be theoretically an overflow if
+     list->number + 1 > SIZE_MAX.  The numbers are big, this is unlikely
+     to happen */
+  reallocate_node_structure_list (list);
+ 
+  list->list[list->number++] = node;
+}
+
+void
+add_to_section_structure_list (SECTION_STRUCTURE_LIST *list, ELEMENT *e)
+{
+  SECTION_STRUCTURE *section = new_section_structure (e);
+  reallocate_section_structure_list (list);
+ 
+  list->list[list->number++] = section;
+}
+ 
+void
+add_to_heading_structure_list (HEADING_STRUCTURE_LIST *list, ELEMENT *e)
+{
+  HEADING_STRUCTURE *heading = new_heading_structure (e);
+  reallocate_heading_structure_list (list);
+ 
+  list->list[list->number++] = heading;
+}
+ 
+/* Add the element E into the LIST at index WHERE. */
+void
+insert_into_node_structure_list (NODE_STRUCTURE_LIST *list,
+                                 ELEMENT *e, size_t where)
+{
+  NODE_STRUCTURE *node = new_node_structure (e);
+  reallocate_node_structure_list (list);
+ 
+  if (where > list->number)
+    fatal ("elements list index out of bounds");
+ 
+  memmove (&list->list[where + 1], &list->list[where],
+           (list->number - where) * sizeof (NODE_STRUCTURE *));
+  list->list[where] = node;
+  list->number++;
+}
diff --git a/tta/C/main/structure_list.h b/tta/C/main/structure_list.h
new file mode 100644
index 0000000000..4e3e905d4e
--- /dev/null
+++ b/tta/C/main/structure_list.h
@@ -0,0 +1,16 @@
+/* structure_lists.h - declarations for structure_lists.c */
+#ifndef STRUCTURE_LISTS_H
+#define STRUCTURE_LISTS_H
+
+#include <stddef.h>
+
+#include "tree_types.h"
+
+void add_to_node_structure_list (NODE_STRUCTURE_LIST *list, ELEMENT *e);
+void add_to_section_structure_list (SECTION_STRUCTURE_LIST *list, ELEMENT *e);
+void add_to_heading_structure_list (HEADING_STRUCTURE_LIST *list, ELEMENT *e);
+
+void insert_into_node_structure_list (NODE_STRUCTURE_LIST *list,
+                                      ELEMENT *e, size_t where);
+
+#endif
diff --git a/tta/C/main/tree.c b/tta/C/main/tree.c
index 40e5e1fb24..9c58660787 100644
--- a/tta/C/main/tree.c
+++ b/tta/C/main/tree.c
@@ -18,6 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#include <stddef.h>
 
 #include "tree_types.h"
 #include "types_data.h"
diff --git a/tta/C/main/tree.h b/tta/C/main/tree.h
index 2ada6f3923..b27fea10e8 100644
--- a/tta/C/main/tree.h
+++ b/tta/C/main/tree.h
@@ -2,6 +2,8 @@
 #ifndef TREE_H
 #define TREE_H
 
+#include <stddef.h>
+
 #include "tree_types.h"
 
 /* Array of "associated info" key names. */
diff --git a/tta/C/main/tree_types.h b/tta/C/main/tree_types.h
index 6c9ff3580c..bb1fb21bf6 100644
--- a/tta/C/main/tree_types.h
+++ b/tta/C/main/tree_types.h
@@ -83,6 +83,9 @@ enum directions {
   ai_key(max_columns, integer) \
   ai_key(row_number, integer) \
   ai_key(section_level, integer) \
+  ai_key(node_number, integer) \
+  ai_key(heading_number, integer) \
+  ai_key(section_number, integer) \
   \
   ai_key(begin, string) \
   ai_key(def_command, string) \
@@ -98,7 +101,7 @@ enum directions {
   ai_key(macro_name, string) \
   ai_key(normalized, string) \
   ai_key(original_def_cmdname, string) \
-  ai_key(section_number, string) \
+  ai_key(section_heading_number, string) \
   ai_key(sortas, string) \
   ai_key(text_arg, string) \
   ai_key(translation_context, string) \
@@ -274,6 +277,36 @@ typedef struct ELEMENT {
 
 } ELEMENT;
 
+typedef struct NODE_STRUCTURE {
+    const ELEMENT *element;
+} NODE_STRUCTURE;
+
+typedef struct NODE_STRUCTURE_LIST {
+    struct NODE_STRUCTURE **list;
+    size_t number;
+    size_t space;
+} NODE_STRUCTURE_LIST;
+
+typedef struct HEADING_STRUCTURE {
+    const ELEMENT *element;
+} HEADING_STRUCTURE;
+
+typedef struct HEADING_STRUCTURE_LIST {
+    struct HEADING_STRUCTURE **list;
+    size_t number;
+    size_t space;
+} HEADING_STRUCTURE_LIST;
+
+typedef struct SECTION_STRUCTURE {
+    const ELEMENT *element;
+} SECTION_STRUCTURE;
+
+typedef struct SECTION_STRUCTURE_LIST {
+    struct SECTION_STRUCTURE **list;
+    size_t number;
+    size_t space;
+} SECTION_STRUCTURE_LIST;
+
 typedef struct IGNORED_CHARS {
     int backslash;
     int hyphen;
diff --git a/tta/C/parsetexi/end_line.c b/tta/C/parsetexi/end_line.c
index 85edb37e89..87b320e335 100644
--- a/tta/C/parsetexi/end_line.c
+++ b/tta/C/parsetexi/end_line.c
@@ -32,6 +32,7 @@
 #include "tree.h"
 #include "extra.h"
 #include "builtin_commands.h"
+#include "structure_list.h"
 /* for whitespace_chars read_flag_len
    indices_info_index_by_name ultimate_index */
 #include "utils.h"
@@ -1529,6 +1530,7 @@ end_line_misc_line (ELEMENT *current)
       size_t i;
       /* arguments_line type element */
       ELEMENT *arguments_line = current->e.c->contents.list[0];
+      char *node_normalized;
 
       for (i = 1; i < arguments_line->e.c->contents.number && i < 4; i++)
         {
@@ -1564,6 +1566,13 @@ end_line_misc_line (ELEMENT *current)
                           "empty argument in @%s", command_name (cmd));
         }
       check_register_target_element_label (line_arg, current);
+      node_normalized = lookup_extra_string (current, AI_key_normalized);
+      if (node_normalized)
+        {
+          add_to_node_structure_list (&parsed_document->nodes_list, current);
+          add_extra_integer (current, AI_key_node_number,
+                             parsed_document->nodes_list.number);
+        }
 
       if (current_part
           && !lookup_extra_element (current_part,
@@ -1821,11 +1830,23 @@ end_line_misc_line (ELEMENT *current)
                          "associated with nodes");
             }
         }
+
+      if (cmd != CM_node)
+        {
+          add_to_section_structure_list (
+                            &parsed_document->sections_list, current);
+          add_extra_integer (current, AI_key_section_number,
+                             parsed_document->sections_list.number);
+        }
     }
   /* only *heading as sectioning commands are handled just before */
   else if (command_data(data_cmd).flags & CF_sectioning_heading
            || data_cmd == CM_xrefname)
    {
+     add_to_heading_structure_list (&parsed_document->headings_list,
+                                    command_element);
+     add_extra_integer (command_element, AI_key_heading_number,
+                        parsed_document->headings_list.number);
      associate_title_command_anchor (current_node, command_element);
    }
 
diff --git a/tta/C/structuring_transfo/structuring.c 
b/tta/C/structuring_transfo/structuring.c
index d4bbc99ad6..2e537b1675 100644
--- a/tta/C/structuring_transfo/structuring.c
+++ b/tta/C/structuring_transfo/structuring.c
@@ -82,10 +82,9 @@ new_block_command (ELEMENT *element)
   add_to_element_contents (element, end);
 }
 
-CONST_ELEMENT_LIST *
+void
 sectioning_structure (DOCUMENT *document)
 {
-  const ELEMENT *root = document->tree;
   ERROR_MESSAGE_LIST *error_messages = &document->error_messages;
   OPTIONS *options = document->options;
 
@@ -95,7 +94,6 @@ sectioning_structure (DOCUMENT *document)
   int in_appendix = 0;
   /* lowest level with a number.  This is the lowest level above 0. */
   int number_top_level = 0;
-  CONST_ELEMENT_LIST *sections_list = new_const_element_list ();
   const ELEMENT *section_top = 0;
   size_t i;
   TEXT section_number;
@@ -107,19 +105,14 @@ sectioning_structure (DOCUMENT *document)
   /* keep track of the unnumbered */
   int command_unnumbered[5] = {0, 0, 0, 0, 0};
 
-  for (i = 0; i < root->e.c->contents.number; i++)
+  for (i = 0; i < document->sections_list.number; i++)
     {
-      ELEMENT *content = root->e.c->contents.list[i];
+      SECTION_STRUCTURE *section_structure = document->sections_list.list[i];
+      ELEMENT *content = (ELEMENT *)section_structure->element;
       int level;
 
-      if (!content->e.c->cmd || content->e.c->cmd == CM_node
-          || content->e.c->cmd == CM_bye)
-        continue;
-
       document->modified_information |= F_DOCM_tree;
 
-      add_to_const_element_list (sections_list, content);
-
       if (content->e.c->cmd == CM_top && !section_top)
         section_top = content;
 
@@ -354,7 +347,7 @@ sectioning_structure (DOCUMENT *document)
                     }
                 }
               if (section_number.end > 0)
-                add_extra_string_dup (content, AI_key_section_number,
+                add_extra_string_dup (content, AI_key_section_heading_number,
                                       section_number.text);
             }
         }
@@ -397,17 +390,9 @@ sectioning_structure (DOCUMENT *document)
         }
     }
 
-  if (sections_list->number == 0)
-    {
-      destroy_const_element_list (sections_list);
-      return 0;
-    }
   free (section_number.text);
 
-  document->sections_list = sections_list;
   document->modified_information |= F_DOCM_sections_list;
-
-  return sections_list;
 }
 
 void
@@ -594,7 +579,7 @@ compare_strings (const void *a, const void *b)
 void
 check_nodes_are_referenced (DOCUMENT *document)
 {
-  const CONST_ELEMENT_LIST *nodes_list = document->nodes_list;
+  const NODE_STRUCTURE_LIST *nodes_list = &document->nodes_list;
   const C_HASHMAP *identifiers_target = &document->identifiers_target;
   const ELEMENT_LIST *refs = &document->internal_references;
   ERROR_MESSAGE_LIST *error_messages = &document->error_messages;
@@ -611,7 +596,7 @@ check_nodes_are_referenced (DOCUMENT *document)
 
   const ELEMENT *top_node;
 
-  if (!nodes_list || nodes_list->number <= 0)
+  if (nodes_list->number < 1)
     return;
 
   referenced_identifier_space = nodes_list->number * 2;
@@ -622,7 +607,7 @@ check_nodes_are_referenced (DOCUMENT *document)
                                      "Top");
   if (!top_node)
     {
-      top_node = nodes_list->list[0];
+      top_node = nodes_list->list[0]->element;
       char *normalized = lookup_extra_string (top_node, AI_key_normalized);
       if (normalized)
         referenced_identifiers[0] = normalized;
@@ -634,7 +619,8 @@ check_nodes_are_referenced (DOCUMENT *document)
 
   for (i = 0; i < nodes_list->number; i++)
     {
-      const ELEMENT *node = nodes_list->list[i];
+      const NODE_STRUCTURE *node_structure = nodes_list->list[i];
+      const ELEMENT *node = node_structure->element;
       int is_target = (node->flags & EF_is_target);
       const ELEMENT * const *node_directions = lookup_extra_directions (node,
                                                    AI_key_node_directions);
@@ -805,7 +791,8 @@ check_nodes_are_referenced (DOCUMENT *document)
      referenced nodes that are not in menu, except for the Top node */
   for (i = 0; i < nodes_list->number; i++)
     {
-      const ELEMENT *node = nodes_list->list[i];
+      const NODE_STRUCTURE *node_structure = nodes_list->list[i];
+      const ELEMENT *node = node_structure->element;
       int is_target = (node->flags & EF_is_target);
 
       if (is_target)
@@ -868,7 +855,7 @@ void
 set_menus_node_directions (DOCUMENT *document)
 {
   const GLOBAL_COMMANDS *global_commands = &document->global_commands;
-  const CONST_ELEMENT_LIST *nodes_list = document->nodes_list;
+  const NODE_STRUCTURE_LIST *nodes_list = &document->nodes_list;
   const C_HASHMAP *identifiers_target = &document->identifiers_target;
   ERROR_MESSAGE_LIST *error_messages = &document->error_messages;
   OPTIONS *options = document->options;
@@ -876,7 +863,7 @@ set_menus_node_directions (DOCUMENT *document)
   int check_menu_entries = 1;
   size_t i;
 
-  if (!nodes_list || nodes_list->number <= 0)
+  if (nodes_list->number < 1)
     return;
 
   if (options && (options->novalidate.o.integer > 0
@@ -896,7 +883,9 @@ set_menus_node_directions (DOCUMENT *document)
   for (i = 0; i < nodes_list->number; i++)
     {
       size_t j;
-      const ELEMENT *node = nodes_list->list[i];
+      const NODE_STRUCTURE *node_structure = nodes_list->list[i];
+      const ELEMENT *node = node_structure->element;
+
       const CONST_ELEMENT_LIST *menus = lookup_extra_contents (node, 
AI_key_menus);
 
       if (!menus)
@@ -1071,7 +1060,7 @@ section_direction_associated_node (const ELEMENT *section,
 void
 complete_node_tree_with_menus (DOCUMENT *document)
 {
-  const CONST_ELEMENT_LIST *nodes_list = document->nodes_list;
+  const NODE_STRUCTURE_LIST *nodes_list = &document->nodes_list;
   const C_HASHMAP *identifiers_target = &document->identifiers_target;
   ERROR_MESSAGE_LIST *error_messages = &document->error_messages;
   OPTIONS *options = document->options;
@@ -1080,7 +1069,7 @@ complete_node_tree_with_menus (DOCUMENT *document)
   const ELEMENT *top_node = 0;
   const ELEMENT *top_node_next = 0;
 
-  if (!nodes_list || nodes_list->number <= 0)
+  if (nodes_list->number < 1)
     return;
 
   document->modified_information |= F_DOCM_tree;
@@ -1089,9 +1078,10 @@ complete_node_tree_with_menus (DOCUMENT *document)
 
   for (i = 0; i < nodes_list->number; i++)
     {
+      const NODE_STRUCTURE *node_structure = nodes_list->list[i];
     /* as an exception to the rule we modify an element of the nodes list,
        so use a cast to remove const */
-      ELEMENT *node = (ELEMENT *)nodes_list->list[i];
+      ELEMENT *node = (ELEMENT *)node_structure->element;
       const char *normalized = lookup_extra_string (node, AI_key_normalized);
       const ELEMENT * const *menu_directions = lookup_extra_directions (node,
                                                  AI_key_menu_directions);
@@ -1237,8 +1227,10 @@ complete_node_tree_with_menus (DOCUMENT *document)
                   size_t j;
                   for (j = 0; j < nodes_list->number; j++)
                     {
-                      const ELEMENT *first_non_top_node
+                      const NODE_STRUCTURE *first_non_top_node_structure
                         = nodes_list->list[j];
+                      const ELEMENT *first_non_top_node
+                        = first_non_top_node_structure->element;
                       if (first_non_top_node != node)
                         {
                           top_node_next = first_non_top_node;
@@ -1377,11 +1369,10 @@ complete_node_tree_with_menus (DOCUMENT *document)
 }
 
 /* set node directions based on sectioning and @node explicit directions */
-CONST_ELEMENT_LIST *
+void
 construct_nodes_tree (DOCUMENT *document)
 {
   const C_HASHMAP *identifiers_target = &document->identifiers_target;
-  const ELEMENT *root = document->tree;
   ERROR_MESSAGE_LIST *error_messages = &document->error_messages;
   OPTIONS *options = document->options;
 
@@ -1391,9 +1382,10 @@ construct_nodes_tree (DOCUMENT *document)
 
   size_t i;
 
-  for (i = 0; i < root->e.c->contents.number; i++)
+  for (i = 0; i < document->nodes_list.number; i++)
     {
-      ELEMENT *node = root->e.c->contents.list[i];
+      const NODE_STRUCTURE *node_structure = document->nodes_list.list[i];
+      ELEMENT *node = (ELEMENT *)node_structure->element;
       ELEMENT *arguments_line;
       const char *normalized;
       int is_target;
@@ -1564,10 +1556,7 @@ construct_nodes_tree (DOCUMENT *document)
         }
     }
 
-  document->nodes_list = nodes_list;
   document->modified_information |= F_DOCM_nodes_list;
-
-  return nodes_list;
 }
 
 void
@@ -1733,7 +1722,7 @@ number_floats (DOCUMENT *document)
               if (!(command_other_flags (up) & CF_unnumbered))
                 {
                   const char *section_number
-                       = lookup_extra_string (up, AI_key_section_number);
+                    = lookup_extra_string (up, AI_key_section_heading_number);
                   nr_in_chapter++;
                   text_printf (&number, "%s.%zu", section_number,
                                                   nr_in_chapter);
diff --git a/tta/C/structuring_transfo/structuring.h 
b/tta/C/structuring_transfo/structuring.h
index a062a9772b..9616717fc4 100644
--- a/tta/C/structuring_transfo/structuring.h
+++ b/tta/C/structuring_transfo/structuring.h
@@ -8,8 +8,8 @@
 #include "document_types.h"
 
 void associate_internal_references (DOCUMENT *document);
-CONST_ELEMENT_LIST *sectioning_structure (DOCUMENT *document);
-CONST_ELEMENT_LIST *construct_nodes_tree (DOCUMENT *document);
+void sectioning_structure (DOCUMENT *document);
+void construct_nodes_tree (DOCUMENT *document);
 CONST_ELEMENT_LIST *get_node_node_childs_from_sectioning (const ELEMENT *node);
 void warn_non_empty_parts (DOCUMENT *document);
 void set_menus_node_directions (DOCUMENT *document);
diff --git a/tta/C/structuring_transfo/transformations.c 
b/tta/C/structuring_transfo/transformations.c
index 18ecebd3cd..31fc34d7c9 100644
--- a/tta/C/structuring_transfo/transformations.c
+++ b/tta/C/structuring_transfo/transformations.c
@@ -34,6 +34,7 @@
 #include "base_utils.h"
 #include "tree.h"
 #include "extra.h"
+#include "structure_list.h"
 #include "translations.h"
 #include "builtin_commands.h"
 #include "errors.h"
@@ -815,6 +816,7 @@ insert_nodes_for_sectioning_commands (DOCUMENT *document)
   ELEMENT_LIST *added_nodes = new_list ();
   size_t idx;
   ELEMENT *previous_node = 0;
+  size_t node_idx = 0;
 
   for (idx = 0; idx < root->e.c->contents.number; idx++)
     {
@@ -858,7 +860,11 @@ insert_nodes_for_sectioning_commands (DOCUMENT *document)
                   ELEMENT_LIST *new_previous = new_list ();
                   insert_into_contents (root, added_node, idx);
                   idx++;
-                  add_to_element_list (added_nodes, added_node);
+                  insert_into_node_structure_list (&document->nodes_list,
+                                                   added_node, node_idx);
+                  node_idx++;
+                  add_extra_integer (added_node, AI_key_node_number,
+                                     node_idx);
                   add_extra_element (added_node, AI_key_associated_section,
                                      content);
                   add_extra_element (content, AI_key_associated_node, 
added_node);
@@ -869,6 +875,7 @@ insert_nodes_for_sectioning_commands (DOCUMENT *document)
                   modify_tree (content, &reassociate_to_node,
                                (void *)new_previous);
                   destroy_list (new_previous);
+                  add_to_element_list (added_nodes, added_node);
                 }
             }
         }
@@ -876,7 +883,10 @@ insert_nodes_for_sectioning_commands (DOCUMENT *document)
         {
           int is_target = (content->flags & EF_is_target);
           if (is_target)
-            previous_node = content;
+            {
+              previous_node = content;
+              node_idx++;
+            }
         }
     }
   return added_nodes;
diff --git a/tta/TODO b/tta/TODO
index a80715cf7c..5bcaa1e58d 100644
--- a/tta/TODO
+++ b/tta/TODO
@@ -66,6 +66,10 @@ converter_customization_options, unique_at_command_options.
 Texinfo tree reader
 ===================
 
+Separate tree information from structuring information.  For that, add
+structures for nodes, sections and headings (including xrefname)
+separate from the tree.
+
 Go through misc_args extra as if going through regular arguments and not
 as if it was an attribute.
 
diff --git a/tta/perl/Texinfo/Convert/DocBook.pm 
b/tta/perl/Texinfo/Convert/DocBook.pm
index 4376c14121..21163dc354 100644
--- a/tta/perl/Texinfo/Convert/DocBook.pm
+++ b/tta/perl/Texinfo/Convert/DocBook.pm
@@ -1037,12 +1037,13 @@ sub _convert($$;$)
             # having a label (empty) is important.
             my $label = '';
             if ($opened_element->{'extra'}
-                and defined($opened_element->{'extra'}->{'section_number'})
+                and defined($opened_element->{'extra'}
+                                        ->{'section_heading_number'})
                 and ($self->get_conf('NUMBER_SECTIONS')
                      or !defined($self->get_conf('NUMBER_SECTIONS')))) {
               # Looking at docbook2html output, Appendix is appended in the
               # section title, so only the letter is used.
-              $label = $opened_element->{'extra'}->{'section_number'};
+              $label = $opened_element->{'extra'}->{'section_heading_number'};
             }
             my $docbook_sectioning_element
                = _docbook_section_element($self, $opened_element);
diff --git a/tta/perl/Texinfo/Convert/HTML.pm b/tta/perl/Texinfo/Convert/HTML.pm
index 33cc4f9765..29b11cf310 100644
--- a/tta/perl/Texinfo/Convert/HTML.pm
+++ b/tta/perl/Texinfo/Convert/HTML.pm
@@ -1355,9 +1355,9 @@ sub _internal_command_tree($$$)
         }
         if ($line_arg->{'contents'}) {
           my $section_number;
-          $section_number = $command->{'extra'}->{'section_number'}
+          $section_number = $command->{'extra'}->{'section_heading_number'}
             if ($command->{'extra'}
-                and defined($command->{'extra'}->{'section_number'}));
+                and defined($command->{'extra'}->{'section_heading_number'}));
           if ($section_number
               and ($self->get_conf('NUMBER_SECTIONS')
                    or !defined($self->get_conf('NUMBER_SECTIONS')))) {
@@ -10043,8 +10043,9 @@ sub _set_root_commands_targets_node_files($)
   }
 
   if ($sections_list) {
-    foreach my $root_element (@{$sections_list}) {
-      $self->_new_sectioning_command_target($root_element);
+    foreach my $section_structure (@{$sections_list}) {
+      my $section_element = $section_structure->{'element'};
+      $self->_new_sectioning_command_target($section_element);
     }
   }
 }
@@ -11406,10 +11407,11 @@ sub _default_format_contents($$;$$)
        # We consider that if sectioning_root is set as usual, all the
        # fields are set consistently with what sectioning_structure would
        # have set.
-       or !$sections_list->[0]->{'extra'}
-       or !defined($sections_list->[0]->{'extra'}->{'sectioning_root'}));
+       or !$sections_list->[0]->{'element'}->{'extra'}
+       or !defined($sections_list->[0]->{'element'}
+                            ->{'extra'}->{'sectioning_root'}));
 
-  my $section_root = $sections_list->[0]
+  my $section_root = $sections_list->[0]->{'element'}
                                    ->{'extra'}->{'sectioning_root'};
   my $is_contents;
   $is_contents = 1 if ($cmdname eq 'contents');
@@ -12921,7 +12923,8 @@ sub output_internal_links($)
 
   if ($self->{'document'}) {
     my $sections_list = $self->{'document'}->sections_list();
-    foreach my $command (@{$sections_list}) {
+    foreach my $section_structure (@{$sections_list}) {
+      my $command = $section_structure->{'element'};
       my $href = $self->command_href($command, '');
       my $tree = $self->command_tree($command);
       my $text;
diff --git a/tta/perl/Texinfo/Convert/IXIN.pm b/tta/perl/Texinfo/Convert/IXIN.pm
index 91901202ea..dc75f85848 100644
--- a/tta/perl/Texinfo/Convert/IXIN.pm
+++ b/tta/perl/Texinfo/Convert/IXIN.pm
@@ -608,7 +608,7 @@ sub output_ixin($$)
   my $sectioning_tree = '';
   $sectioning_tree  .= $self->ixin_open_element('sectioningtree');
   if ($sections_list) {
-    my $section_root = $sections_list->[0]
+    my $section_root = $sections_list->[0]->{'element'}
                                    ->{'extra'}->{'sectioning_root'};
     foreach my $top_section (@{$section_root->{'extra'}->{'section_childs'}}) {
       my $section = $top_section;
diff --git a/tta/perl/Texinfo/Convert/LaTeX.pm 
b/tta/perl/Texinfo/Convert/LaTeX.pm
index f337ffffa0..6b3553338b 100644
--- a/tta/perl/Texinfo/Convert/LaTeX.pm
+++ b/tta/perl/Texinfo/Convert/LaTeX.pm
@@ -1895,7 +1895,7 @@ sub _begin_document($)
       $sections_list = $self->{'document'}->sections_list();
     }
 
-    if ($sections_list) {
+    if ($sections_list and scalar(@$sections_list)) {
       if ($global_commands->{'titlepage'}
           or $global_commands->{'shorttitlepage'}) {
         $result .= _set_headings($self, 'pagenum');
@@ -4318,7 +4318,7 @@ sub _convert($$)
 
       if (defined($self->get_conf('CONTENTS_OUTPUT_LOCATION'))
           and $self->get_conf('CONTENTS_OUTPUT_LOCATION') eq 'inline'
-          and $sections_list
+          and $sections_list and scalar(@$sections_list)
           and not 
$self->{'formatting_context'}->[-1]->{'in_skipped_node_top'}) {
         $result .= "\\tableofcontents\\newpage\n";
       }
@@ -4329,7 +4329,7 @@ sub _convert($$)
         $sections_list = $self->{'document'}->sections_list();
       }
 
-      if ($sections_list) {
+      if ($sections_list and scalar(@$sections_list)) {
         # TODO see notes at the beginning
         $result .= '';
       }
diff --git a/tta/perl/Texinfo/Convert/Plaintext.pm 
b/tta/perl/Texinfo/Convert/Plaintext.pm
index c4e82213d4..57234563b9 100644
--- a/tta/perl/Texinfo/Convert/Plaintext.pm
+++ b/tta/perl/Texinfo/Convert/Plaintext.pm
@@ -1638,19 +1638,19 @@ sub format_contents($$$)
       my $arguments_line = $section->{'contents'}->[0];
       my $line_arg = $arguments_line->{'contents'}->[0];
       my $section_title_tree;
-      if (defined($section->{'extra'}->{'section_number'})
+      if (defined($section->{'extra'}->{'section_heading_number'})
           and ($self->get_conf('NUMBER_SECTIONS')
                or !defined($self->get_conf('NUMBER_SECTIONS')))) {
         if ($section->{'cmdname'} eq 'appendix'
             and $section->{'extra'}->{'section_level'} == 1) {
           $section_title_tree = $self->cdt('Appendix {number} {section_title}',
                {'number' => {'text'
-                               => $section->{'extra'}->{'section_number'}},
+                      => $section->{'extra'}->{'section_heading_number'}},
                 'section_title' => $line_arg});
         } else {
           $section_title_tree = $self->cdt('{number} {section_title}',
                {'number' => {'text'
-                               => $section->{'extra'}->{'section_number'}},
+                      => $section->{'extra'}->{'section_heading_number'}},
                 'section_title' => $line_arg});
         }
       } else {
@@ -2504,9 +2504,9 @@ sub _text_heading($$$;$$)
 
   my $number;
   if ($current->{'extra'}
-      and defined($current->{'extra'}->{'section_number'})
+      and defined($current->{'extra'}->{'section_heading_number'})
       and ($numbered or !defined($numbered))) {
-    $number = $current->{'extra'}->{'section_number'};
+    $number = $current->{'extra'}->{'section_heading_number'};
   }
 
   my ($heading, undef) = $self->convert_line_new_context (
@@ -3955,8 +3955,8 @@ sub _convert($$)
         $sections_list = $self->{'document'}->sections_list();
       }
 
-      if ($sections_list) {
-        my $sectioning_root = $sections_list->[0]
+      if ($sections_list and scalar(@$sections_list)) {
+        my $sectioning_root = $sections_list->[0]->{'element'}
                                 ->{'extra'}->{'sectioning_root'};
         $self->format_contents($sectioning_root, 'contents');
       }
@@ -3967,8 +3967,8 @@ sub _convert($$)
         $sections_list = $self->{'document'}->sections_list();
       }
 
-      if ($sections_list) {
-        my $sectioning_root = $sections_list->[0]
+      if ($sections_list and scalar(@$sections_list)) {
+        my $sectioning_root = $sections_list->[0]->{'element'}
                                 ->{'extra'}->{'sectioning_root'};
         $self->format_contents($sectioning_root, 'shortcontents');
       }
diff --git a/tta/perl/Texinfo/Convert/Utils.pm 
b/tta/perl/Texinfo/Convert/Utils.pm
index 1292abfe20..4042c4fc66 100644
--- a/tta/perl/Texinfo/Convert/Utils.pm
+++ b/tta/perl/Texinfo/Convert/Utils.pm
@@ -539,9 +539,9 @@ sub add_heading_number($$;$$)
 
   my $number;
   if ($current->{'extra'}
-      and defined($current->{'extra'}->{'section_number'})
+      and defined($current->{'extra'}->{'section_heading_number'})
       and ($numbered or !defined($numbered))) {
-    $number = $current->{'extra'}->{'section_number'};
+    $number = $current->{'extra'}->{'section_heading_number'};
   }
 
   my $result;
diff --git a/tta/perl/Texinfo/Document.pm b/tta/perl/Texinfo/Document.pm
index a58b04224a..a2a5fca824 100644
--- a/tta/perl/Texinfo/Document.pm
+++ b/tta/perl/Texinfo/Document.pm
@@ -789,14 +789,11 @@ to the same document with @-commands that refer to node, 
anchors or floats.
 
 =item $nodes_list = nodes_list($document)
 
-Returns an array reference containing the document nodes.  In general set to
-the nodes list constructed by L<Texinfo::Structuring
-construct_nodes_tree|Texinfo::Structuring/$nodes_list = 
construct_nodes_tree($document)>.
+Returns an array reference containing the document nodes.
 
 =item $sections_list = sections_list($document)
 
-Returns an array reference containing the document sections.  In general set 
to the sections list determined by
-L<Texinfo::Structuring 
sectioning_structure|Texinfo::Structuring/$sections_list = 
sectioning_structure($document)>.
+Returns an array reference containing the document sections.
 
 =back
 
diff --git a/tta/perl/Texinfo/ParserNonXS.pm b/tta/perl/Texinfo/ParserNonXS.pm
index d27fbf1ac7..34cacd7310 100644
--- a/tta/perl/Texinfo/ParserNonXS.pm
+++ b/tta/perl/Texinfo/ParserNonXS.pm
@@ -3639,6 +3639,20 @@ sub _text_contents_to_plain_text {
   return ($text, $superfluous_arg);
 }
 
+sub _add_to_structure_list($$$)
+{
+  my $document = shift;
+  my $type = shift;
+  my $element = shift;
+
+  my $list_key = $type.'s_list';
+  my $number_key = $type.'_number';
+
+  push @{$document->{$list_key}}, {'element' => $element};
+  $element->{'extra'} = {} if (!$element->{'extra'});
+  $element->{'extra'}->{$number_key} = scalar(@{$document->{$list_key}});
+}
+
 sub _associate_title_command_anchor($$)
 {
   my $self = shift;
@@ -3915,6 +3929,10 @@ sub _end_line_misc_line($$$)
     _check_register_target_element_label($self, $line_arg,
                                          $current, $source_info);
 
+    if ($current->{'extra'}
+        and defined($current->{'extra'}->{'normalized'})) {
+      _add_to_structure_list($document, 'node', $current);
+    }
     if ($self->{'current_part'}) {
       my $part = $self->{'current_part'};
       if (not $part->{'extra'}
@@ -4116,9 +4134,13 @@ sub _end_line_misc_line($$$)
                                   $command), $source_info);
       }
     }
+    if ($command ne 'node') {
+      _add_to_structure_list($document, 'section', $command_element);
+    }
     # only *heading as sectioning commands are handled just before
   } elsif ($sectioning_heading_commands{$data_cmdname}
            or $data_cmdname eq 'xrefname') {
+    _add_to_structure_list($document, 'heading', $command_element);
     _associate_title_command_anchor($self, $command_element);
   }
   return $current;
@@ -9458,7 +9480,7 @@ if there is an associated external manual name, and a 
I<normalized> key for the
 normalized label, built as specified in the I<HTML Xref> Texinfo documentation
 node.
 
-If you called 
L<Texinfo::Structuring::construct_nodes_tree|Texinfo::Structuring/$nodes_list = 
construct_nodes_tree($document)>,
+If you called 
L<Texinfo::Structuring::construct_nodes_tree|Texinfo::Structuring/construct_nodes_tree($document)>,
 the I<node_directions> hash in the C<@node> element C<extra> associates
 I<up>, I<next> and I<prev> keys to the elements corresponding to the node
 line directions.
@@ -9511,7 +9533,7 @@ The part preceding the command is in I<associated_part>.
 If the level of the document was modified by C<@raisections>
 or C<@lowersections>, the differential level is in I<level_modifier>.
 
-Other C<extra> keys are set when you call 
L<Texinfo::Structuring::sectioning_structure|Texinfo::Structuring/$sections_list
 = sectioning_structure($document)>.
+Other C<extra> keys are set when you call 
L<Texinfo::Structuring::sectioning_structure|Texinfo::Structuring/sectioning_structure($document)>.
 
 =item C<untranslated_def_line_arg>
 
diff --git a/tta/perl/Texinfo/Structuring.pm b/tta/perl/Texinfo/Structuring.pm
index bdd5e6da16..6543e4eabc 100644
--- a/tta/perl/Texinfo/Structuring.pm
+++ b/tta/perl/Texinfo/Structuring.pm
@@ -112,7 +112,7 @@ my %unnumbered_commands = 
%Texinfo::Commands::unnumbered_commands;
 # Go through the sectioning commands (e.g. @chapter, not @node), and
 # set:
 # 'section_level'
-# 'section_number'
+# 'section_heading_number'
 # 'section_childs'
 # 'section_directions'
 # 'toplevel_directions'
@@ -122,7 +122,6 @@ sub sectioning_structure($)
 
   my $customization_information = $document;
 
-  my $root = $document->tree();
   my $registrar = $document->registrar();
 
   my $sec_root;
@@ -134,19 +133,14 @@ sub sectioning_structure($)
   my $number_top_level;
 
   my $section_top;
-  my @sections_list;
 
   # holds the current number for all the levels.  It is not possible to use
   # something like the last child index, because of @unnumbered.
   my @command_numbers;
   # keep track of the unnumbered
   my @command_unnumbered;
-  foreach my $content (@{$root->{'contents'}}) {
-    if (!$content->{'cmdname'} or $content->{'cmdname'} eq 'node'
-        or $content->{'cmdname'} eq 'bye') {
-      next;
-    }
-    push @sections_list, $content;
+  foreach my $section_structure (@{$document->{'sections_list'}}) {
+    my $content = $section_structure->{'element'};
     if ($content->{'cmdname'} eq 'top' and not $section_top) {
       $section_top = $content;
     }
@@ -308,7 +302,7 @@ sub sectioning_structure($)
           }
         }
         if (defined($section_number)) {
-          $content->{'extra'}->{'section_number'} = $section_number;
+          $content->{'extra'}->{'section_heading_number'} = $section_number;
         }
       }
     }
@@ -336,12 +330,6 @@ sub sectioning_structure($)
                            $customization_information->get_conf('DEBUG'));
     }
   }
-  if (scalar(@sections_list) == 0) {
-    return undef;
-  } else {
-    $document->{'sections_list'} = \@sections_list;
-    return \@sections_list;
-  }
 }
 
 # for debugging
@@ -506,10 +494,11 @@ sub check_nodes_are_referenced($)
   return unless ($nodes_list and scalar(@{$nodes_list}));
 
   my $top_node = $identifier_target->{'Top'};
-  $top_node = $nodes_list->[0] if (!$top_node);
+  $top_node = $nodes_list->[0]->{'element'} if (!$top_node);
 
   my %referenced_nodes = ($top_node => 1);
-  foreach my $node (@{$nodes_list}) {
+  foreach my $node_structure (@{$nodes_list}) {
+    my $node = $node_structure->{'element'};
     next if (!$node->{'extra'});
     # gather referenced nodes based on node pointers
     my $node_directions = $node->{'extra'}->{'node_directions'};
@@ -559,7 +548,8 @@ sub check_nodes_are_referenced($)
     }
   }
 
-  foreach my $node (@{$nodes_list}) {
+  foreach my $node_structure (@{$nodes_list}) {
+    my $node = $node_structure->{'element'};
     # it is normal that a redundant node is not referenced
     if ($node->{'extra'}->{'is_target'}) {
       if (not exists($referenced_nodes{$node})) {
@@ -615,7 +605,8 @@ sub set_menus_node_directions($)
   # another command such as @format, may be treated slightly
   # differently; at least, there are no error messages for them.
   #
-  foreach my $node (@{$nodes_list}) {
+  foreach my $node_structure (@{$nodes_list}) {
+    my $node = $node_structure->{'element'};
     if ($node->{'extra'}->{'menus'}) {
       if (@{$node->{'extra'}->{'menus'}} > 1) {
         foreach my $menu (@{$node->{'extra'}->{'menus'}}[1 .. 
$#{$node->{'extra'}->{'menus'}}]) {
@@ -740,14 +731,15 @@ sub complete_node_tree_with_menus($)
   my $identifier_target = $document->labels_information();
   my $registrar = $document->registrar();
 
-  return unless ($nodes_list and @{$nodes_list});
+  return unless ($nodes_list and scalar(@{$nodes_list}));
 
   my $top_node_next;
   my $top_node;
 
   my %cached_menu_nodes;
   # Go through all the nodes
-  foreach my $node (@{$nodes_list}) {
+  foreach my $node_structure (@{$nodes_list}) {
+    my $node = $node_structure->{'element'};
     my $arguments_line = $node->{'contents'}->[0];
     my $automatic_directions
       = (not (scalar(@{$arguments_line->{'contents'}}) > 1));
@@ -854,7 +846,9 @@ sub complete_node_tree_with_menus($)
           $top_node_next = $menu_child;
         } else {
           # use the first non top node as next for Top
-          foreach my $first_non_top_node (@{$nodes_list}) {
+          foreach my $first_non_top_node_structure (@{$nodes_list}) {
+            my $first_non_top_node
+              = $first_non_top_node_structure->{'element'};
             if ($first_non_top_node ne $node) {
               $top_node_next = $first_non_top_node;
               last;
@@ -946,21 +940,15 @@ sub construct_nodes_tree($)
   my $document = shift;
 
   my $customization_information = $document;
-  my $root = $document->tree();
   my $identifier_target = $document->labels_information();
   my $registrar = $document->registrar();
 
   my $top_node = $identifier_target->{'Top'};
   my $top_node_section_child;
-  my @nodes_list = ();
   # Go through all the nodes and set directions.
-  foreach my $node (@{$root->{'contents'}}) {
-    if (!$node->{'cmdname'} or $node->{'cmdname'} ne 'node'
-        or !$node->{'extra'}
-        or !defined($node->{'extra'}->{'normalized'})) {
-      next;
-    }
-    push @nodes_list, $node;
+  my $nodes_list = $document->nodes_list();
+  foreach my $node_structure (@{$nodes_list}) {
+    my $node = $node_structure->{'element'};
 
     my $arguments_line = $node->{'contents'}->[0];
     my $automatic_directions
@@ -1068,10 +1056,6 @@ sub construct_nodes_tree($)
       }
     }
   }
-
-  $document->{'nodes_list'} = \@nodes_list;
-
-  return \@nodes_list;
 }
 
 # For each internal reference command, set the 'normalized' key, in the
@@ -1182,7 +1166,7 @@ sub number_floats($)
         }
         if (!$unnumbered_commands{$up->{'cmdname'}}) {
           $nr_in_chapter++;
-          $number = $up->{'extra'}->{'section_number'} .
+          $number = $up->{'extra'}->{'section_heading_number'} .
             '.' . $nr_in_chapter;
         }
       }
@@ -1781,11 +1765,11 @@ Returns the Texinfo tree corresponding to a single menu 
entry pointing to
 I<$node>.  If I<$use_sections> is set, use the section name for the menu
 entry name.  Returns C<undef> if the node argument is missing.
 
-=item $nodes_list = construct_nodes_tree($document)
+=item construct_nodes_tree($document)
 X<C<construct_nodes_tree>>
 
 Goes through nodes in I<$document> tree and set directions.  Set the list of
-nodes in the I<$document>.  Returns the list of nodes.
+nodes in the I<$document>.
 
 This functions sets, in the C<extra> node element hash:
 
@@ -1812,13 +1796,12 @@ Return the sectioning command name corresponding to the 
sectioning
 element I<$element>, adjusted in order to take into account raised
 and lowered sections, when needed.
 
-=item $sections_list = sectioning_structure($document)
+=item sectioning_structure($document)
 X<C<sectioning_structure>>
 
 This function goes through the parsed document tree and gather information
 on the document structure for sectioning commands.  It sets the sections
-elements list in the document and returns a reference
-on the sections elements list.
+elements list in the document.
 
 It sets section elements C<extra> hash values:
 
diff --git a/tta/perl/Texinfo/Transformations.pm 
b/tta/perl/Texinfo/Transformations.pm
index fe9f8cdfb3..58409895a0 100644
--- a/tta/perl/Texinfo/Transformations.pm
+++ b/tta/perl/Texinfo/Transformations.pm
@@ -450,10 +450,12 @@ sub insert_nodes_for_sectioning_commands($)
 
   my $customization_information = $document;
   my $root = $document->tree();
+  my $nodes_list = $document->nodes_list();
 
   my @added_nodes;
   my $previous_node;
   my $contents_nr = scalar(@{$root->{'contents'}});
+  my $node_idx = 0;
   for (my $idx = 0; $idx < $contents_nr; $idx++) {
     my $content = $root->{'contents'}->[$idx];
     if ($content->{'cmdname'} and $content->{'cmdname'} ne 'node'
@@ -477,22 +479,29 @@ sub insert_nodes_for_sectioning_commands($)
         splice(@{$root->{'contents'}}, $idx, 0, $new_node);
         $idx++;
         $contents_nr++;
-        push @added_nodes, $new_node;
+        # insert in nodes list
+        my $new_list_node = {'element' => $new_node};
+        splice(@{$nodes_list}, $node_idx, 0, $new_list_node);
+        $node_idx++;
+        $new_node->{'extra'}->{'node_number'} = $node_idx;
         $new_node->{'extra'}->{'associated_section'} = $content;
         $content->{'extra'} = {} if (!$content->{'extra'});
         $content->{'extra'}->{'associated_node'} = $new_node;
         $new_node->{'parent'} = $content->{'parent'};
+        push @added_nodes, $new_node;
         # reassociate index entries and menus
         Texinfo::ManipulateTree::modify_tree($content, \&_reassociate_to_node,
                                              [$new_node, $previous_node]);
       }
     }
     # check is_target to avoid erroneous nodes, such as duplicates
-    $previous_node = $content
-      if ($content->{'cmdname'}
-          and $content->{'cmdname'} eq 'node'
-          and $content->{'extra'}
-          and $content->{'extra'}->{'is_target'});
+    if ($content->{'cmdname'}
+        and $content->{'cmdname'} eq 'node'
+        and $content->{'extra'}
+        and $content->{'extra'}->{'is_target'}) {
+      $previous_node = $content;
+      $node_idx++;
+    }
   }
   return \@added_nodes;
 }
@@ -1007,7 +1016,7 @@ Add menu entries or whole menus for nodes associated with 
sections,
 based on the sectioning tree.  If the optional
 C<$add_section_names_in_entries> argument is set, a menu entry
 name is added using the section name.  This function should be
-called after L<sectioning_structure|Texinfo::Structuring/$sections_list = 
sectioning_structure($document)>.
+called after 
L<sectioning_structure|Texinfo::Structuring/sectioning_structure($document)>.
 
 =item complete_tree_nodes_missing_menu($document, 
$use_section_names_in_entries)
 X<C<complete_tree_nodes_missing_menu>>
@@ -1016,7 +1025,7 @@ Add whole menus for nodes associated with sections and 
without menu,
 based on the I<$document> sectioning tree.
 If the optional I<$add_section_names_in_entries> argument is set, a menu entry
 name is added using the section name.  This function should be
-called after L<sectioning_structure|Texinfo::Structuring/$sections_list = 
sectioning_structure($document)>.
+called after 
L<sectioning_structure|Texinfo::Structuring/sectioning_structure($document)>.
 
 =item fill_gaps_in_sectioning_in_document($document, $commands_heading_tree)
 X<C<fill_gaps_in_sectioning_in_document>>
diff --git a/tta/perl/ext/epub3.pm b/tta/perl/ext/epub3.pm
index 7b4355bc96..8129380fc3 100644
--- a/tta/perl/ext/epub3.pm
+++ b/tta/perl/ext/epub3.pm
@@ -683,7 +683,7 @@ EOT
 
   my $sections_list = $document->sections_list();
 
-  if ($sections_list) {
+  if ($sections_list and scalar(@$sections_list) > 0) {
     $nav_file_path_name
      = join('/', ($epub_document_destination_directory, $nav_filename));
     my ($encoded_nav_file_path_name, $nav_path_encoding)
@@ -714,7 +714,7 @@ EOT
 EOT
 
     # similar code as in chm.pm
-    my $section_root = $sections_list->[0]
+    my $section_root = $sections_list->[0]->{'element'}
                                          ->{'extra'}->{'sectioning_root'};
     my $upper_level = $section_root->{'extra'}->{'section_childs'}->[0]
                                             ->{'extra'}->{'section_level'};
@@ -725,7 +725,8 @@ EOT
     $upper_level = 1 if ($upper_level <= 0);
     my $root_level = $upper_level - 1;
     my $level = $root_level;
-    foreach my $section (@{$sections_list}) {
+    foreach my $section_structure (@{$sections_list}) {
+      my $section = $section_structure->{'element'};
       next if ($section->{'cmdname'} eq 'part');
       my $section_level = $section->{'extra'}->{'section_level'};
       $section_level = 1 if ($section_level == 0);
diff --git a/tta/perl/init/book.pm b/tta/perl/init/book.pm
index 4ad872fdf2..5847fe8273 100644
--- a/tta/perl/init/book.pm
+++ b/tta/perl/init/book.pm
@@ -484,9 +484,9 @@ sub book_unit_file_name($$$$)
   return (undef, undef) unless ($command);
   if ($converter->unit_is_top_output_unit($output_unit)) {
     $new_file_name = "${prefix}_top.html";
-  } elsif (defined($command->{'extra'}->{'section_number'})
-           and ($command->{'extra'}->{'section_number'} ne '')) {
-    my $number = $command->{'extra'}->{'section_number'};
+  } elsif (defined($command->{'extra'}->{'section_heading_number'})
+           and ($command->{'extra'}->{'section_heading_number'} ne '')) {
+    my $number = $command->{'extra'}->{'section_heading_number'};
     $number .= '.' unless ($number =~ /\.$/);
     $new_file_name = "${prefix}_$number" . 'html';
   } else {
diff --git a/tta/perl/init/chm.pm b/tta/perl/init/chm.pm
index 0ff96eef78..bdeffa5188 100644
--- a/tta/perl/init/chm.pm
+++ b/tta/perl/init/chm.pm
@@ -331,8 +331,8 @@ sub chm_init($)
   }
   print $hhc_fh "</OBJECT>\n";
 
-  if ($sections_list) {
-    my $section_root = $sections_list->[0]
+  if ($sections_list and scalar(@$sections_list) > 0) {
+    my $section_root = $sections_list->[0]->{'element'}
                                          ->{'extra'}->{'sectioning_root'};
     my $upper_level = $section_root->{'extra'}->{'section_childs'}->[0]
                                                ->{'extra'}->{'section_level'};
@@ -343,7 +343,8 @@ sub chm_init($)
     $upper_level = 1 if ($upper_level <= 0);
     my $root_level = $upper_level - 1;
     my $level = $root_level;
-    foreach my $section (@{$sections_list}) {
+    foreach my $section_structure (@{$sections_list}) {
+      my $section = $section_structure->{'element'};
       next if ($section->{'cmdname'} eq 'part');
       my $section_level = $section->{'extra'}->{'section_level'};
       $section_level = 1 if ($section_level == 0);
diff --git a/tta/perl/init/documentation_examples.pm 
b/tta/perl/init/documentation_examples.pm
index e8ccb0068f..e63a4dac4d 100644
--- a/tta/perl/init/documentation_examples.pm
+++ b/tta/perl/init/documentation_examples.pm
@@ -134,7 +134,8 @@ sub _set_appendix_direction_node_name
     return 0;
   }
 
-  foreach my $section (@{$sections_list}) {
+  foreach my $section_structure (@{$sections_list}) {
+    my $section = $section_structure->{'element'};
     if ($section->{'cmdname'} eq 'appendix') {
       if ($section->{'extra'}
           and $section->{'extra'}->{'associated_node'}) {
diff --git a/tta/perl/t/results/alias/alias_of_added_index.pl 
b/tta/perl/t/results/alias/alias_of_added_index.pl
index e2e7942c57..0bdb67723a 100644
--- a/tta/perl/t/results/alias/alias_of_added_index.pl
+++ b/tta/perl/t/results/alias/alias_of_added_index.pl
@@ -39,6 +39,7 @@ $result_tree_text{'alias_of_added_index'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -55,6 +56,7 @@ $result_tree_text{'alias_of_added_index'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -93,6 +95,7 @@ $result_tree_text{'alias_of_added_index'} = '*document_root C5
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -108,8 +111,9 @@ $result_tree_text{'alias_of_added_index'} = '*document_root 
C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/alias/alias_of_added_index_before_added_index.pl 
b/tta/perl/t/results/alias/alias_of_added_index_before_added_index.pl
index 3c3e878445..a388c0a4f6 100644
--- a/tta/perl/t/results/alias/alias_of_added_index_before_added_index.pl
+++ b/tta/perl/t/results/alias/alias_of_added_index_before_added_index.pl
@@ -39,6 +39,7 @@ $result_tree_text{'alias_of_added_index_before_added_index'} 
= '*document_root C
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -55,6 +56,7 @@ $result_tree_text{'alias_of_added_index_before_added_index'} 
= '*document_root C
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -93,6 +95,7 @@ $result_tree_text{'alias_of_added_index_before_added_index'} 
= '*document_root C
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -108,8 +111,9 @@ 
$result_tree_text{'alias_of_added_index_before_added_index'} = '*document_root C
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/conditionals/cond.pl 
b/tta/perl/t/results/conditionals/cond.pl
index 1804ac88a3..9eef181cba 100644
--- a/tta/perl/t/results/conditionals/cond.pl
+++ b/tta/perl/t/results/conditionals/cond.pl
@@ -87,6 +87,7 @@ $result_tree_text{'cond'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -102,6 +103,7 @@ $result_tree_text{'cond'} = '*document_root C5
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -121,6 +123,7 @@ $result_tree_text{'cond'} = '*document_root C5
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/conditionals/cond_ifhtml_ifinfo.pl 
b/tta/perl/t/results/conditionals/cond_ifhtml_ifinfo.pl
index 63094abf74..a12c6e7e48 100644
--- a/tta/perl/t/results/conditionals/cond_ifhtml_ifinfo.pl
+++ b/tta/perl/t/results/conditionals/cond_ifhtml_ifinfo.pl
@@ -87,6 +87,7 @@ $result_tree_text{'cond_ifhtml_ifinfo'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -102,6 +103,7 @@ $result_tree_text{'cond_ifhtml_ifinfo'} = '*document_root C5
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -121,6 +123,7 @@ $result_tree_text{'cond_ifhtml_ifinfo'} = '*document_root C5
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/conditionals/cond_ifhtml_ifinfo_iftex.pl 
b/tta/perl/t/results/conditionals/cond_ifhtml_ifinfo_iftex.pl
index d466c129a5..44d9a50969 100644
--- a/tta/perl/t/results/conditionals/cond_ifhtml_ifinfo_iftex.pl
+++ b/tta/perl/t/results/conditionals/cond_ifhtml_ifinfo_iftex.pl
@@ -87,6 +87,7 @@ $result_tree_text{'cond_ifhtml_ifinfo_iftex'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -102,6 +103,7 @@ $result_tree_text{'cond_ifhtml_ifinfo_iftex'} = 
'*document_root C5
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -121,6 +123,7 @@ $result_tree_text{'cond_ifhtml_ifinfo_iftex'} = 
'*document_root C5
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/conditionals/cond_info.pl 
b/tta/perl/t/results/conditionals/cond_info.pl
index 4177db3d40..e1ee5bb95e 100644
--- a/tta/perl/t/results/conditionals/cond_info.pl
+++ b/tta/perl/t/results/conditionals/cond_info.pl
@@ -87,6 +87,7 @@ $result_tree_text{'cond_info'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -102,6 +103,7 @@ $result_tree_text{'cond_info'} = '*document_root C5
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -121,6 +123,7 @@ $result_tree_text{'cond_info'} = '*document_root C5
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/conditionals/cond_info_ifhtml_ifinfo_iftex.pl 
b/tta/perl/t/results/conditionals/cond_info_ifhtml_ifinfo_iftex.pl
index 3575acefc1..aaff6fb5ed 100644
--- a/tta/perl/t/results/conditionals/cond_info_ifhtml_ifinfo_iftex.pl
+++ b/tta/perl/t/results/conditionals/cond_info_ifhtml_ifinfo_iftex.pl
@@ -87,6 +87,7 @@ $result_tree_text{'cond_info_ifhtml_ifinfo_iftex'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -102,6 +103,7 @@ $result_tree_text{'cond_info_ifhtml_ifinfo_iftex'} = 
'*document_root C5
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -121,6 +123,7 @@ $result_tree_text{'cond_info_ifhtml_ifinfo_iftex'} = 
'*document_root C5
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl 
b/tta/perl/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
index cbcfa38de8..d88e543107 100644
--- a/tta/perl/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
+++ b/tta/perl/t/results/conditionals/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
@@ -87,6 +87,7 @@ $result_tree_text{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -102,6 +103,7 @@ $result_tree_text{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} 
= '*document_root C5
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -121,6 +123,7 @@ $result_tree_text{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} 
= '*document_root C5
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl 
b/tta/perl/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl
index c2c3a3fa1e..6dc7948d4c 100644
--- a/tta/perl/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl
+++ b/tta/perl/t/results/conditionals/cond_no-ifhtml_no-ifinfo_no-iftex.pl
@@ -87,6 +87,7 @@ $result_tree_text{'cond_no-ifhtml_no-ifinfo_no-iftex'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -102,6 +103,7 @@ $result_tree_text{'cond_no-ifhtml_no-ifinfo_no-iftex'} = 
'*document_root C5
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -121,6 +123,7 @@ $result_tree_text{'cond_no-ifhtml_no-ifinfo_no-iftex'} = 
'*document_root C5
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/conditionals/cond_xml.pl 
b/tta/perl/t/results/conditionals/cond_xml.pl
index 4d51bf3947..48b1894d14 100644
--- a/tta/perl/t/results/conditionals/cond_xml.pl
+++ b/tta/perl/t/results/conditionals/cond_xml.pl
@@ -87,6 +87,7 @@ $result_tree_text{'cond_xml'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -102,6 +103,7 @@ $result_tree_text{'cond_xml'} = '*document_root C5
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -121,6 +123,7 @@ $result_tree_text{'cond_xml'} = '*document_root C5
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/conditionals/defcondx_Dbar.pl 
b/tta/perl/t/results/conditionals/defcondx_Dbar.pl
index f36beaa9eb..f64c4911e0 100644
--- a/tta/perl/t/results/conditionals/defcondx_Dbar.pl
+++ b/tta/perl/t/results/conditionals/defcondx_Dbar.pl
@@ -24,6 +24,7 @@ $result_tree_text{'defcondx_Dbar'} = '*document_root C3
   |{ }
  |EXTRA
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/conditionals/defcondx_Ubar.pl 
b/tta/perl/t/results/conditionals/defcondx_Ubar.pl
index e28208ca95..fabf1d6b17 100644
--- a/tta/perl/t/results/conditionals/defcondx_Ubar.pl
+++ b/tta/perl/t/results/conditionals/defcondx_Ubar.pl
@@ -24,6 +24,7 @@ $result_tree_text{'defcondx_Ubar'} = '*document_root C3
   |{ }
  |EXTRA
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/converters_tests/at_commands_in_raw.pl 
b/tta/perl/t/results/converters_tests/at_commands_in_raw.pl
index d08b20cca4..fff2dd55fd 100644
--- a/tta/perl/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tta/perl/t/results/converters_tests/at_commands_in_raw.pl
@@ -15,6 +15,7 @@ $result_tree_text{'at_commands_in_raw'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'at_commands_in_raw'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -73,6 +75,7 @@ $result_tree_text{'at_commands_in_raw'} = '*document_root C5
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -88,8 +91,9 @@ $result_tree_text{'at_commands_in_raw'} = '*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/converters_tests/combined_fonts.pl 
b/tta/perl/t/results/converters_tests/combined_fonts.pl
index 898f5c1cb6..1c81bbb19e 100644
--- a/tta/perl/t/results/converters_tests/combined_fonts.pl
+++ b/tta/perl/t/results/converters_tests/combined_fonts.pl
@@ -28,6 +28,7 @@ $result_tree_text{'combined_fonts'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -44,6 +45,7 @@ $result_tree_text{'combined_fonts'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -66,6 +68,7 @@ $result_tree_text{'combined_fonts'} = '*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -81,8 +84,9 @@ $result_tree_text{'combined_fonts'} = '*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/converters_tests/commands_in_sc.pl 
b/tta/perl/t/results/converters_tests/commands_in_sc.pl
index 096bfc1f3c..1ac7c41fcc 100644
--- a/tta/perl/t/results/converters_tests/commands_in_sc.pl
+++ b/tta/perl/t/results/converters_tests/commands_in_sc.pl
@@ -15,6 +15,7 @@ $result_tree_text{'commands_in_sc'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'commands_in_sc'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -53,6 +55,7 @@ $result_tree_text{'commands_in_sc'} = '*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -68,8 +71,9 @@ $result_tree_text{'commands_in_sc'} = '*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/converters_tests/commands_in_settitle_with_title.pl 
b/tta/perl/t/results/converters_tests/commands_in_settitle_with_title.pl
index 9d68a3417e..fa82f648a5 100644
--- a/tta/perl/t/results/converters_tests/commands_in_settitle_with_title.pl
+++ b/tta/perl/t/results/converters_tests/commands_in_settitle_with_title.pl
@@ -64,6 +64,7 @@ $result_tree_text{'commands_in_settitle_with_title'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -80,6 +81,7 @@ $result_tree_text{'commands_in_settitle_with_title'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -102,6 +104,7 @@ $result_tree_text{'commands_in_settitle_with_title'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -117,8 +120,9 @@ $result_tree_text{'commands_in_settitle_with_title'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/converters_tests/commands_in_var.pl 
b/tta/perl/t/results/converters_tests/commands_in_var.pl
index 8cb485e92c..cb37e91c33 100644
--- a/tta/perl/t/results/converters_tests/commands_in_var.pl
+++ b/tta/perl/t/results/converters_tests/commands_in_var.pl
@@ -15,6 +15,7 @@ $result_tree_text{'commands_in_var'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'commands_in_var'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -53,6 +55,7 @@ $result_tree_text{'commands_in_var'} = '*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -68,8 +71,9 @@ $result_tree_text{'commands_in_var'} = '*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/converters_tests/complex_nestings.pl 
b/tta/perl/t/results/converters_tests/complex_nestings.pl
index 9b3d8aec71..36439a216c 100644
--- a/tta/perl/t/results/converters_tests/complex_nestings.pl
+++ b/tta/perl/t/results/converters_tests/complex_nestings.pl
@@ -15,6 +15,7 @@ $result_tree_text{'complex_nestings'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'complex_nestings'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -53,6 +55,7 @@ $result_tree_text{'complex_nestings'} = '*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -68,8 +71,9 @@ $result_tree_text{'complex_nestings'} = '*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/converters_tests/contents_at_document_begin.pl 
b/tta/perl/t/results/converters_tests/contents_at_document_begin.pl
index 0db62f4fed..144f0e1b0f 100644
--- a/tta/perl/t/results/converters_tests/contents_at_document_begin.pl
+++ b/tta/perl/t/results/converters_tests/contents_at_document_begin.pl
@@ -25,6 +25,7 @@ $result_tree_text{'contents_at_document_begin'} = 
'*document_root C6
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -41,6 +42,7 @@ $result_tree_text{'contents_at_document_begin'} = 
'*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -96,6 +98,7 @@ $result_tree_text{'contents_at_document_begin'} = 
'*document_root C6
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -111,8 +114,9 @@ $result_tree_text{'contents_at_document_begin'} = 
'*document_root C6
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/converters_tests/contents_at_document_begin_inline.pl 
b/tta/perl/t/results/converters_tests/contents_at_document_begin_inline.pl
index bfca1115d2..870e6feedf 100644
--- a/tta/perl/t/results/converters_tests/contents_at_document_begin_inline.pl
+++ b/tta/perl/t/results/converters_tests/contents_at_document_begin_inline.pl
@@ -25,6 +25,7 @@ $result_tree_text{'contents_at_document_begin_inline'} = 
'*document_root C6
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -41,6 +42,7 @@ $result_tree_text{'contents_at_document_begin_inline'} = 
'*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -96,6 +98,7 @@ $result_tree_text{'contents_at_document_begin_inline'} = 
'*document_root C6
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -111,8 +114,9 @@ $result_tree_text{'contents_at_document_begin_inline'} = 
'*document_root C6
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/converters_tests/contents_at_document_begin_separate_element.pl
 
b/tta/perl/t/results/converters_tests/contents_at_document_begin_separate_element.pl
index 6fb0bcabeb..3b63996f09 100644
--- 
a/tta/perl/t/results/converters_tests/contents_at_document_begin_separate_element.pl
+++ 
b/tta/perl/t/results/converters_tests/contents_at_document_begin_separate_element.pl
@@ -25,6 +25,7 @@ 
$result_tree_text{'contents_at_document_begin_separate_element'} = '*document_ro
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -41,6 +42,7 @@ 
$result_tree_text{'contents_at_document_begin_separate_element'} = '*document_ro
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -96,6 +98,7 @@ 
$result_tree_text{'contents_at_document_begin_separate_element'} = '*document_ro
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -111,8 +114,9 @@ 
$result_tree_text{'contents_at_document_begin_separate_element'} = '*document_ro
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/converters_tests/conversion_with_undef_customization.pl 
b/tta/perl/t/results/converters_tests/conversion_with_undef_customization.pl
index 39b432b6ed..ab252a7d13 100644
--- a/tta/perl/t/results/converters_tests/conversion_with_undef_customization.pl
+++ b/tta/perl/t/results/converters_tests/conversion_with_undef_customization.pl
@@ -16,6 +16,7 @@ $result_tree_text{'conversion_with_undef_customization'} = 
'*document_root C7
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'conversion_with_undef_customization'} = 
'*document_root C7
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -63,6 +65,7 @@ $result_tree_text{'conversion_with_undef_customization'} = 
'*document_root C7
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap_00ea}
   *arguments_line C1
    *line_arg C2
@@ -82,8 +85,9 @@ $result_tree_text{'conversion_with_undef_customization'} = 
'*document_root C7
  |associated_node:[E2]
  |section_childs:EC[E5]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C2
@@ -132,6 +136,7 @@ $result_tree_text{'conversion_with_undef_customization'} = 
'*document_root C7
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[up->E2]
+ |node_number:{3}
  |normalized:{sec}
   *arguments_line C1
    *line_arg C1
@@ -147,8 +152,9 @@ $result_tree_text{'conversion_with_undef_customization'} = 
'*document_root C7
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[up->E3]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/converters_tests/definition_commands.pl 
b/tta/perl/t/results/converters_tests/definition_commands.pl
index caedc75e26..ed7f5a1e73 100644
--- a/tta/perl/t/results/converters_tests/definition_commands.pl
+++ b/tta/perl/t/results/converters_tests/definition_commands.pl
@@ -16,6 +16,7 @@ $result_tree_text{'definition_commands'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'definition_commands'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'definition_commands'} = '*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'definition_commands'} = '*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/converters_tests/empty_xrefname.pl 
b/tta/perl/t/results/converters_tests/empty_xrefname.pl
index 0ff88efb2d..0e7166edff 100644
--- a/tta/perl/t/results/converters_tests/empty_xrefname.pl
+++ b/tta/perl/t/results/converters_tests/empty_xrefname.pl
@@ -15,6 +15,7 @@ $result_tree_text{'empty_xrefname'} = '*document_root C8
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'empty_xrefname'} = '*document_root C8
  |associated_node:[E0]
  |section_childs:EC[E3|E9]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'empty_xrefname'} = '*document_root C8
  |is_target:{1}
  |menus:EC[E4]
  |node_directions:D[next->E8|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Chap}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'empty_xrefname'} = '*document_root C8
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E9|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E9|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -117,6 +121,7 @@ $result_tree_text{'empty_xrefname'} = '*document_root C8
  |is_target:{1}
  |menu_directions:D[up->E2]
  |node_directions:D[up->E2]
+ |node_number:{3}
  |normalized:{entiti}
   *arguments_line C1
    *line_arg C1
@@ -128,6 +133,7 @@ $result_tree_text{'empty_xrefname'} = '*document_root C8
   |EXTRA
   |associated_anchor_command:[E5]
   |global_command_number:{1}
+  |heading_number:{1}
    *line_arg
    |INFO
    |spaces_after_argument:
@@ -139,6 +145,7 @@ $result_tree_text{'empty_xrefname'} = '*document_root C8
    |{ }
   |EXTRA
   |global_command_number:{1}
+  |heading_number:{2}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -154,6 +161,7 @@ $result_tree_text{'empty_xrefname'} = '*document_root C8
  |associated_title_command:[E9]
  |is_target:{1}
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{4}
  |normalized:{chip}
   *arguments_line C1
    *line_arg C1
@@ -169,8 +177,9 @@ $result_tree_text{'empty_xrefname'} = '*document_root C8
  |associated_anchor_command:[E8]
  |associated_node:[E8]
  |section_directions:D[prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/converters_tests/extension_undef.pl 
b/tta/perl/t/results/converters_tests/extension_undef.pl
index 51eeef3e8c..808b71b517 100644
--- a/tta/perl/t/results/converters_tests/extension_undef.pl
+++ b/tta/perl/t/results/converters_tests/extension_undef.pl
@@ -16,6 +16,7 @@ $result_tree_text{'extension_undef'} = '*document_root C4
  |EXTRA
  |section_childs:EC[E2]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -37,6 +38,7 @@ $result_tree_text{'extension_undef'} = '*document_root C4
  |associated_section:[E2]
  |associated_title_command:[E2]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -52,8 +54,9 @@ $result_tree_text{'extension_undef'} = '*document_root C4
  |associated_anchor_command:[E1]
  |associated_node:[E1]
  |section_directions:D[up->E0]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E0|up->E0]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/converters_tests/footnote_no_number.pl 
b/tta/perl/t/results/converters_tests/footnote_no_number.pl
index 710180a87b..f2e8e07d39 100644
--- a/tta/perl/t/results/converters_tests/footnote_no_number.pl
+++ b/tta/perl/t/results/converters_tests/footnote_no_number.pl
@@ -15,6 +15,7 @@ $result_tree_text{'footnote_no_number'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'footnote_no_number'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -53,6 +55,7 @@ $result_tree_text{'footnote_no_number'} = '*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -68,8 +71,9 @@ $result_tree_text{'footnote_no_number'} = '*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/converters_tests/footnote_no_number_separate.pl 
b/tta/perl/t/results/converters_tests/footnote_no_number_separate.pl
index 545cbd2066..0e234dcc55 100644
--- a/tta/perl/t/results/converters_tests/footnote_no_number_separate.pl
+++ b/tta/perl/t/results/converters_tests/footnote_no_number_separate.pl
@@ -15,6 +15,7 @@ $result_tree_text{'footnote_no_number_separate'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'footnote_no_number_separate'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -53,6 +55,7 @@ $result_tree_text{'footnote_no_number_separate'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -68,8 +71,9 @@ $result_tree_text{'footnote_no_number_separate'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/converters_tests/form_feeds.pl 
b/tta/perl/t/results/converters_tests/form_feeds.pl
index 79fa8f34cb..412a31f49b 100644
--- a/tta/perl/t/results/converters_tests/form_feeds.pl
+++ b/tta/perl/t/results/converters_tests/form_feeds.pl
@@ -13,6 +13,7 @@ $result_tree_text{'form_feeds'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -28,6 +29,7 @@ $result_tree_text{'form_feeds'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap-node}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/converters_tests/frenchspacing_and_code.pl 
b/tta/perl/t/results/converters_tests/frenchspacing_and_code.pl
index 694de74029..e70600feec 100644
--- a/tta/perl/t/results/converters_tests/frenchspacing_and_code.pl
+++ b/tta/perl/t/results/converters_tests/frenchspacing_and_code.pl
@@ -29,6 +29,7 @@ $result_tree_text{'frenchspacing_and_code'} = '*document_root 
C7
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -45,6 +46,7 @@ $result_tree_text{'frenchspacing_and_code'} = '*document_root 
C7
  |associated_node:[E0]
  |section_childs:EC[E3|E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -67,6 +69,7 @@ $result_tree_text{'frenchspacing_and_code'} = '*document_root 
C7
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter-frenchspacing}
   *arguments_line C1
    *line_arg C1
@@ -82,8 +85,9 @@ $result_tree_text{'frenchspacing_and_code'} = '*document_root 
C7
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -310,6 +314,7 @@ $result_tree_text{'frenchspacing_and_code'} = 
'*document_root C7
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{chap-no}
   *arguments_line C1
    *line_arg C1
@@ -325,8 +330,9 @@ $result_tree_text{'frenchspacing_and_code'} = 
'*document_root C7
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/converters_tests/image_formatting.pl 
b/tta/perl/t/results/converters_tests/image_formatting.pl
index acd311da6e..e2b0b8ac7e 100644
--- a/tta/perl/t/results/converters_tests/image_formatting.pl
+++ b/tta/perl/t/results/converters_tests/image_formatting.pl
@@ -15,6 +15,7 @@ $result_tree_text{'image_formatting'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'image_formatting'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -53,6 +55,7 @@ $result_tree_text{'image_formatting'} = '*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -68,8 +71,9 @@ $result_tree_text{'image_formatting'} = '*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/converters_tests/index_entry_in_preformatted.pl 
b/tta/perl/t/results/converters_tests/index_entry_in_preformatted.pl
index 137461588c..e876ba87c9 100644
--- a/tta/perl/t/results/converters_tests/index_entry_in_preformatted.pl
+++ b/tta/perl/t/results/converters_tests/index_entry_in_preformatted.pl
@@ -15,6 +15,7 @@ $result_tree_text{'index_entry_in_preformatted'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'index_entry_in_preformatted'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -53,6 +55,7 @@ $result_tree_text{'index_entry_in_preformatted'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -68,8 +71,9 @@ $result_tree_text{'index_entry_in_preformatted'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/converters_tests/indices_in_begin_tables_lists.pl 
b/tta/perl/t/results/converters_tests/indices_in_begin_tables_lists.pl
index 170e638e5c..757e5e534f 100644
--- a/tta/perl/t/results/converters_tests/indices_in_begin_tables_lists.pl
+++ b/tta/perl/t/results/converters_tests/indices_in_begin_tables_lists.pl
@@ -19,6 +19,7 @@ $result_tree_text{'indices_in_begin_tables_lists'} = 
'*document_root C8
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -35,6 +36,7 @@ $result_tree_text{'indices_in_begin_tables_lists'} = 
'*document_root C8
  |associated_node:[E0]
  |section_childs:EC[E3|E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -57,6 +59,7 @@ $result_tree_text{'indices_in_begin_tables_lists'} = 
'*document_root C8
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -72,8 +75,9 @@ $result_tree_text{'indices_in_begin_tables_lists'} = 
'*document_root C8
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -1123,6 +1127,7 @@ $result_tree_text{'indices_in_begin_tables_lists'} = 
'*document_root C8
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{printindex}
   *arguments_line C1
    *line_arg C1
@@ -1138,8 +1143,9 @@ $result_tree_text{'indices_in_begin_tables_lists'} = 
'*document_root C8
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
 
b/tta/perl/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
index 86cf25c2ef..f9ecf93472 100644
--- 
a/tta/perl/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
+++ 
b/tta/perl/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
@@ -19,6 +19,7 @@ 
$result_tree_text{'indices_in_begin_tables_lists_entries_after_item'} = '*docume
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -35,6 +36,7 @@ 
$result_tree_text{'indices_in_begin_tables_lists_entries_after_item'} = '*docume
  |associated_node:[E0]
  |section_childs:EC[E3|E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -57,6 +59,7 @@ 
$result_tree_text{'indices_in_begin_tables_lists_entries_after_item'} = '*docume
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -72,8 +75,9 @@ 
$result_tree_text{'indices_in_begin_tables_lists_entries_after_item'} = '*docume
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -1123,6 +1127,7 @@ 
$result_tree_text{'indices_in_begin_tables_lists_entries_after_item'} = '*docume
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{printindex}
   *arguments_line C1
    *line_arg C1
@@ -1138,8 +1143,9 @@ 
$result_tree_text{'indices_in_begin_tables_lists_entries_after_item'} = '*docume
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/converters_tests/link.pl 
b/tta/perl/t/results/converters_tests/link.pl
index cac60318e2..095e616199 100644
--- a/tta/perl/t/results/converters_tests/link.pl
+++ b/tta/perl/t/results/converters_tests/link.pl
@@ -14,6 +14,7 @@ $result_tree_text{'link'} = '*document_root C4
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{One}
   *arguments_line C1
    *line_arg C1
@@ -28,6 +29,7 @@ $result_tree_text{'link'} = '*document_root C4
  |EXTRA
  |associated_anchor_command:[E0]
  |associated_node:[E0]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
@@ -51,6 +53,7 @@ $result_tree_text{'link'} = '*document_root C4
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{2}
  |normalized:{Two}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/converters_tests/namedanchor.pl 
b/tta/perl/t/results/converters_tests/namedanchor.pl
index 5ee04cba62..1ebbe0498c 100644
--- a/tta/perl/t/results/converters_tests/namedanchor.pl
+++ b/tta/perl/t/results/converters_tests/namedanchor.pl
@@ -15,6 +15,7 @@ $result_tree_text{'namedanchor'} = '*document_root C11
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'namedanchor'} = '*document_root C11
  |associated_node:[E0]
  |section_childs:EC[E4|E13]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -69,6 +71,7 @@ $result_tree_text{'namedanchor'} = '*document_root C11
  |associated_title_command:[E4]
  |is_target:{1}
  |node_directions:D[next->E12|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -85,8 +88,9 @@ $result_tree_text{'namedanchor'} = '*document_root C11
  |associated_node:[E3]
  |section_childs:EC[E11]
  |section_directions:D[next->E13|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E13|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C4
@@ -162,6 +166,7 @@ $result_tree_text{'namedanchor'} = '*document_root C11
  |associated_title_command:[E11]
  |is_target:{1}
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{secc1}
   *arguments_line C1
    *line_arg C1
@@ -177,8 +182,9 @@ $result_tree_text{'namedanchor'} = '*document_root C11
  |associated_anchor_command:[E10]
  |associated_node:[E10]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -390,6 +396,7 @@ $result_tree_text{'namedanchor'} = '*document_root C11
  |is_target:{1}
  |menus:EC[E14]
  |node_directions:D[prev->E3|up->E0]
+ |node_number:{4}
  |normalized:{chap1}
   *arguments_line C1
    *line_arg C1
@@ -406,8 +413,9 @@ $result_tree_text{'namedanchor'} = '*document_root C11
  |associated_node:[E12]
  |section_childs:EC[E16]
  |section_directions:D[prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{4}
  |toplevel_directions:D[prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -510,6 +518,7 @@ $result_tree_text{'namedanchor'} = '*document_root C11
  |is_target:{1}
  |menu_directions:D[next->E2|up->E12]
  |node_directions:D[next->E2|up->E12]
+ |node_number:{5}
  |normalized:{secc2}
   *arguments_line C1
    *line_arg C1
@@ -525,8 +534,9 @@ $result_tree_text{'namedanchor'} = '*document_root C11
  |associated_anchor_command:[E15]
  |associated_node:[E15]
  |section_directions:D[up->E13]
+ |section_heading_number:{2.1}
  |section_level:{2}
- |section_number:{2.1}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/converters_tests/non_empty_part.pl 
b/tta/perl/t/results/converters_tests/non_empty_part.pl
index 47e227c188..623a3e136a 100644
--- a/tta/perl/t/results/converters_tests/non_empty_part.pl
+++ b/tta/perl/t/results/converters_tests/non_empty_part.pl
@@ -16,6 +16,7 @@ $result_tree_text{'non_empty_part'} = '*document_root C16
  |part_following_node:[E1]
  |section_directions:D[next->E2]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -41,6 +42,7 @@ $result_tree_text{'non_empty_part'} = '*document_root C16
  |is_target:{1}
  |menus:EC[E3]
  |node_directions:D[next->E7]
+ |node_number:{1}
  |node_preceding_part:[E0]
  |normalized:{Top}
   *arguments_line C1
@@ -59,6 +61,7 @@ $result_tree_text{'non_empty_part'} = '*document_root C16
  |associated_part:[E0]
  |section_directions:D[next->E4|prev->E0]
  |section_level:{0}
+ |section_number:{2}
  |toplevel_directions:D[next->E5]
   *arguments_line C1
    *line_arg C1
@@ -117,6 +120,7 @@ $result_tree_text{'non_empty_part'} = '*document_root C16
  |section_childs:EC[E5]
  |section_directions:D[next->E6|prev->E2]
  |section_level:{0}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -134,8 +138,9 @@ $result_tree_text{'non_empty_part'} = '*document_root C16
  |EXTRA
  |associated_part:[E4]
  |section_directions:D[up->E4]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{4}
  |toplevel_directions:D[next->E9|prev->E2|up->E2]
   *arguments_line C1
    *line_arg C1
@@ -153,6 +158,7 @@ $result_tree_text{'non_empty_part'} = '*document_root C16
  |part_following_node:[E7]
  |section_directions:D[next->E8|prev->E4]
  |section_level:{0}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -173,6 +179,7 @@ $result_tree_text{'non_empty_part'} = '*document_root C16
  |is_target:{1}
  |menu_directions:D[up->E1]
  |node_directions:D[prev->E1|up->E1]
+ |node_number:{2}
  |node_preceding_part:[E6]
  |normalized:{part-chapter-node}
   *arguments_line C1
@@ -191,6 +198,7 @@ $result_tree_text{'non_empty_part'} = '*document_root C16
  |section_childs:EC[E9]
  |section_directions:D[next->E10|prev->E6]
  |section_level:{0}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -210,8 +218,9 @@ $result_tree_text{'non_empty_part'} = '*document_root C16
  |associated_node:[E7]
  |associated_part:[E8]
  |section_directions:D[up->E8]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{7}
  |toplevel_directions:D[next->E12|prev->E5|up->E2]
   *arguments_line C1
    *line_arg C1
@@ -228,6 +237,7 @@ $result_tree_text{'non_empty_part'} = '*document_root C16
  |global_command_number:{5}
  |section_directions:D[next->E11|prev->E8]
  |section_level:{0}
+ |section_number:{8}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -248,6 +258,7 @@ $result_tree_text{'non_empty_part'} = '*document_root C16
  |section_childs:EC[E12]
  |section_directions:D[next->E13|prev->E10]
  |section_level:{0}
+ |section_number:{9}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -265,8 +276,9 @@ $result_tree_text{'non_empty_part'} = '*document_root C16
  |EXTRA
  |associated_part:[E11]
  |section_directions:D[up->E11]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{10}
  |toplevel_directions:D[next->E15|prev->E9|up->E2]
   *arguments_line C1
    *line_arg C1
@@ -286,6 +298,7 @@ $result_tree_text{'non_empty_part'} = '*document_root C16
  |section_childs:EC[E15]
  |section_directions:D[prev->E11]
  |section_level:{0}
+ |section_number:{11}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -305,6 +318,7 @@ $result_tree_text{'non_empty_part'} = '*document_root C16
  |associated_title_command:[E15]
  |is_target:{1}
  |node_directions:D[up->E1]
+ |node_number:{3}
  |node_preceding_part:[E13]
  |normalized:{node-between-part-and-chapter}
   *arguments_line C1
@@ -323,8 +337,9 @@ $result_tree_text{'non_empty_part'} = '*document_root C16
  |associated_node:[E14]
  |associated_part:[E13]
  |section_directions:D[up->E13]
+ |section_heading_number:{4}
  |section_level:{1}
- |section_number:{4}
+ |section_number:{12}
  |toplevel_directions:D[prev->E12|up->E2]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/converters_tests/non_empty_part_no_top_node_output.pl 
b/tta/perl/t/results/converters_tests/non_empty_part_no_top_node_output.pl
index 54c6cfc106..089e031ff6 100644
--- a/tta/perl/t/results/converters_tests/non_empty_part_no_top_node_output.pl
+++ b/tta/perl/t/results/converters_tests/non_empty_part_no_top_node_output.pl
@@ -16,6 +16,7 @@ $result_tree_text{'non_empty_part_no_top_node_output'} = 
'*document_root C16
  |part_following_node:[E1]
  |section_directions:D[next->E2]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -41,6 +42,7 @@ $result_tree_text{'non_empty_part_no_top_node_output'} = 
'*document_root C16
  |is_target:{1}
  |menus:EC[E3]
  |node_directions:D[next->E7]
+ |node_number:{1}
  |node_preceding_part:[E0]
  |normalized:{Top}
   *arguments_line C1
@@ -59,6 +61,7 @@ $result_tree_text{'non_empty_part_no_top_node_output'} = 
'*document_root C16
  |associated_part:[E0]
  |section_directions:D[next->E4|prev->E0]
  |section_level:{0}
+ |section_number:{2}
  |toplevel_directions:D[next->E5]
   *arguments_line C1
    *line_arg C1
@@ -117,6 +120,7 @@ $result_tree_text{'non_empty_part_no_top_node_output'} = 
'*document_root C16
  |section_childs:EC[E5]
  |section_directions:D[next->E6|prev->E2]
  |section_level:{0}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -134,8 +138,9 @@ $result_tree_text{'non_empty_part_no_top_node_output'} = 
'*document_root C16
  |EXTRA
  |associated_part:[E4]
  |section_directions:D[up->E4]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{4}
  |toplevel_directions:D[next->E9|prev->E2|up->E2]
   *arguments_line C1
    *line_arg C1
@@ -153,6 +158,7 @@ $result_tree_text{'non_empty_part_no_top_node_output'} = 
'*document_root C16
  |part_following_node:[E7]
  |section_directions:D[next->E8|prev->E4]
  |section_level:{0}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -173,6 +179,7 @@ $result_tree_text{'non_empty_part_no_top_node_output'} = 
'*document_root C16
  |is_target:{1}
  |menu_directions:D[up->E1]
  |node_directions:D[prev->E1|up->E1]
+ |node_number:{2}
  |node_preceding_part:[E6]
  |normalized:{part-chapter-node}
   *arguments_line C1
@@ -191,6 +198,7 @@ $result_tree_text{'non_empty_part_no_top_node_output'} = 
'*document_root C16
  |section_childs:EC[E9]
  |section_directions:D[next->E10|prev->E6]
  |section_level:{0}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -210,8 +218,9 @@ $result_tree_text{'non_empty_part_no_top_node_output'} = 
'*document_root C16
  |associated_node:[E7]
  |associated_part:[E8]
  |section_directions:D[up->E8]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{7}
  |toplevel_directions:D[next->E12|prev->E5|up->E2]
   *arguments_line C1
    *line_arg C1
@@ -228,6 +237,7 @@ $result_tree_text{'non_empty_part_no_top_node_output'} = 
'*document_root C16
  |global_command_number:{5}
  |section_directions:D[next->E11|prev->E8]
  |section_level:{0}
+ |section_number:{8}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -248,6 +258,7 @@ $result_tree_text{'non_empty_part_no_top_node_output'} = 
'*document_root C16
  |section_childs:EC[E12]
  |section_directions:D[next->E13|prev->E10]
  |section_level:{0}
+ |section_number:{9}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -265,8 +276,9 @@ $result_tree_text{'non_empty_part_no_top_node_output'} = 
'*document_root C16
  |EXTRA
  |associated_part:[E11]
  |section_directions:D[up->E11]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{10}
  |toplevel_directions:D[next->E15|prev->E9|up->E2]
   *arguments_line C1
    *line_arg C1
@@ -286,6 +298,7 @@ $result_tree_text{'non_empty_part_no_top_node_output'} = 
'*document_root C16
  |section_childs:EC[E15]
  |section_directions:D[prev->E11]
  |section_level:{0}
+ |section_number:{11}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -305,6 +318,7 @@ $result_tree_text{'non_empty_part_no_top_node_output'} = 
'*document_root C16
  |associated_title_command:[E15]
  |is_target:{1}
  |node_directions:D[up->E1]
+ |node_number:{3}
  |node_preceding_part:[E13]
  |normalized:{node-between-part-and-chapter}
   *arguments_line C1
@@ -323,8 +337,9 @@ $result_tree_text{'non_empty_part_no_top_node_output'} = 
'*document_root C16
  |associated_node:[E14]
  |associated_part:[E13]
  |section_directions:D[up->E13]
+ |section_heading_number:{4}
  |section_level:{1}
- |section_number:{4}
+ |section_number:{12}
  |toplevel_directions:D[prev->E12|up->E2]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/converters_tests/printindex_merged_indices_code_style.pl 
b/tta/perl/t/results/converters_tests/printindex_merged_indices_code_style.pl
index f7c7c59353..4ebc69fda6 100644
--- 
a/tta/perl/t/results/converters_tests/printindex_merged_indices_code_style.pl
+++ 
b/tta/perl/t/results/converters_tests/printindex_merged_indices_code_style.pl
@@ -16,6 +16,7 @@ $result_tree_text{'printindex_merged_indices_code_style'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'printindex_merged_indices_code_style'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -55,6 +57,7 @@ $result_tree_text{'printindex_merged_indices_code_style'} = 
'*document_root C5
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -70,8 +73,9 @@ $result_tree_text{'printindex_merged_indices_code_style'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/converters_tests/ref_in_sectioning.pl 
b/tta/perl/t/results/converters_tests/ref_in_sectioning.pl
index 6d873ce247..ae914d39f3 100644
--- a/tta/perl/t/results/converters_tests/ref_in_sectioning.pl
+++ b/tta/perl/t/results/converters_tests/ref_in_sectioning.pl
@@ -21,6 +21,7 @@ $result_tree_text{'ref_in_sectioning'} = '*document_root C20
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -37,6 +38,7 @@ $result_tree_text{'ref_in_sectioning'} = '*document_root C20
  |associated_node:[E0]
  |section_childs:EC[E4|E6]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -132,6 +134,7 @@ $result_tree_text{'ref_in_sectioning'} = '*document_root C20
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node}
   *arguments_line C1
    *line_arg C1
@@ -147,8 +150,9 @@ $result_tree_text{'ref_in_sectioning'} = '*document_root C20
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C2
@@ -185,6 +189,7 @@ $result_tree_text{'ref_in_sectioning'} = '*document_root C20
  |is_target:{1}
  |menu_directions:D[prev->E3|up->E0]
  |node_directions:D[prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -201,8 +206,9 @@ $result_tree_text{'ref_in_sectioning'} = '*document_root C20
  |associated_node:[E5]
  |section_childs:EC[E7|E8|E9|E10|E11|E12|E13|E14|E15|E16|E17|E18|E19]
  |section_directions:D[prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E4|up->E1]
   *arguments_line C1
    *line_arg C2
@@ -223,8 +229,9 @@ $result_tree_text{'ref_in_sectioning'} = '*document_root C20
   |{ }
  |EXTRA
  |section_directions:D[next->E8|up->E6]
+ |section_heading_number:{2.1}
  |section_level:{2}
- |section_number:{2.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C7
    |INFO
@@ -270,8 +277,9 @@ $result_tree_text{'ref_in_sectioning'} = '*document_root C20
   |{ }
  |EXTRA
  |section_directions:D[next->E9|prev->E7|up->E6]
+ |section_heading_number:{2.2}
  |section_level:{2}
- |section_number:{2.2}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C2
    |INFO
@@ -296,8 +304,9 @@ $result_tree_text{'ref_in_sectioning'} = '*document_root C20
   |{ }
  |EXTRA
  |section_directions:D[next->E10|prev->E8|up->E6]
+ |section_heading_number:{2.3}
  |section_level:{2}
- |section_number:{2.3}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C2
    |INFO
@@ -327,8 +336,9 @@ $result_tree_text{'ref_in_sectioning'} = '*document_root C20
   |{ }
  |EXTRA
  |section_directions:D[next->E11|prev->E9|up->E6]
+ |section_heading_number:{2.4}
  |section_level:{2}
- |section_number:{2.4}
+ |section_number:{7}
   *arguments_line C1
    *line_arg C2
    |INFO
@@ -356,8 +366,9 @@ $result_tree_text{'ref_in_sectioning'} = '*document_root C20
   |{ }
  |EXTRA
  |section_directions:D[next->E12|prev->E10|up->E6]
+ |section_heading_number:{2.5}
  |section_level:{2}
- |section_number:{2.5}
+ |section_number:{8}
   *arguments_line C1
    *line_arg C2
    |INFO
@@ -386,8 +397,9 @@ $result_tree_text{'ref_in_sectioning'} = '*document_root C20
   |{ }
  |EXTRA
  |section_directions:D[next->E13|prev->E11|up->E6]
+ |section_heading_number:{2.6}
  |section_level:{2}
- |section_number:{2.6}
+ |section_number:{9}
   *arguments_line C1
    *line_arg C2
    |INFO
@@ -416,8 +428,9 @@ $result_tree_text{'ref_in_sectioning'} = '*document_root C20
   |{ }
  |EXTRA
  |section_directions:D[next->E14|prev->E12|up->E6]
+ |section_heading_number:{2.7}
  |section_level:{2}
- |section_number:{2.7}
+ |section_number:{10}
   *arguments_line C1
    *line_arg C2
    |INFO
@@ -443,8 +456,9 @@ $result_tree_text{'ref_in_sectioning'} = '*document_root C20
   |{ }
  |EXTRA
  |section_directions:D[next->E15|prev->E13|up->E6]
+ |section_heading_number:{2.8}
  |section_level:{2}
- |section_number:{2.8}
+ |section_number:{11}
   *arguments_line C1
    *line_arg C2
    |INFO
@@ -467,8 +481,9 @@ $result_tree_text{'ref_in_sectioning'} = '*document_root C20
   |{ }
  |EXTRA
  |section_directions:D[next->E16|prev->E14|up->E6]
+ |section_heading_number:{2.9}
  |section_level:{2}
- |section_number:{2.9}
+ |section_number:{12}
   *arguments_line C1
    *line_arg C2
    |INFO
@@ -497,8 +512,9 @@ $result_tree_text{'ref_in_sectioning'} = '*document_root C20
   |{ }
  |EXTRA
  |section_directions:D[next->E17|prev->E15|up->E6]
+ |section_heading_number:{2.10}
  |section_level:{2}
- |section_number:{2.10}
+ |section_number:{13}
   *arguments_line C1
    *line_arg C3
    |INFO
@@ -532,8 +548,9 @@ $result_tree_text{'ref_in_sectioning'} = '*document_root C20
   |{ }
  |EXTRA
  |section_directions:D[next->E18|prev->E16|up->E6]
+ |section_heading_number:{2.11}
  |section_level:{2}
- |section_number:{2.11}
+ |section_number:{14}
   *arguments_line C1
    *line_arg C3
    |INFO
@@ -559,8 +576,9 @@ $result_tree_text{'ref_in_sectioning'} = '*document_root C20
   |{ }
  |EXTRA
  |section_directions:D[next->E19|prev->E17|up->E6]
+ |section_heading_number:{2.12}
  |section_level:{2}
- |section_number:{2.12}
+ |section_number:{15}
   *arguments_line C1
    *line_arg C2
    |INFO
@@ -583,8 +601,9 @@ $result_tree_text{'ref_in_sectioning'} = '*document_root C20
   |{ }
  |EXTRA
  |section_directions:D[prev->E18|up->E6]
+ |section_heading_number:{2.13}
  |section_level:{2}
- |section_number:{2.13}
+ |section_number:{16}
   *arguments_line C1
    *line_arg C2
    |INFO
diff --git 
a/tta/perl/t/results/converters_tests/reference_for_formatting_customizations.pl
 
b/tta/perl/t/results/converters_tests/reference_for_formatting_customizations.pl
index 1b35217ab2..b67bf12f4b 100644
--- 
a/tta/perl/t/results/converters_tests/reference_for_formatting_customizations.pl
+++ 
b/tta/perl/t/results/converters_tests/reference_for_formatting_customizations.pl
@@ -16,6 +16,7 @@ $result_tree_text{'reference_for_formatting_customizations'} 
= '*document_root C
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'reference_for_formatting_customizations'} 
= '*document_root C
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'reference_for_formatting_customizations'} 
= '*document_root C
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapt}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'reference_for_formatting_customizations'} 
= '*document_root C
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/converters_tests/references_to_top_no_top_output.pl 
b/tta/perl/t/results/converters_tests/references_to_top_no_top_output.pl
index 28b7281c59..4e1e594fa5 100644
--- a/tta/perl/t/results/converters_tests/references_to_top_no_top_output.pl
+++ b/tta/perl/t/results/converters_tests/references_to_top_no_top_output.pl
@@ -60,6 +60,7 @@ $result_tree_text{'references_to_top_no_top_output'} = 
'*document_root C5
  |associated_title_command:[E2]
  |is_target:{1}
  |node_directions:D[next->E9]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -76,6 +77,7 @@ $result_tree_text{'references_to_top_no_top_output'} = 
'*document_root C5
  |associated_node:[E1]
  |section_childs:EC[E10]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -210,6 +212,7 @@ $result_tree_text{'references_to_top_no_top_output'} = 
'*document_root C5
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E1|up->E1]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -225,8 +228,9 @@ $result_tree_text{'references_to_top_no_top_output'} = 
'*document_root C5
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[up->E2]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E2|up->E2]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/converters_tests/refs_formatting.pl 
b/tta/perl/t/results/converters_tests/refs_formatting.pl
index 2282b97cbb..930dd3d408 100644
--- a/tta/perl/t/results/converters_tests/refs_formatting.pl
+++ b/tta/perl/t/results/converters_tests/refs_formatting.pl
@@ -14,6 +14,7 @@ $result_tree_text{'refs_formatting'} = '*document_root C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -28,6 +29,7 @@ $result_tree_text{'refs_formatting'} = '*document_root C3
  |EXTRA
  |associated_anchor_command:[E0]
  |associated_node:[E0]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
diff --git a/tta/perl/t/results/converters_tests/sections_and_printindex.pl 
b/tta/perl/t/results/converters_tests/sections_and_printindex.pl
index b04dffbf49..1dd09ee725 100644
--- a/tta/perl/t/results/converters_tests/sections_and_printindex.pl
+++ b/tta/perl/t/results/converters_tests/sections_and_printindex.pl
@@ -15,6 +15,7 @@ $result_tree_text{'sections_and_printindex'} = 
'*document_root C8
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'sections_and_printindex'} = 
'*document_root C8
  |associated_node:[E0]
  |section_childs:EC[E3|E6]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -53,6 +55,7 @@ $result_tree_text{'sections_and_printindex'} = 
'*document_root C8
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'sections_and_printindex'} = 
'*document_root C8
  |associated_node:[E2]
  |section_childs:EC[E5]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -102,6 +106,7 @@ $result_tree_text{'sections_and_printindex'} = 
'*document_root C8
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[up->E2]
+ |node_number:{3}
  |normalized:{sec}
   *arguments_line C1
    *line_arg C1
@@ -117,8 +122,9 @@ $result_tree_text{'sections_and_printindex'} = 
'*document_root C8
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[up->E3]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -145,8 +151,9 @@ $result_tree_text{'sections_and_printindex'} = 
'*document_root C8
   |{ }
  |EXTRA
  |section_directions:D[prev->E3|up->E1]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{4}
  |toplevel_directions:D[prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/converters_tests/setfilename_no_extension.pl 
b/tta/perl/t/results/converters_tests/setfilename_no_extension.pl
index 33c921129b..831de3eb57 100644
--- a/tta/perl/t/results/converters_tests/setfilename_no_extension.pl
+++ b/tta/perl/t/results/converters_tests/setfilename_no_extension.pl
@@ -28,6 +28,7 @@ $result_tree_text{'setfilename_no_extension'} = 
'*document_root C4
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -43,6 +44,7 @@ $result_tree_text{'setfilename_no_extension'} = 
'*document_root C4
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -62,6 +64,7 @@ $result_tree_text{'setfilename_no_extension'} = 
'*document_root C4
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/converters_tests/simplest_test_prefix.pl 
b/tta/perl/t/results/converters_tests/simplest_test_prefix.pl
index f6220c835c..98d52652b7 100644
--- a/tta/perl/t/results/converters_tests/simplest_test_prefix.pl
+++ b/tta/perl/t/results/converters_tests/simplest_test_prefix.pl
@@ -16,6 +16,7 @@ $result_tree_text{'simplest_test_prefix'} = '*document_root C3
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/converters_tests/some_at_commands_in_ref_nodes.pl 
b/tta/perl/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
index a4b22e945c..18fde864eb 100644
--- a/tta/perl/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
+++ b/tta/perl/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
@@ -17,6 +17,7 @@ $result_tree_text{'some_at_commands_in_ref_nodes'} = 
'*document_root C5
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -33,6 +34,7 @@ $result_tree_text{'some_at_commands_in_ref_nodes'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -125,6 +127,7 @@ $result_tree_text{'some_at_commands_in_ref_nodes'} = 
'*document_root C5
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{A-sc-_00f1-_00e5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1}
   *arguments_line C1
    *line_arg C14
@@ -180,8 +183,9 @@ $result_tree_text{'some_at_commands_in_ref_nodes'} = 
'*document_root C5
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C14
diff --git a/tta/perl/t/results/converters_tests/spaces_in_empty_node_names.pl 
b/tta/perl/t/results/converters_tests/spaces_in_empty_node_names.pl
index e94e3e4444..301eb506bc 100644
--- a/tta/perl/t/results/converters_tests/spaces_in_empty_node_names.pl
+++ b/tta/perl/t/results/converters_tests/spaces_in_empty_node_names.pl
@@ -13,6 +13,7 @@ $result_tree_text{'spaces_in_empty_node_names'} = 
'*document_root C5
  |EXTRA
  |is_target:{1}
  |menus:EC[E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/converters_tests/spaces_in_node_names.pl 
b/tta/perl/t/results/converters_tests/spaces_in_node_names.pl
index ffafd3ccf3..c9f2756425 100644
--- a/tta/perl/t/results/converters_tests/spaces_in_node_names.pl
+++ b/tta/perl/t/results/converters_tests/spaces_in_node_names.pl
@@ -14,6 +14,7 @@ $result_tree_text{'spaces_in_node_names'} = '*document_root C5
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -89,6 +90,7 @@ $result_tree_text{'spaces_in_node_names'} = '*document_root C5
  |is_target:{1}
  |menu_directions:D[next->E3|up->E0]
  |node_directions:D[next->E3|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap-}
   *arguments_line C1
    *line_arg C3
@@ -107,6 +109,7 @@ $result_tree_text{'spaces_in_node_names'} = '*document_root 
C5
  |is_target:{1}
  |menu_directions:D[next->E4|prev->E2|up->E0]
  |node_directions:D[next->E4|prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{b-}
   *arguments_line C1
    *line_arg C2
@@ -128,6 +131,7 @@ $result_tree_text{'spaces_in_node_names'} = '*document_root 
C5
  |is_target:{1}
  |menu_directions:D[prev->E3|up->E0]
  |node_directions:D[prev->E3|up->E0]
+ |node_number:{4}
  |normalized:{c-}
   *arguments_line C1
    *line_arg C2
diff --git a/tta/perl/t/results/converters_tests/test_deftypefnnewline.pl 
b/tta/perl/t/results/converters_tests/test_deftypefnnewline.pl
index fabc0d953c..845b82240d 100644
--- a/tta/perl/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tta/perl/t/results/converters_tests/test_deftypefnnewline.pl
@@ -40,6 +40,7 @@ $result_tree_text{'test_deftypefnnewline'} = '*document_root 
C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -56,6 +57,7 @@ $result_tree_text{'test_deftypefnnewline'} = '*document_root 
C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -78,6 +80,7 @@ $result_tree_text{'test_deftypefnnewline'} = '*document_root 
C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -93,8 +96,9 @@ $result_tree_text{'test_deftypefnnewline'} = '*document_root 
C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/converters_tests/test_formatting_customizations.pl 
b/tta/perl/t/results/converters_tests/test_formatting_customizations.pl
index 0e3ebe03bc..60881ce477 100644
--- a/tta/perl/t/results/converters_tests/test_formatting_customizations.pl
+++ b/tta/perl/t/results/converters_tests/test_formatting_customizations.pl
@@ -16,6 +16,7 @@ $result_tree_text{'test_formatting_customizations'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'test_formatting_customizations'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'test_formatting_customizations'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapt}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'test_formatting_customizations'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/converters_tests/things_before_setfilename.pl 
b/tta/perl/t/results/converters_tests/things_before_setfilename.pl
index 3653b31cdd..f7950a4cf5 100644
--- a/tta/perl/t/results/converters_tests/things_before_setfilename.pl
+++ b/tta/perl/t/results/converters_tests/things_before_setfilename.pl
@@ -243,6 +243,7 @@ $result_tree_text{'things_before_setfilename'} = 
'*document_root C5
  |associated_title_command:[E6]
  |is_target:{1}
  |node_directions:D[next->E7]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -259,6 +260,7 @@ $result_tree_text{'things_before_setfilename'} = 
'*document_root C5
  |associated_node:[E5]
  |section_childs:EC[E8]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -281,6 +283,7 @@ $result_tree_text{'things_before_setfilename'} = 
'*document_root C5
  |associated_title_command:[E8]
  |is_target:{1}
  |node_directions:D[prev->E5|up->E5]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -296,8 +299,9 @@ $result_tree_text{'things_before_setfilename'} = 
'*document_root C5
  |associated_anchor_command:[E7]
  |associated_node:[E7]
  |section_directions:D[up->E6]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E6|up->E6]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/converters_tests/top_in_ref.pl 
b/tta/perl/t/results/converters_tests/top_in_ref.pl
index 8a1ca973f6..621f706c1f 100644
--- a/tta/perl/t/results/converters_tests/top_in_ref.pl
+++ b/tta/perl/t/results/converters_tests/top_in_ref.pl
@@ -13,6 +13,7 @@ $result_tree_text{'top_in_ref'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -28,6 +29,7 @@ $result_tree_text{'top_in_ref'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap-refs-node}
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/converters_tests/various_itemize_command_as_argument.pl 
b/tta/perl/t/results/converters_tests/various_itemize_command_as_argument.pl
index 39e7594965..c66b86c5c8 100644
--- a/tta/perl/t/results/converters_tests/various_itemize_command_as_argument.pl
+++ b/tta/perl/t/results/converters_tests/various_itemize_command_as_argument.pl
@@ -15,6 +15,7 @@ $result_tree_text{'various_itemize_command_as_argument'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'various_itemize_command_as_argument'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -53,6 +55,7 @@ $result_tree_text{'various_itemize_command_as_argument'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -68,8 +71,9 @@ $result_tree_text{'various_itemize_command_as_argument'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/converters_tests/various_vtable_command_as_argument.pl 
b/tta/perl/t/results/converters_tests/various_vtable_command_as_argument.pl
index 6626d251e4..c4345ebbd9 100644
--- a/tta/perl/t/results/converters_tests/various_vtable_command_as_argument.pl
+++ b/tta/perl/t/results/converters_tests/various_vtable_command_as_argument.pl
@@ -15,6 +15,7 @@ $result_tree_text{'various_vtable_command_as_argument'} = 
'*document_root C7
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'various_vtable_command_as_argument'} = 
'*document_root C7
  |associated_node:[E0]
  |section_childs:EC[E3|E6]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -53,6 +55,7 @@ $result_tree_text{'various_vtable_command_as_argument'} = 
'*document_root C7
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -68,8 +71,9 @@ $result_tree_text{'various_vtable_command_as_argument'} = 
'*document_root C7
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -445,6 +449,7 @@ $result_tree_text{'various_vtable_command_as_argument'} = 
'*document_root C7
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{Indices}
   *arguments_line C1
    *line_arg C1
@@ -460,8 +465,9 @@ $result_tree_text{'various_vtable_command_as_argument'} = 
'*document_root C7
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[prev->E3|up->E1]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{3}
  |toplevel_directions:D[prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/converters_tests/xrefname.pl 
b/tta/perl/t/results/converters_tests/xrefname.pl
index 74aff5d28a..66883ea730 100644
--- a/tta/perl/t/results/converters_tests/xrefname.pl
+++ b/tta/perl/t/results/converters_tests/xrefname.pl
@@ -15,6 +15,7 @@ $result_tree_text{'xrefname'} = '*document_root C7
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'xrefname'} = '*document_root C7
  |associated_node:[E0]
  |section_childs:EC[E4|E6]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'xrefname'} = '*document_root C7
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{ntiti}
   *arguments_line C1
    *line_arg C1
@@ -68,6 +71,7 @@ $result_tree_text{'xrefname'} = '*document_root C7
   |EXTRA
   |associated_anchor_command:[E2]
   |global_command_number:{1}
+  |heading_number:{1}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -81,8 +85,9 @@ $result_tree_text{'xrefname'} = '*document_root C7
  |EXTRA
  |associated_node:[E2]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -100,6 +105,7 @@ $result_tree_text{'xrefname'} = '*document_root C7
  |associated_title_command:[E6]
  |is_target:{1}
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{chip}
   *arguments_line C1
    *line_arg C1
@@ -115,8 +121,9 @@ $result_tree_text{'xrefname'} = '*document_root C7
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[prev->E4|up->E1]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{3}
  |toplevel_directions:D[prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/coverage/commands.pl 
b/tta/perl/t/results/coverage/commands.pl
index 92772c1938..52ef3f1d0b 100644
--- a/tta/perl/t/results/coverage/commands.pl
+++ b/tta/perl/t/results/coverage/commands.pl
@@ -84,6 +84,7 @@ $result_tree_text{'commands'} = '*document_root C1
    |{ }
   |EXTRA
   |global_command_number:{1}
+  |heading_number:{1}
    *line_arg C2
    |INFO
    |spaces_after_argument:
diff --git a/tta/perl/t/results/coverage/punctuation_in_line_commands.pl 
b/tta/perl/t/results/coverage/punctuation_in_line_commands.pl
index 96126d42a6..ed7cf9e1bb 100644
--- a/tta/perl/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tta/perl/t/results/coverage/punctuation_in_line_commands.pl
@@ -16,6 +16,7 @@ $result_tree_text{'punctuation_in_line_commands'} = 
'*document_root C3
  |associated_title_command:[E1]
  |is_target:{1}
  |isindex:{1}
+ |node_number:{1}
  |normalized:{node_0021-After-punc}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'punctuation_in_line_commands'} = 
'*document_root C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -222,6 +224,7 @@ $result_tree_text{'punctuation_in_line_commands'} = 
'*document_root C3
    |{ }
   |EXTRA
   |global_command_number:{1}
+  |heading_number:{1}
    *line_arg C1
    |INFO
    |spaces_after_argument:
diff --git a/tta/perl/t/results/coverage_braces/contain_plain_text_nestings.pl 
b/tta/perl/t/results/coverage_braces/contain_plain_text_nestings.pl
index 01c4870f16..687bea3100 100644
--- a/tta/perl/t/results/coverage_braces/contain_plain_text_nestings.pl
+++ b/tta/perl/t/results/coverage_braces/contain_plain_text_nestings.pl
@@ -15,6 +15,7 @@ $result_tree_text{'contain_plain_text_nestings'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'contain_plain_text_nestings'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'contain_plain_text_nestings'} = 
'*document_root C5
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'contain_plain_text_nestings'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/coverage_braces/footnote_no_node.pl 
b/tta/perl/t/results/coverage_braces/footnote_no_node.pl
index 8bad9536d7..5efa9da40e 100644
--- a/tta/perl/t/results/coverage_braces/footnote_no_node.pl
+++ b/tta/perl/t/results/coverage_braces/footnote_no_node.pl
@@ -12,6 +12,7 @@ $result_tree_text{'footnote_no_node'} = '*document_root C2
   |{ }
  |EXTRA
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/coverage_braces/heading_in_footnote.pl 
b/tta/perl/t/results/coverage_braces/heading_in_footnote.pl
index 16219c861c..efccec2267 100644
--- a/tta/perl/t/results/coverage_braces/heading_in_footnote.pl
+++ b/tta/perl/t/results/coverage_braces/heading_in_footnote.pl
@@ -23,6 +23,7 @@ $result_tree_text{'heading_in_footnote'} = '*document_root C1
       |{ }
      |EXTRA
      |global_command_number:{1}
+     |heading_number:{1}
       *line_arg C1
       |INFO
       |spaces_after_argument:
diff --git a/tta/perl/t/results/coverage_braces/inforef_too_much_args.pl 
b/tta/perl/t/results/coverage_braces/inforef_too_much_args.pl
index 2fced3d9eb..9c7eab22d0 100644
--- a/tta/perl/t/results/coverage_braces/inforef_too_much_args.pl
+++ b/tta/perl/t/results/coverage_braces/inforef_too_much_args.pl
@@ -12,6 +12,7 @@ $result_tree_text{'inforef_too_much_args'} = '*document_root 
C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/coverage_braces/seeentry_no_braces.pl 
b/tta/perl/t/results/coverage_braces/seeentry_no_braces.pl
index 54a3a33d0b..e9ab18d08a 100644
--- a/tta/perl/t/results/coverage_braces/seeentry_no_braces.pl
+++ b/tta/perl/t/results/coverage_braces/seeentry_no_braces.pl
@@ -15,6 +15,7 @@ $result_tree_text{'seeentry_no_braces'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'seeentry_no_braces'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'seeentry_no_braces'} = '*document_root C5
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'seeentry_no_braces'} = '*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/coverage_braces/test_image.pl 
b/tta/perl/t/results/coverage_braces/test_image.pl
index b5ab2de8e9..8ee2361b96 100644
--- a/tta/perl/t/results/coverage_braces/test_image.pl
+++ b/tta/perl/t/results/coverage_braces/test_image.pl
@@ -180,6 +180,7 @@ $result_tree_text{'test_image'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -194,6 +195,7 @@ $result_tree_text{'test_image'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/coverage_braces/two_footnotes_in_nodes.pl 
b/tta/perl/t/results/coverage_braces/two_footnotes_in_nodes.pl
index 3f4b80612c..2905b9f7b1 100644
--- a/tta/perl/t/results/coverage_braces/two_footnotes_in_nodes.pl
+++ b/tta/perl/t/results/coverage_braces/two_footnotes_in_nodes.pl
@@ -17,6 +17,7 @@ $result_tree_text{'two_footnotes_in_nodes'} = '*document_root 
C5
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -33,6 +34,7 @@ $result_tree_text{'two_footnotes_in_nodes'} = '*document_root 
C5
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -111,6 +113,7 @@ $result_tree_text{'two_footnotes_in_nodes'} = 
'*document_root C5
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -126,8 +129,9 @@ $result_tree_text{'two_footnotes_in_nodes'} = 
'*document_root C5
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl 
b/tta/perl/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
index a86771c5d0..bdf948322e 100644
--- a/tta/perl/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
+++ b/tta/perl/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
@@ -28,6 +28,7 @@ $result_tree_text{'two_footnotes_in_nodes_separate'} = 
'*document_root C5
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -44,6 +45,7 @@ $result_tree_text{'two_footnotes_in_nodes_separate'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -122,6 +124,7 @@ $result_tree_text{'two_footnotes_in_nodes_separate'} = 
'*document_root C5
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -137,8 +140,9 @@ $result_tree_text{'two_footnotes_in_nodes_separate'} = 
'*document_root C5
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/coverage_braces/two_footnotes_in_nodes_separate_no_header.pl
 
b/tta/perl/t/results/coverage_braces/two_footnotes_in_nodes_separate_no_header.pl
index a9a6cd2068..6ab14b51b8 100644
--- 
a/tta/perl/t/results/coverage_braces/two_footnotes_in_nodes_separate_no_header.pl
+++ 
b/tta/perl/t/results/coverage_braces/two_footnotes_in_nodes_separate_no_header.pl
@@ -28,6 +28,7 @@ 
$result_tree_text{'two_footnotes_in_nodes_separate_no_header'} = '*document_root
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -44,6 +45,7 @@ 
$result_tree_text{'two_footnotes_in_nodes_separate_no_header'} = '*document_root
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -122,6 +124,7 @@ 
$result_tree_text{'two_footnotes_in_nodes_separate_no_header'} = '*document_root
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -137,8 +140,9 @@ 
$result_tree_text{'two_footnotes_in_nodes_separate_no_header'} = '*document_root
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/def/all_commands_delimiters_printindex.pl 
b/tta/perl/t/results/def/all_commands_delimiters_printindex.pl
index d217ffb885..b9473b2098 100644
--- a/tta/perl/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tta/perl/t/results/def/all_commands_delimiters_printindex.pl
@@ -13,6 +13,7 @@ $result_tree_text{'all_commands_delimiters_printindex'} = 
'*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -29,6 +30,7 @@ $result_tree_text{'all_commands_delimiters_printindex'} = 
'*document_root C3
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -43,6 +45,7 @@ $result_tree_text{'all_commands_delimiters_printindex'} = 
'*document_root C3
   |EXTRA
   |associated_anchor_command:[E1]
   |global_command_number:{1}
+  |heading_number:{1}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -3607,6 +3610,7 @@ $result_tree_text{'all_commands_delimiters_printindex'} = 
'*document_root C3
    |{ }
   |EXTRA
   |global_command_number:{1}
+  |heading_number:{2}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -3631,6 +3635,7 @@ $result_tree_text{'all_commands_delimiters_printindex'} = 
'*document_root C3
    |{ }
   |EXTRA
   |global_command_number:{2}
+  |heading_number:{3}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -3655,6 +3660,7 @@ $result_tree_text{'all_commands_delimiters_printindex'} = 
'*document_root C3
    |{ }
   |EXTRA
   |global_command_number:{3}
+  |heading_number:{4}
    *line_arg C1
    |INFO
    |spaces_after_argument:
diff --git a/tta/perl/t/results/def/all_commands_printindex.pl 
b/tta/perl/t/results/def/all_commands_printindex.pl
index 39af6fdef9..b9c3d125b1 100644
--- a/tta/perl/t/results/def/all_commands_printindex.pl
+++ b/tta/perl/t/results/def/all_commands_printindex.pl
@@ -13,6 +13,7 @@ $result_tree_text{'all_commands_printindex'} = 
'*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -29,6 +30,7 @@ $result_tree_text{'all_commands_printindex'} = 
'*document_root C3
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -43,6 +45,7 @@ $result_tree_text{'all_commands_printindex'} = 
'*document_root C3
   |EXTRA
   |associated_anchor_command:[E1]
   |global_command_number:{1}
+  |heading_number:{1}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -1451,6 +1454,7 @@ $result_tree_text{'all_commands_printindex'} = 
'*document_root C3
    |{ }
   |EXTRA
   |global_command_number:{1}
+  |heading_number:{2}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -1475,6 +1479,7 @@ $result_tree_text{'all_commands_printindex'} = 
'*document_root C3
    |{ }
   |EXTRA
   |global_command_number:{2}
+  |heading_number:{3}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -1499,6 +1504,7 @@ $result_tree_text{'all_commands_printindex'} = 
'*document_root C3
    |{ }
   |EXTRA
   |global_command_number:{3}
+  |heading_number:{4}
    *line_arg C1
    |INFO
    |spaces_after_argument:
diff --git a/tta/perl/t/results/def/omit_def_space.pl 
b/tta/perl/t/results/def/omit_def_space.pl
index 5a7443d2cb..b71fa88e5d 100644
--- a/tta/perl/t/results/def/omit_def_space.pl
+++ b/tta/perl/t/results/def/omit_def_space.pl
@@ -13,6 +13,7 @@ $result_tree_text{'omit_def_space'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -28,6 +29,7 @@ $result_tree_text{'omit_def_space'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/def/ref_in_def.pl 
b/tta/perl/t/results/def/ref_in_def.pl
index 0e2b1917dd..801d7634e1 100644
--- a/tta/perl/t/results/def/ref_in_def.pl
+++ b/tta/perl/t/results/def/ref_in_def.pl
@@ -13,6 +13,7 @@ $result_tree_text{'ref_in_def'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/def/space_in_def_for_index.pl 
b/tta/perl/t/results/def/space_in_def_for_index.pl
index 868acad045..619fa0bb9d 100644
Binary files a/tta/perl/t/results/def/space_in_def_for_index.pl and 
b/tta/perl/t/results/def/space_in_def_for_index.pl differ
diff --git a/tta/perl/t/results/def/text_block_before_defline.pl 
b/tta/perl/t/results/def/text_block_before_defline.pl
index 427e4f858f..1d44e01004 100644
--- a/tta/perl/t/results/def/text_block_before_defline.pl
+++ b/tta/perl/t/results/def/text_block_before_defline.pl
@@ -16,6 +16,7 @@ $result_tree_text{'text_block_before_defline'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'text_block_before_defline'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'text_block_before_defline'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapt}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'text_block_before_defline'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/docbook_tests/between_node_and_section.pl 
b/tta/perl/t/results/docbook_tests/between_node_and_section.pl
index 30962a626b..dc6e02fab1 100644
--- a/tta/perl/t/results/docbook_tests/between_node_and_section.pl
+++ b/tta/perl/t/results/docbook_tests/between_node_and_section.pl
@@ -15,6 +15,7 @@ $result_tree_text{'between_node_and_section'} = 
'*document_root C7
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -30,6 +31,7 @@ $result_tree_text{'between_node_and_section'} = 
'*document_root C7
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_childs:EC[E3|E6]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
@@ -53,6 +55,7 @@ $result_tree_text{'between_node_and_section'} = 
'*document_root C7
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4|up->E0]
+ |node_number:{2}
  |normalized:{sec1}
   *arguments_line C1
    *line_arg C1
@@ -68,8 +71,9 @@ $result_tree_text{'between_node_and_section'} = 
'*document_root C7
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -86,6 +90,7 @@ $result_tree_text{'between_node_and_section'} = 
'*document_root C7
  |associated_title_command:[E6]
  |is_target:{1}
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{sec2}
   *arguments_line C1
    *line_arg C1
@@ -108,8 +113,9 @@ $result_tree_text{'between_node_and_section'} = 
'*document_root C7
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[prev->E3|up->E1]
+ |section_heading_number:{1.2}
  |section_level:{2}
- |section_number:{1.2}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/docbook_tests/multiple_documentlanguage.pl 
b/tta/perl/t/results/docbook_tests/multiple_documentlanguage.pl
index 2c3fd9a00b..9047f56fc3 100644
--- a/tta/perl/t/results/docbook_tests/multiple_documentlanguage.pl
+++ b/tta/perl/t/results/docbook_tests/multiple_documentlanguage.pl
@@ -28,6 +28,7 @@ $result_tree_text{'multiple_documentlanguage'} = 
'*document_root C11
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -44,6 +45,7 @@ $result_tree_text{'multiple_documentlanguage'} = 
'*document_root C11
  |associated_node:[E0]
  |section_childs:EC[E3|E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -66,6 +68,7 @@ $result_tree_text{'multiple_documentlanguage'} = 
'*document_root C11
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -81,8 +84,9 @@ $result_tree_text{'multiple_documentlanguage'} = 
'*document_root C11
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -112,6 +116,7 @@ $result_tree_text{'multiple_documentlanguage'} = 
'*document_root C11
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{chapter-fr}
   *arguments_line C1
    *line_arg C1
@@ -128,8 +133,9 @@ $result_tree_text{'multiple_documentlanguage'} = 
'*document_root C11
  |associated_node:[E4]
  |section_childs:EC[E7|E9]
  |section_directions:D[prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -159,6 +165,7 @@ $result_tree_text{'multiple_documentlanguage'} = 
'*document_root C11
  |associated_title_command:[E7]
  |is_target:{1}
  |node_directions:D[next->E8|up->E4]
+ |node_number:{4}
  |normalized:{subnode-pt}
   *arguments_line C1
    *line_arg C1
@@ -174,8 +181,9 @@ $result_tree_text{'multiple_documentlanguage'} = 
'*document_root C11
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[next->E9|up->E5]
+ |section_heading_number:{2.1}
  |section_level:{2}
- |section_number:{2.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -204,6 +212,7 @@ $result_tree_text{'multiple_documentlanguage'} = 
'*document_root C11
  |associated_title_command:[E9]
  |is_target:{1}
  |node_directions:D[prev->E6|up->E4]
+ |node_number:{5}
  |normalized:{subnode-fr}
   *arguments_line C1
    *line_arg C1
@@ -219,8 +228,9 @@ $result_tree_text{'multiple_documentlanguage'} = 
'*document_root C11
  |associated_anchor_command:[E8]
  |associated_node:[E8]
  |section_directions:D[prev->E7|up->E5]
+ |section_heading_number:{2.2}
  |section_level:{2}
- |section_number:{2.2}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/docbook_tests/special_docbook_unnumbered.pl 
b/tta/perl/t/results/docbook_tests/special_docbook_unnumbered.pl
index aaa307c3c0..3cb4e9a136 100644
--- a/tta/perl/t/results/docbook_tests/special_docbook_unnumbered.pl
+++ b/tta/perl/t/results/docbook_tests/special_docbook_unnumbered.pl
@@ -16,6 +16,7 @@ $result_tree_text{'special_docbook_unnumbered'} = 
'*document_root C11
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'special_docbook_unnumbered'} = 
'*document_root C11
  |associated_node:[E0]
  |section_childs:EC[E4|E6|E8|E10]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -120,6 +122,7 @@ $result_tree_text{'special_docbook_unnumbered'} = 
'*document_root C11
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Dedication}
   *arguments_line C1
    *line_arg C1
@@ -136,6 +139,7 @@ $result_tree_text{'special_docbook_unnumbered'} = 
'*document_root C11
  |associated_node:[E3]
  |section_directions:D[next->E6|up->E1]
  |section_level:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -157,6 +161,7 @@ $result_tree_text{'special_docbook_unnumbered'} = 
'*document_root C11
  |is_target:{1}
  |menu_directions:D[next->E7|prev->E3|up->E0]
  |node_directions:D[next->E7|prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{preface}
   *arguments_line C1
    *line_arg C1
@@ -173,6 +178,7 @@ $result_tree_text{'special_docbook_unnumbered'} = 
'*document_root C11
  |associated_node:[E5]
  |section_directions:D[next->E8|prev->E4|up->E1]
  |section_level:{1}
+ |section_number:{3}
  |toplevel_directions:D[next->E8|prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -194,6 +200,7 @@ $result_tree_text{'special_docbook_unnumbered'} = 
'*document_root C11
  |is_target:{1}
  |menu_directions:D[next->E9|prev->E5|up->E0]
  |node_directions:D[next->E9|prev->E5|up->E0]
+ |node_number:{4}
  |normalized:{colophon}
   *arguments_line C1
    *line_arg C1
@@ -210,6 +217,7 @@ $result_tree_text{'special_docbook_unnumbered'} = 
'*document_root C11
  |associated_node:[E7]
  |section_directions:D[next->E10|prev->E6|up->E1]
  |section_level:{1}
+ |section_number:{4}
  |toplevel_directions:D[next->E10|prev->E6|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -231,6 +239,7 @@ $result_tree_text{'special_docbook_unnumbered'} = 
'*document_root C11
  |is_target:{1}
  |menu_directions:D[prev->E7|up->E0]
  |node_directions:D[prev->E7|up->E0]
+ |node_number:{5}
  |normalized:{acknowledgements}
   *arguments_line C1
    *line_arg C1
@@ -246,8 +255,9 @@ $result_tree_text{'special_docbook_unnumbered'} = 
'*document_root C11
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[prev->E8|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{5}
  |toplevel_directions:D[prev->E8|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/epub_tests/chapter_before_top_epub.pl 
b/tta/perl/t/results/epub_tests/chapter_before_top_epub.pl
index 57b12750a0..000a463715 100644
--- a/tta/perl/t/results/epub_tests/chapter_before_top_epub.pl
+++ b/tta/perl/t/results/epub_tests/chapter_before_top_epub.pl
@@ -13,6 +13,7 @@ $result_tree_text{'chapter_before_top_epub'} = 
'*document_root C6
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -29,6 +30,7 @@ $result_tree_text{'chapter_before_top_epub'} = 
'*document_root C6
  |associated_section:[E2]
  |associated_title_command:[E2]
  |is_target:{1}
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -43,6 +45,7 @@ $result_tree_text{'chapter_before_top_epub'} = 
'*document_root C6
  |EXTRA
  |associated_anchor_command:[E1]
  |associated_node:[E1]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
@@ -67,6 +70,7 @@ $result_tree_text{'chapter_before_top_epub'} = 
'*document_root C6
  |part_associated_section:[E4]
  |section_directions:D[next->E4]
  |section_level:{0}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -82,6 +86,7 @@ $result_tree_text{'chapter_before_top_epub'} = 
'*document_root C6
  |associated_part:[E3]
  |section_directions:D[prev->E3]
  |section_level:{0}
+ |section_number:{3}
  |toplevel_directions:D[prev->E2]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/epub_tests/section_part_epub.pl 
b/tta/perl/t/results/epub_tests/section_part_epub.pl
index cadb0c01e3..60ac50e45b 100644
--- a/tta/perl/t/results/epub_tests/section_part_epub.pl
+++ b/tta/perl/t/results/epub_tests/section_part_epub.pl
@@ -15,6 +15,7 @@ $result_tree_text{'section_part_epub'} = '*document_root C4
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -29,6 +30,7 @@ $result_tree_text{'section_part_epub'} = '*document_root C4
  |EXTRA
  |associated_anchor_command:[E0]
  |associated_node:[E0]
+ |section_heading_number:{1}
  |section_level:{2}
  |section_number:{1}
  |sectioning_root:
@@ -50,6 +52,7 @@ $result_tree_text{'section_part_epub'} = '*document_root C4
  |EXTRA
  |global_command_number:{1}
  |section_level:{0}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git 
a/tta/perl/t/results/epub_tests/setfilename_on_top_and_after_node_epub.pl 
b/tta/perl/t/results/epub_tests/setfilename_on_top_and_after_node_epub.pl
index bc6441d15d..d14d402676 100644
--- a/tta/perl/t/results/epub_tests/setfilename_on_top_and_after_node_epub.pl
+++ b/tta/perl/t/results/epub_tests/setfilename_on_top_and_after_node_epub.pl
@@ -15,6 +15,7 @@ $result_tree_text{'setfilename_on_top_and_after_node_epub'} = 
'*document_root C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'setfilename_on_top_and_after_node_epub'} = 
'*document_root C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/float/anchor_in_caption.pl 
b/tta/perl/t/results/float/anchor_in_caption.pl
index 059c0ad5f7..a0106428f1 100644
--- a/tta/perl/t/results/float/anchor_in_caption.pl
+++ b/tta/perl/t/results/float/anchor_in_caption.pl
@@ -14,6 +14,7 @@ $result_tree_text{'anchor_in_caption'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -28,6 +29,7 @@ $result_tree_text{'anchor_in_caption'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/float/cindex_in_caption.pl 
b/tta/perl/t/results/float/cindex_in_caption.pl
index 22fe863748..557a1d021a 100644
Binary files a/tta/perl/t/results/float/cindex_in_caption.pl and 
b/tta/perl/t/results/float/cindex_in_caption.pl differ
diff --git a/tta/perl/t/results/float/comment_space_comand_in_float.pl 
b/tta/perl/t/results/float/comment_space_comand_in_float.pl
index 37dab68475..5c2b237077 100644
--- a/tta/perl/t/results/float/comment_space_comand_in_float.pl
+++ b/tta/perl/t/results/float/comment_space_comand_in_float.pl
@@ -14,6 +14,7 @@ $result_tree_text{'comment_space_comand_in_float'} = 
'*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -28,6 +29,7 @@ $result_tree_text{'comment_space_comand_in_float'} = 
'*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/float/complex_float.pl 
b/tta/perl/t/results/float/complex_float.pl
index 1740accdeb..b148355af9 100644
--- a/tta/perl/t/results/float/complex_float.pl
+++ b/tta/perl/t/results/float/complex_float.pl
@@ -17,6 +17,7 @@ $result_tree_text{'complex_float'} = '*document_root C5
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E5]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -33,6 +34,7 @@ $result_tree_text{'complex_float'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E6]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -616,6 +618,7 @@ $result_tree_text{'complex_float'} = '*document_root C5
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -631,8 +634,9 @@ $result_tree_text{'complex_float'} = '*document_root C5
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/float/float_copying.pl 
b/tta/perl/t/results/float/float_copying.pl
index 8324990dc1..ce3e86d340 100644
--- a/tta/perl/t/results/float/float_copying.pl
+++ b/tta/perl/t/results/float/float_copying.pl
@@ -170,6 +170,7 @@ $result_tree_text{'float_copying'} = '*document_root C5
  |is_target:{1}
  |menus:EC[E5]
  |node_directions:D[next->E6]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -186,6 +187,7 @@ $result_tree_text{'float_copying'} = '*document_root C5
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -244,6 +246,7 @@ $result_tree_text{'float_copying'} = '*document_root C5
  |isindex:{1}
  |menu_directions:D[up->E3]
  |node_directions:D[prev->E3|up->E3]
+ |node_number:{2}
  |normalized:{Copying-and-floats}
   *arguments_line C1
    *line_arg C1
@@ -259,8 +262,9 @@ $result_tree_text{'float_copying'} = '*document_root C5
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E4]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{2}
  |toplevel_directions:D[prev->E4|up->E4]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/float/footnote_in_caption.pl 
b/tta/perl/t/results/float/footnote_in_caption.pl
index 769a16b897..6c6afcd7bb 100644
--- a/tta/perl/t/results/float/footnote_in_caption.pl
+++ b/tta/perl/t/results/float/footnote_in_caption.pl
@@ -14,6 +14,7 @@ $result_tree_text{'footnote_in_caption'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -28,6 +29,7 @@ $result_tree_text{'footnote_in_caption'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/float/footnote_in_caption_and_error.pl 
b/tta/perl/t/results/float/footnote_in_caption_and_error.pl
index 048cea8574..9a4c802c6e 100644
--- a/tta/perl/t/results/float/footnote_in_caption_and_error.pl
+++ b/tta/perl/t/results/float/footnote_in_caption_and_error.pl
@@ -14,6 +14,7 @@ $result_tree_text{'footnote_in_caption_and_error'} = 
'*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -28,6 +29,7 @@ $result_tree_text{'footnote_in_caption_and_error'} = 
'*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/float/multiple_captions.pl 
b/tta/perl/t/results/float/multiple_captions.pl
index 51bc84dcf7..15d0ee0829 100644
--- a/tta/perl/t/results/float/multiple_captions.pl
+++ b/tta/perl/t/results/float/multiple_captions.pl
@@ -16,6 +16,7 @@ $result_tree_text{'multiple_captions'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'multiple_captions'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'multiple_captions'} = '*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'multiple_captions'} = '*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/float/numbering_captions_listoffloats.pl 
b/tta/perl/t/results/float/numbering_captions_listoffloats.pl
index c137120553..26bde68ea0 100644
--- a/tta/perl/t/results/float/numbering_captions_listoffloats.pl
+++ b/tta/perl/t/results/float/numbering_captions_listoffloats.pl
@@ -17,6 +17,7 @@ $result_tree_text{'numbering_captions_listoffloats'} = 
'*document_root C21
  |is_target:{1}
  |menus:EC[E10]
  |node_directions:D[next->E11]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -33,6 +34,7 @@ $result_tree_text{'numbering_captions_listoffloats'} = 
'*document_root C21
  |associated_node:[E0]
  |section_childs:EC[E12|E23|E31|E39|E42]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -446,6 +448,7 @@ $result_tree_text{'numbering_captions_listoffloats'} = 
'*document_root C21
  |menu_directions:D[next->E22|up->E0]
  |menus:EC[E18]
  |node_directions:D[next->E22|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -462,8 +465,9 @@ $result_tree_text{'numbering_captions_listoffloats'} = 
'*document_root C21
  |associated_node:[E11]
  |section_childs:EC[E20]
  |section_directions:D[next->E23|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E23|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -749,6 +753,7 @@ $result_tree_text{'numbering_captions_listoffloats'} = 
'*document_root C21
  |is_target:{1}
  |menu_directions:D[up->E11]
  |node_directions:D[up->E11]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -764,8 +769,9 @@ $result_tree_text{'numbering_captions_listoffloats'} = 
'*document_root C21
  |associated_anchor_command:[E19]
  |associated_node:[E19]
  |section_directions:D[up->E12]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -821,6 +827,7 @@ $result_tree_text{'numbering_captions_listoffloats'} = 
'*document_root C21
  |menu_directions:D[next->E30|prev->E11|up->E0]
  |menus:EC[E24]
  |node_directions:D[next->E30|prev->E11|up->E0]
+ |node_number:{4}
  |normalized:{Unnumbered}
   *arguments_line C1
    *line_arg C1
@@ -838,6 +845,7 @@ $result_tree_text{'numbering_captions_listoffloats'} = 
'*document_root C21
  |section_childs:EC[E28]
  |section_directions:D[next->E31|prev->E12|up->E1]
  |section_level:{1}
+ |section_number:{4}
  |toplevel_directions:D[next->E31|prev->E12|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -972,6 +980,7 @@ $result_tree_text{'numbering_captions_listoffloats'} = 
'*document_root C21
  |is_target:{1}
  |menu_directions:D[up->E22]
  |node_directions:D[up->E22]
+ |node_number:{5}
  |normalized:{Section-within-unnumbered}
   *arguments_line C1
    *line_arg C1
@@ -988,6 +997,7 @@ $result_tree_text{'numbering_captions_listoffloats'} = 
'*document_root C21
  |associated_node:[E27]
  |section_directions:D[up->E23]
  |section_level:{2}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1052,6 +1062,7 @@ $result_tree_text{'numbering_captions_listoffloats'} = 
'*document_root C21
  |menu_directions:D[next->E38|prev->E22|up->E0]
  |menus:EC[E32]
  |node_directions:D[next->E38|prev->E22|up->E0]
+ |node_number:{6}
  |normalized:{Chapter-with-unnumbsubsec}
   *arguments_line C1
    *line_arg C1
@@ -1068,8 +1079,9 @@ $result_tree_text{'numbering_captions_listoffloats'} = 
'*document_root C21
  |associated_node:[E30]
  |section_childs:EC[E35]
  |section_directions:D[next->E39|prev->E23|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{6}
  |toplevel_directions:D[next->E39|prev->E23|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -1161,6 +1173,7 @@ $result_tree_text{'numbering_captions_listoffloats'} = 
'*document_root C21
  |is_target:{1}
  |menu_directions:D[up->E30]
  |node_directions:D[up->E30]
+ |node_number:{7}
  |normalized:{unnumbered-sec}
   *arguments_line C1
    *line_arg C1
@@ -1177,6 +1190,7 @@ $result_tree_text{'numbering_captions_listoffloats'} = 
'*document_root C21
  |associated_node:[E34]
  |section_directions:D[up->E31]
  |section_level:{2}
+ |section_number:{7}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1282,6 +1296,7 @@ $result_tree_text{'numbering_captions_listoffloats'} = 
'*document_root C21
  |is_target:{1}
  |menu_directions:D[next->E41|prev->E30|up->E0]
  |node_directions:D[next->E41|prev->E30|up->E0]
+ |node_number:{8}
  |normalized:{Appendix-for-float}
   *arguments_line C1
    *line_arg C1
@@ -1297,8 +1312,9 @@ $result_tree_text{'numbering_captions_listoffloats'} = 
'*document_root C21
  |associated_anchor_command:[E38]
  |associated_node:[E38]
  |section_directions:D[next->E42|prev->E31|up->E1]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{8}
  |toplevel_directions:D[next->E42|prev->E31|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -1363,6 +1379,7 @@ $result_tree_text{'numbering_captions_listoffloats'} = 
'*document_root C21
  |is_target:{1}
  |menu_directions:D[prev->E38|up->E0]
  |node_directions:D[prev->E38|up->E0]
+ |node_number:{9}
  |normalized:{list-of-floats}
   *arguments_line C1
    *line_arg C1
@@ -1379,6 +1396,7 @@ $result_tree_text{'numbering_captions_listoffloats'} = 
'*document_root C21
  |associated_node:[E41]
  |section_directions:D[prev->E39|up->E1]
  |section_level:{1}
+ |section_number:{9}
  |toplevel_directions:D[prev->E39|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/float/special_characters_in_float_type.pl 
b/tta/perl/t/results/float/special_characters_in_float_type.pl
index fda64554dc..a29eedc992 100644
--- a/tta/perl/t/results/float/special_characters_in_float_type.pl
+++ b/tta/perl/t/results/float/special_characters_in_float_type.pl
@@ -16,6 +16,7 @@ $result_tree_text{'special_characters_in_float_type'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'special_characters_in_float_type'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'special_characters_in_float_type'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'special_characters_in_float_type'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/formats_encodings/accent.pl 
b/tta/perl/t/results/formats_encodings/accent.pl
index e25d98a13e..d98a350a9c 100644
--- a/tta/perl/t/results/formats_encodings/accent.pl
+++ b/tta/perl/t/results/formats_encodings/accent.pl
@@ -15,6 +15,7 @@ $result_tree_text{'accent'} = '*document_root C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
@@ -30,6 +31,7 @@ $result_tree_text{'accent'} = '*document_root C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/formats_encodings/accent_argument_non_ascii.pl 
b/tta/perl/t/results/formats_encodings/accent_argument_non_ascii.pl
index 22d3088e5d..bc32c494c2 100644
--- a/tta/perl/t/results/formats_encodings/accent_argument_non_ascii.pl
+++ b/tta/perl/t/results/formats_encodings/accent_argument_non_ascii.pl
@@ -16,6 +16,7 @@ $result_tree_text{'accent_argument_non_ascii'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'accent_argument_non_ascii'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'accent_argument_non_ascii'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'accent_argument_non_ascii'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/formats_encodings/accent_enable_encoding.pl 
b/tta/perl/t/results/formats_encodings/accent_enable_encoding.pl
index 0b68023364..26f6c2dc41 100644
--- a/tta/perl/t/results/formats_encodings/accent_enable_encoding.pl
+++ b/tta/perl/t/results/formats_encodings/accent_enable_encoding.pl
@@ -15,6 +15,7 @@ $result_tree_text{'accent_enable_encoding'} = '*document_root 
C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
@@ -30,6 +31,7 @@ $result_tree_text{'accent_enable_encoding'} = '*document_root 
C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/formats_encodings/accentenc.pl 
b/tta/perl/t/results/formats_encodings/accentenc.pl
index effc070f57..9ad1ce5f28 100644
--- a/tta/perl/t/results/formats_encodings/accentenc.pl
+++ b/tta/perl/t/results/formats_encodings/accentenc.pl
@@ -29,6 +29,7 @@ $result_tree_text{'accentenc'} = '*document_root C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
@@ -44,6 +45,7 @@ $result_tree_text{'accentenc'} = '*document_root C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/formats_encodings/accentenc_enable_encoding.pl 
b/tta/perl/t/results/formats_encodings/accentenc_enable_encoding.pl
index 575d88921f..dbce310e51 100644
--- a/tta/perl/t/results/formats_encodings/accentenc_enable_encoding.pl
+++ b/tta/perl/t/results/formats_encodings/accentenc_enable_encoding.pl
@@ -28,6 +28,7 @@ $result_tree_text{'accentenc_enable_encoding'} = 
'*document_root C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
@@ -43,6 +44,7 @@ $result_tree_text{'accentenc_enable_encoding'} = 
'*document_root C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/formats_encodings/at_commands_in_refs.pl 
b/tta/perl/t/results/formats_encodings/at_commands_in_refs.pl
index 1849c6e1f2..97b2a2d74b 100644
--- a/tta/perl/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tta/perl/t/results/formats_encodings/at_commands_in_refs.pl
@@ -17,6 +17,7 @@ $result_tree_text{'at_commands_in_refs'} = '*document_root C58
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -33,6 +34,7 @@ $result_tree_text{'at_commands_in_refs'} = '*document_root C58
  |associated_node:[E0]
  
|section_childs:EC[E4|E6|E8|E10|E12|E14|E16|E18|E20|E22|E24|E26|E28|E30|E32|E34|E36|E38|E40|E42|E44|E46|E48|E50|E52|E54|E56]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -807,6 +809,7 @@ $result_tree_text{'at_commands_in_refs'} = '*document_root 
C58
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{-_007b-_007d}
   *arguments_line C1
    *line_arg C5
@@ -826,8 +829,9 @@ $result_tree_text{'at_commands_in_refs'} = '*document_root 
C58
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C5
@@ -850,6 +854,7 @@ $result_tree_text{'at_commands_in_refs'} = '*document_root 
C58
  |is_target:{1}
  |menu_directions:D[next->E7|prev->E3|up->E0]
  |node_directions:D[next->E7|prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{-_0021-_002e-_002e-_003f-_0040}
   *arguments_line C1
    *line_arg C17
@@ -881,8 +886,9 @@ $result_tree_text{'at_commands_in_refs'} = '*document_root 
C58
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[next->E8|prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E8|prev->E4|up->E1]
   *arguments_line C1
    *line_arg C17
@@ -917,6 +923,7 @@ $result_tree_text{'at_commands_in_refs'} = '*document_root 
C58
  |is_target:{1}
  |menu_directions:D[next->E9|prev->E5|up->E0]
  |node_directions:D[next->E9|prev->E5|up->E0]
+ |node_number:{4}
  |normalized:{_0040-_007b-_007d-_005c-_0023}
   *arguments_line C1
    *line_arg C9
@@ -945,8 +952,9 @@ $result_tree_text{'at_commands_in_refs'} = '*document_root 
C58
  |associated_anchor_command:[E7]
  |associated_node:[E7]
  |section_directions:D[next->E10|prev->E6|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{4}
  |toplevel_directions:D[next->E10|prev->E6|up->E1]
   *arguments_line C1
    *line_arg C9
@@ -978,6 +986,7 @@ $result_tree_text{'at_commands_in_refs'} = '*document_root 
C58
  |is_target:{1}
  |menu_directions:D[next->E11|prev->E7|up->E0]
  |node_directions:D[next->E11|prev->E7|up->E0]
+ |node_number:{5}
  |normalized:{LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e}
   *arguments_line C1
    *line_arg C13
@@ -1012,8 +1021,9 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[next->E12|prev->E8|up->E1]
+ |section_heading_number:{4}
  |section_level:{1}
- |section_number:{4}
+ |section_number:{5}
  |toplevel_directions:D[next->E12|prev->E8|up->E1]
   *arguments_line C1
    *line_arg C13
@@ -1051,6 +1061,7 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E13|prev->E9|up->E0]
  |node_directions:D[next->E13|prev->E9|up->E0]
+ |node_number:{6}
  |normalized:{_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212}
   *arguments_line C1
    *line_arg C11
@@ -1082,8 +1093,9 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |associated_anchor_command:[E11]
  |associated_node:[E11]
  |section_directions:D[next->E14|prev->E10|up->E1]
+ |section_heading_number:{5}
  |section_level:{1}
- |section_number:{5}
+ |section_number:{6}
  |toplevel_directions:D[next->E14|prev->E10|up->E1]
   *arguments_line C1
    *line_arg C11
@@ -1118,6 +1130,7 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E15|prev->E11|up->E0]
  |node_directions:D[next->E15|prev->E11|up->E0]
+ |node_number:{7}
  |normalized:{_2265-_2264-_2192}
   *arguments_line C1
    *line_arg C5
@@ -1140,8 +1153,9 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |associated_anchor_command:[E13]
  |associated_node:[E13]
  |section_directions:D[next->E16|prev->E12|up->E1]
+ |section_heading_number:{6}
  |section_level:{1}
- |section_number:{6}
+ |section_number:{7}
  |toplevel_directions:D[next->E16|prev->E12|up->E1]
   *arguments_line C1
    *line_arg C5
@@ -1167,6 +1181,7 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E17|prev->E13|up->E0]
  |node_directions:D[next->E17|prev->E13|up->E0]
+ |node_number:{8}
  |normalized:{_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae}
   *arguments_line C1
    *line_arg C13
@@ -1201,8 +1216,9 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |associated_anchor_command:[E15]
  |associated_node:[E15]
  |section_directions:D[next->E18|prev->E14|up->E1]
+ |section_heading_number:{7}
  |section_level:{1}
- |section_number:{7}
+ |section_number:{8}
  |toplevel_directions:D[next->E18|prev->E14|up->E1]
   *arguments_line C1
    *line_arg C13
@@ -1240,6 +1256,7 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E19|prev->E15|up->E0]
  |node_directions:D[next->E19|prev->E15|up->E0]
+ |node_number:{9}
  |normalized:{_21d2-_00b0-a-b-_00e5}
   *arguments_line C1
    *line_arg C9
@@ -1268,8 +1285,9 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |associated_anchor_command:[E17]
  |associated_node:[E17]
  |section_directions:D[next->E20|prev->E16|up->E1]
+ |section_heading_number:{8}
  |section_level:{1}
- |section_number:{8}
+ |section_number:{9}
  |toplevel_directions:D[next->E20|prev->E16|up->E1]
   *arguments_line C1
    *line_arg C9
@@ -1301,6 +1319,7 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E21|prev->E17|up->E0]
  |node_directions:D[next->E21|prev->E17|up->E0]
+ |node_number:{10}
  
|normalized:{_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe}
   *arguments_line C1
    *line_arg C27
@@ -1356,8 +1375,9 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |associated_anchor_command:[E19]
  |associated_node:[E19]
  |section_directions:D[next->E22|prev->E18|up->E1]
+ |section_heading_number:{9}
  |section_level:{1}
- |section_number:{9}
+ |section_number:{10}
  |toplevel_directions:D[next->E22|prev->E18|up->E1]
   *arguments_line C1
    *line_arg C27
@@ -1416,6 +1436,7 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E23|prev->E19|up->E0]
  |node_directions:D[next->E23|prev->E19|up->E0]
+ |node_number:{11}
  
|normalized:{_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119}
   *arguments_line C1
    *line_arg C21
@@ -1475,8 +1496,9 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |associated_anchor_command:[E21]
  |associated_node:[E21]
  |section_directions:D[next->E24|prev->E20|up->E1]
+ |section_heading_number:{10}
  |section_level:{1}
- |section_number:{10}
+ |section_number:{11}
  |toplevel_directions:D[next->E24|prev->E20|up->E1]
   *arguments_line C1
    *line_arg C21
@@ -1539,6 +1561,7 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E25|prev->E21|up->E0]
  |node_directions:D[next->E25|prev->E21|up->E0]
+ |node_number:{12}
  |normalized:{_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e}
   *arguments_line C1
    *line_arg C13
@@ -1580,8 +1603,9 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |associated_anchor_command:[E23]
  |associated_node:[E23]
  |section_directions:D[next->E26|prev->E22|up->E1]
+ |section_heading_number:{11}
  |section_level:{1}
- |section_number:{11}
+ |section_number:{12}
  |toplevel_directions:D[next->E26|prev->E22|up->E1]
   *arguments_line C1
    *line_arg C13
@@ -1626,6 +1650,7 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E27|prev->E23|up->E0]
  |node_directions:D[next->E27|prev->E23|up->E0]
+ |node_number:{13}
  |normalized:{_0131-_1e14-_1e08}
   *arguments_line C1
    *line_arg C5
@@ -1655,8 +1680,9 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |associated_anchor_command:[E25]
  |associated_node:[E25]
  |section_directions:D[next->E28|prev->E24|up->E1]
+ |section_heading_number:{12}
  |section_level:{1}
- |section_number:{12}
+ |section_number:{13}
  |toplevel_directions:D[next->E28|prev->E24|up->E1]
   *arguments_line C1
    *line_arg C5
@@ -1689,6 +1715,7 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E29|prev->E25|up->E0]
  |node_directions:D[next->E29|prev->E25|up->E0]
+ |node_number:{14}
  |normalized:{_201c-_201d-_2018-_2019-_201e-_201a}
   *arguments_line C1
    *line_arg C11
@@ -1720,8 +1747,9 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |associated_anchor_command:[E27]
  |associated_node:[E27]
  |section_directions:D[next->E30|prev->E26|up->E1]
+ |section_heading_number:{13}
  |section_level:{1}
- |section_number:{13}
+ |section_number:{14}
  |toplevel_directions:D[next->E30|prev->E26|up->E1]
   *arguments_line C1
    *line_arg C11
@@ -1756,6 +1784,7 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E31|prev->E27|up->E0]
  |node_directions:D[next->E31|prev->E27|up->E0]
+ |node_number:{15}
  |normalized:{_00ab-_00bb-_00ab-_00bb-_2039-_203a}
   *arguments_line C1
    *line_arg C11
@@ -1787,8 +1816,9 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |associated_anchor_command:[E29]
  |associated_node:[E29]
  |section_directions:D[next->E32|prev->E28|up->E1]
+ |section_heading_number:{14}
  |section_level:{1}
- |section_number:{14}
+ |section_number:{15}
  |toplevel_directions:D[next->E32|prev->E28|up->E1]
   *arguments_line C1
    *line_arg C11
@@ -1823,6 +1853,7 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E33|prev->E29|up->E0]
  |node_directions:D[next->E33|prev->E29|up->E0]
+ |node_number:{16}
  |normalized:{_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027}
   *arguments_line C1
    *line_arg C1
@@ -1838,8 +1869,9 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |associated_anchor_command:[E31]
  |associated_node:[E31]
  |section_directions:D[next->E34|prev->E30|up->E1]
+ |section_heading_number:{15}
  |section_level:{1}
- |section_number:{15}
+ |section_number:{16}
  |toplevel_directions:D[next->E34|prev->E30|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -1858,6 +1890,7 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E35|prev->E31|up->E0]
  |node_directions:D[next->E35|prev->E31|up->E0]
+ |node_number:{17}
  |normalized:{AAA-AAA-BBB}
   *arguments_line C1
    *line_arg C5
@@ -1888,8 +1921,9 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |associated_anchor_command:[E33]
  |associated_node:[E33]
  |section_directions:D[next->E36|prev->E32|up->E1]
+ |section_heading_number:{16}
  |section_level:{1}
- |section_number:{16}
+ |section_number:{17}
  |toplevel_directions:D[next->E36|prev->E32|up->E1]
   *arguments_line C1
    *line_arg C5
@@ -1923,6 +1957,7 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E37|prev->E33|up->E0]
  |node_directions:D[next->E37|prev->E33|up->E0]
+ |node_number:{18}
  |normalized:{CCC-CCC-DDD}
   *arguments_line C1
   >SOURCEMARKS
@@ -1961,8 +1996,9 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |associated_anchor_command:[E35]
  |associated_node:[E35]
  |section_directions:D[next->E38|prev->E34|up->E1]
+ |section_heading_number:{17}
  |section_level:{1}
- |section_number:{17}
+ |section_number:{18}
  |toplevel_directions:D[next->E38|prev->E34|up->E1]
   *arguments_line C1
   >SOURCEMARKS
@@ -2009,6 +2045,7 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E39|prev->E35|up->E0]
  |node_directions:D[next->E39|prev->E35|up->E0]
+ |node_number:{19}
  |normalized:{someone_0040somewher-no_005fexplain_0040there}
   *arguments_line C1
    *line_arg C3
@@ -2039,8 +2076,9 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |associated_anchor_command:[E37]
  |associated_node:[E37]
  |section_directions:D[next->E40|prev->E36|up->E1]
+ |section_heading_number:{18}
  |section_level:{1}
- |section_number:{18}
+ |section_number:{19}
  |toplevel_directions:D[next->E40|prev->E36|up->E1]
   *arguments_line C1
    *line_arg C3
@@ -2074,6 +2112,7 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E41|prev->E37|up->E0]
  |node_directions:D[next->E41|prev->E37|up->E0]
+ |node_number:{20}
  |normalized:{f_002d_002dile1-f_002d_002dile}
   *arguments_line C1
   >SOURCEMARKS
@@ -2115,8 +2154,9 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |associated_anchor_command:[E39]
  |associated_node:[E39]
  |section_directions:D[next->E42|prev->E38|up->E1]
+ |section_heading_number:{19}
  |section_level:{1}
- |section_number:{19}
+ |section_number:{20}
  |toplevel_directions:D[next->E42|prev->E38|up->E1]
   *arguments_line C1
   >SOURCEMARKS
@@ -2166,6 +2206,7 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E43|prev->E39|up->E0]
  |node_directions:D[next->E43|prev->E39|up->E0]
+ |node_number:{21}
  |normalized:{-_0040-_007b_007d-_002e-}
   *arguments_line C1
   >SOURCEMARKS
@@ -2193,8 +2234,9 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |associated_anchor_command:[E41]
  |associated_node:[E41]
  |section_directions:D[next->E44|prev->E40|up->E1]
+ |section_heading_number:{20}
  |section_level:{1}
- |section_number:{20}
+ |section_number:{21}
  |toplevel_directions:D[next->E44|prev->E40|up->E1]
   *arguments_line C1
   >SOURCEMARKS
@@ -2230,6 +2272,7 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E45|prev->E41|up->E0]
  |node_directions:D[next->E45|prev->E41|up->E0]
+ |node_number:{22}
  |normalized:{cite-asis-in-_0040w-b-in-r-sc-str-t-var-dfn-i}
   *arguments_line C1
    *line_arg C17
@@ -2287,8 +2330,9 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |associated_anchor_command:[E43]
  |associated_node:[E43]
  |section_directions:D[next->E46|prev->E42|up->E1]
+ |section_heading_number:{21}
  |section_level:{1}
- |section_number:{21}
+ |section_number:{22}
  |toplevel_directions:D[next->E46|prev->E42|up->E1]
   *arguments_line C1
    *line_arg C17
@@ -2349,6 +2393,7 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E47|prev->E43|up->E0]
  |node_directions:D[next->E47|prev->E43|up->E0]
+ |node_number:{23}
  |normalized:{env-code-option-samp-command-file-C_002dx-ESC}
   *arguments_line C1
    *line_arg C13
@@ -2393,8 +2438,9 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |associated_anchor_command:[E45]
  |associated_node:[E45]
  |section_directions:D[next->E48|prev->E44|up->E1]
+ |section_heading_number:{22}
  |section_level:{1}
- |section_number:{22}
+ |section_number:{23}
  |toplevel_directions:D[next->E48|prev->E44|up->E1]
   *arguments_line C1
    *line_arg C13
@@ -2442,6 +2488,7 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E49|prev->E45|up->E0]
  |node_directions:D[next->E49|prev->E45|up->E0]
+ |node_number:{24}
  |normalized:{8_002e27in}
   *arguments_line C1
    *line_arg C2
@@ -2460,8 +2507,9 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |associated_anchor_command:[E47]
  |associated_node:[E47]
  |section_directions:D[next->E50|prev->E46|up->E1]
+ |section_heading_number:{23}
  |section_level:{1}
- |section_number:{23}
+ |section_number:{24}
  |toplevel_directions:D[next->E50|prev->E46|up->E1]
   *arguments_line C1
    *line_arg C2
@@ -2483,6 +2531,7 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E51|prev->E47|up->E0]
  |node_directions:D[next->E51|prev->E47|up->E0]
+ |node_number:{25}
  |normalized:{sansserif-slanted}
   *arguments_line C1
    *line_arg C3
@@ -2504,8 +2553,9 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |associated_anchor_command:[E49]
  |associated_node:[E49]
  |section_directions:D[next->E52|prev->E48|up->E1]
+ |section_heading_number:{24}
  |section_level:{1}
- |section_number:{24}
+ |section_number:{25}
  |toplevel_directions:D[next->E52|prev->E48|up->E1]
   *arguments_line C1
    *line_arg C3
@@ -2530,6 +2580,7 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E53|prev->E49|up->E0]
  |node_directions:D[next->E53|prev->E49|up->E0]
+ |node_number:{26}
  |normalized:{indicateurl}
   *arguments_line C1
    *line_arg C1
@@ -2547,8 +2598,9 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |associated_anchor_command:[E51]
  |associated_node:[E51]
  |section_directions:D[next->E54|prev->E50|up->E1]
+ |section_heading_number:{25}
  |section_level:{1}
- |section_number:{25}
+ |section_number:{26}
  |toplevel_directions:D[next->E54|prev->E50|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -2569,6 +2621,7 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E55|prev->E51|up->E0]
  |node_directions:D[next->E55|prev->E51|up->E0]
+ |node_number:{27}
  |normalized:{gH-3rd}
   *arguments_line C1
    *line_arg C3
@@ -2590,8 +2643,9 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |associated_anchor_command:[E53]
  |associated_node:[E53]
  |section_directions:D[next->E56|prev->E52|up->E1]
+ |section_heading_number:{26}
  |section_level:{1}
- |section_number:{26}
+ |section_number:{27}
  |toplevel_directions:D[next->E56|prev->E52|up->E1]
   *arguments_line C1
    *line_arg C3
@@ -2616,6 +2670,7 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[prev->E53|up->E0]
  |node_directions:D[prev->E53|up->E0]
+ |node_number:{28}
  
|normalized:{http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls}
   *arguments_line C1
    *line_arg C5
@@ -2649,8 +2704,9 @@ $result_tree_text{'at_commands_in_refs'} = 
'*document_root C58
  |associated_anchor_command:[E55]
  |associated_node:[E55]
  |section_directions:D[prev->E54|up->E1]
+ |section_heading_number:{27}
  |section_level:{1}
- |section_number:{27}
+ |section_number:{28}
  |toplevel_directions:D[prev->E54|up->E1]
   *arguments_line C1
    *line_arg C5
diff --git a/tta/perl/t/results/formats_encodings/at_commands_in_refs_latin1.pl 
b/tta/perl/t/results/formats_encodings/at_commands_in_refs_latin1.pl
index a36dcc3475..76f8c159bc 100644
--- a/tta/perl/t/results/formats_encodings/at_commands_in_refs_latin1.pl
+++ b/tta/perl/t/results/formats_encodings/at_commands_in_refs_latin1.pl
@@ -42,6 +42,7 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -58,6 +59,7 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |associated_node:[E0]
  
|section_childs:EC[E4|E6|E8|E10|E12|E14|E16|E18|E20|E22|E24|E26|E28|E30|E32|E34|E36|E38|E40|E42|E44|E46|E48|E50|E52|E54|E56]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -832,6 +834,7 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{-_007b-_007d}
   *arguments_line C1
    *line_arg C5
@@ -851,8 +854,9 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C5
@@ -875,6 +879,7 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E7|prev->E3|up->E0]
  |node_directions:D[next->E7|prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{-_0021-_002e-_002e-_003f-_0040}
   *arguments_line C1
    *line_arg C17
@@ -906,8 +911,9 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[next->E8|prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E8|prev->E4|up->E1]
   *arguments_line C1
    *line_arg C17
@@ -942,6 +948,7 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E9|prev->E5|up->E0]
  |node_directions:D[next->E9|prev->E5|up->E0]
+ |node_number:{4}
  |normalized:{_0040-_007b-_007d-_005c-_0023}
   *arguments_line C1
    *line_arg C9
@@ -970,8 +977,9 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |associated_anchor_command:[E7]
  |associated_node:[E7]
  |section_directions:D[next->E10|prev->E6|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{4}
  |toplevel_directions:D[next->E10|prev->E6|up->E1]
   *arguments_line C1
    *line_arg C9
@@ -1003,6 +1011,7 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E11|prev->E7|up->E0]
  |node_directions:D[next->E11|prev->E7|up->E0]
+ |node_number:{5}
  |normalized:{LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e}
   *arguments_line C1
    *line_arg C13
@@ -1037,8 +1046,9 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[next->E12|prev->E8|up->E1]
+ |section_heading_number:{4}
  |section_level:{1}
- |section_number:{4}
+ |section_number:{5}
  |toplevel_directions:D[next->E12|prev->E8|up->E1]
   *arguments_line C1
    *line_arg C13
@@ -1076,6 +1086,7 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E13|prev->E9|up->E0]
  |node_directions:D[next->E13|prev->E9|up->E0]
+ |node_number:{6}
  |normalized:{_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212}
   *arguments_line C1
    *line_arg C11
@@ -1107,8 +1118,9 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |associated_anchor_command:[E11]
  |associated_node:[E11]
  |section_directions:D[next->E14|prev->E10|up->E1]
+ |section_heading_number:{5}
  |section_level:{1}
- |section_number:{5}
+ |section_number:{6}
  |toplevel_directions:D[next->E14|prev->E10|up->E1]
   *arguments_line C1
    *line_arg C11
@@ -1143,6 +1155,7 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E15|prev->E11|up->E0]
  |node_directions:D[next->E15|prev->E11|up->E0]
+ |node_number:{7}
  |normalized:{_2265-_2264-_2192}
   *arguments_line C1
    *line_arg C5
@@ -1165,8 +1178,9 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |associated_anchor_command:[E13]
  |associated_node:[E13]
  |section_directions:D[next->E16|prev->E12|up->E1]
+ |section_heading_number:{6}
  |section_level:{1}
- |section_number:{6}
+ |section_number:{7}
  |toplevel_directions:D[next->E16|prev->E12|up->E1]
   *arguments_line C1
    *line_arg C5
@@ -1192,6 +1206,7 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E17|prev->E13|up->E0]
  |node_directions:D[next->E17|prev->E13|up->E0]
+ |node_number:{8}
  |normalized:{_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae}
   *arguments_line C1
    *line_arg C13
@@ -1226,8 +1241,9 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |associated_anchor_command:[E15]
  |associated_node:[E15]
  |section_directions:D[next->E18|prev->E14|up->E1]
+ |section_heading_number:{7}
  |section_level:{1}
- |section_number:{7}
+ |section_number:{8}
  |toplevel_directions:D[next->E18|prev->E14|up->E1]
   *arguments_line C1
    *line_arg C13
@@ -1265,6 +1281,7 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E19|prev->E15|up->E0]
  |node_directions:D[next->E19|prev->E15|up->E0]
+ |node_number:{9}
  |normalized:{_21d2-_00b0-a-b-_00e5}
   *arguments_line C1
    *line_arg C9
@@ -1293,8 +1310,9 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |associated_anchor_command:[E17]
  |associated_node:[E17]
  |section_directions:D[next->E20|prev->E16|up->E1]
+ |section_heading_number:{8}
  |section_level:{1}
- |section_number:{8}
+ |section_number:{9}
  |toplevel_directions:D[next->E20|prev->E16|up->E1]
   *arguments_line C1
    *line_arg C9
@@ -1326,6 +1344,7 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E21|prev->E17|up->E0]
  |node_directions:D[next->E21|prev->E17|up->E0]
+ |node_number:{10}
  
|normalized:{_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe}
   *arguments_line C1
    *line_arg C27
@@ -1381,8 +1400,9 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |associated_anchor_command:[E19]
  |associated_node:[E19]
  |section_directions:D[next->E22|prev->E18|up->E1]
+ |section_heading_number:{9}
  |section_level:{1}
- |section_number:{9}
+ |section_number:{10}
  |toplevel_directions:D[next->E22|prev->E18|up->E1]
   *arguments_line C1
    *line_arg C27
@@ -1441,6 +1461,7 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E23|prev->E19|up->E0]
  |node_directions:D[next->E23|prev->E19|up->E0]
+ |node_number:{11}
  
|normalized:{_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119}
   *arguments_line C1
    *line_arg C21
@@ -1500,8 +1521,9 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |associated_anchor_command:[E21]
  |associated_node:[E21]
  |section_directions:D[next->E24|prev->E20|up->E1]
+ |section_heading_number:{10}
  |section_level:{1}
- |section_number:{10}
+ |section_number:{11}
  |toplevel_directions:D[next->E24|prev->E20|up->E1]
   *arguments_line C1
    *line_arg C21
@@ -1564,6 +1586,7 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E25|prev->E21|up->E0]
  |node_directions:D[next->E25|prev->E21|up->E0]
+ |node_number:{12}
  |normalized:{_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e}
   *arguments_line C1
    *line_arg C13
@@ -1605,8 +1628,9 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |associated_anchor_command:[E23]
  |associated_node:[E23]
  |section_directions:D[next->E26|prev->E22|up->E1]
+ |section_heading_number:{11}
  |section_level:{1}
- |section_number:{11}
+ |section_number:{12}
  |toplevel_directions:D[next->E26|prev->E22|up->E1]
   *arguments_line C1
    *line_arg C13
@@ -1651,6 +1675,7 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E27|prev->E23|up->E0]
  |node_directions:D[next->E27|prev->E23|up->E0]
+ |node_number:{13}
  |normalized:{_0131-_1e14-_1e08}
   *arguments_line C1
    *line_arg C5
@@ -1680,8 +1705,9 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |associated_anchor_command:[E25]
  |associated_node:[E25]
  |section_directions:D[next->E28|prev->E24|up->E1]
+ |section_heading_number:{12}
  |section_level:{1}
- |section_number:{12}
+ |section_number:{13}
  |toplevel_directions:D[next->E28|prev->E24|up->E1]
   *arguments_line C1
    *line_arg C5
@@ -1714,6 +1740,7 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E29|prev->E25|up->E0]
  |node_directions:D[next->E29|prev->E25|up->E0]
+ |node_number:{14}
  |normalized:{_201c-_201d-_2018-_2019-_201e-_201a}
   *arguments_line C1
    *line_arg C11
@@ -1745,8 +1772,9 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |associated_anchor_command:[E27]
  |associated_node:[E27]
  |section_directions:D[next->E30|prev->E26|up->E1]
+ |section_heading_number:{13}
  |section_level:{1}
- |section_number:{13}
+ |section_number:{14}
  |toplevel_directions:D[next->E30|prev->E26|up->E1]
   *arguments_line C1
    *line_arg C11
@@ -1781,6 +1809,7 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E31|prev->E27|up->E0]
  |node_directions:D[next->E31|prev->E27|up->E0]
+ |node_number:{15}
  |normalized:{_00ab-_00bb-_00ab-_00bb-_2039-_203a}
   *arguments_line C1
    *line_arg C11
@@ -1812,8 +1841,9 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |associated_anchor_command:[E29]
  |associated_node:[E29]
  |section_directions:D[next->E32|prev->E28|up->E1]
+ |section_heading_number:{14}
  |section_level:{1}
- |section_number:{14}
+ |section_number:{15}
  |toplevel_directions:D[next->E32|prev->E28|up->E1]
   *arguments_line C1
    *line_arg C11
@@ -1848,6 +1878,7 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E33|prev->E29|up->E0]
  |node_directions:D[next->E33|prev->E29|up->E0]
+ |node_number:{16}
  |normalized:{_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027}
   *arguments_line C1
    *line_arg C1
@@ -1863,8 +1894,9 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |associated_anchor_command:[E31]
  |associated_node:[E31]
  |section_directions:D[next->E34|prev->E30|up->E1]
+ |section_heading_number:{15}
  |section_level:{1}
- |section_number:{15}
+ |section_number:{16}
  |toplevel_directions:D[next->E34|prev->E30|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -1883,6 +1915,7 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E35|prev->E31|up->E0]
  |node_directions:D[next->E35|prev->E31|up->E0]
+ |node_number:{17}
  |normalized:{AAA-AAA-BBB}
   *arguments_line C1
    *line_arg C5
@@ -1913,8 +1946,9 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |associated_anchor_command:[E33]
  |associated_node:[E33]
  |section_directions:D[next->E36|prev->E32|up->E1]
+ |section_heading_number:{16}
  |section_level:{1}
- |section_number:{16}
+ |section_number:{17}
  |toplevel_directions:D[next->E36|prev->E32|up->E1]
   *arguments_line C1
    *line_arg C5
@@ -1948,6 +1982,7 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E37|prev->E33|up->E0]
  |node_directions:D[next->E37|prev->E33|up->E0]
+ |node_number:{18}
  |normalized:{CCC-CCC-DDD}
   *arguments_line C1
   >SOURCEMARKS
@@ -1986,8 +2021,9 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |associated_anchor_command:[E35]
  |associated_node:[E35]
  |section_directions:D[next->E38|prev->E34|up->E1]
+ |section_heading_number:{17}
  |section_level:{1}
- |section_number:{17}
+ |section_number:{18}
  |toplevel_directions:D[next->E38|prev->E34|up->E1]
   *arguments_line C1
   >SOURCEMARKS
@@ -2034,6 +2070,7 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E39|prev->E35|up->E0]
  |node_directions:D[next->E39|prev->E35|up->E0]
+ |node_number:{19}
  |normalized:{someone_0040somewher-no_005fexplain_0040there}
   *arguments_line C1
    *line_arg C3
@@ -2064,8 +2101,9 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |associated_anchor_command:[E37]
  |associated_node:[E37]
  |section_directions:D[next->E40|prev->E36|up->E1]
+ |section_heading_number:{18}
  |section_level:{1}
- |section_number:{18}
+ |section_number:{19}
  |toplevel_directions:D[next->E40|prev->E36|up->E1]
   *arguments_line C1
    *line_arg C3
@@ -2099,6 +2137,7 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E41|prev->E37|up->E0]
  |node_directions:D[next->E41|prev->E37|up->E0]
+ |node_number:{20}
  |normalized:{f_002d_002dile1-f_002d_002dile}
   *arguments_line C1
   >SOURCEMARKS
@@ -2140,8 +2179,9 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |associated_anchor_command:[E39]
  |associated_node:[E39]
  |section_directions:D[next->E42|prev->E38|up->E1]
+ |section_heading_number:{19}
  |section_level:{1}
- |section_number:{19}
+ |section_number:{20}
  |toplevel_directions:D[next->E42|prev->E38|up->E1]
   *arguments_line C1
   >SOURCEMARKS
@@ -2191,6 +2231,7 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E43|prev->E39|up->E0]
  |node_directions:D[next->E43|prev->E39|up->E0]
+ |node_number:{21}
  |normalized:{-_0040-_007b_007d-_002e-}
   *arguments_line C1
   >SOURCEMARKS
@@ -2218,8 +2259,9 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |associated_anchor_command:[E41]
  |associated_node:[E41]
  |section_directions:D[next->E44|prev->E40|up->E1]
+ |section_heading_number:{20}
  |section_level:{1}
- |section_number:{20}
+ |section_number:{21}
  |toplevel_directions:D[next->E44|prev->E40|up->E1]
   *arguments_line C1
   >SOURCEMARKS
@@ -2255,6 +2297,7 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E45|prev->E41|up->E0]
  |node_directions:D[next->E45|prev->E41|up->E0]
+ |node_number:{22}
  |normalized:{cite-asis-in-_0040w-b-in-r-sc-str-t-var-dfn-i}
   *arguments_line C1
    *line_arg C17
@@ -2312,8 +2355,9 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |associated_anchor_command:[E43]
  |associated_node:[E43]
  |section_directions:D[next->E46|prev->E42|up->E1]
+ |section_heading_number:{21}
  |section_level:{1}
- |section_number:{21}
+ |section_number:{22}
  |toplevel_directions:D[next->E46|prev->E42|up->E1]
   *arguments_line C1
    *line_arg C17
@@ -2374,6 +2418,7 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E47|prev->E43|up->E0]
  |node_directions:D[next->E47|prev->E43|up->E0]
+ |node_number:{23}
  |normalized:{env-code-option-samp-command-file-C_002dx-ESC}
   *arguments_line C1
    *line_arg C13
@@ -2418,8 +2463,9 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |associated_anchor_command:[E45]
  |associated_node:[E45]
  |section_directions:D[next->E48|prev->E44|up->E1]
+ |section_heading_number:{22}
  |section_level:{1}
- |section_number:{22}
+ |section_number:{23}
  |toplevel_directions:D[next->E48|prev->E44|up->E1]
   *arguments_line C1
    *line_arg C13
@@ -2467,6 +2513,7 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E49|prev->E45|up->E0]
  |node_directions:D[next->E49|prev->E45|up->E0]
+ |node_number:{24}
  |normalized:{8_002e27in}
   *arguments_line C1
    *line_arg C2
@@ -2485,8 +2532,9 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |associated_anchor_command:[E47]
  |associated_node:[E47]
  |section_directions:D[next->E50|prev->E46|up->E1]
+ |section_heading_number:{23}
  |section_level:{1}
- |section_number:{23}
+ |section_number:{24}
  |toplevel_directions:D[next->E50|prev->E46|up->E1]
   *arguments_line C1
    *line_arg C2
@@ -2508,6 +2556,7 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E51|prev->E47|up->E0]
  |node_directions:D[next->E51|prev->E47|up->E0]
+ |node_number:{25}
  |normalized:{sansserif-slanted}
   *arguments_line C1
    *line_arg C3
@@ -2529,8 +2578,9 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |associated_anchor_command:[E49]
  |associated_node:[E49]
  |section_directions:D[next->E52|prev->E48|up->E1]
+ |section_heading_number:{24}
  |section_level:{1}
- |section_number:{24}
+ |section_number:{25}
  |toplevel_directions:D[next->E52|prev->E48|up->E1]
   *arguments_line C1
    *line_arg C3
@@ -2555,6 +2605,7 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E53|prev->E49|up->E0]
  |node_directions:D[next->E53|prev->E49|up->E0]
+ |node_number:{26}
  |normalized:{indicateurl}
   *arguments_line C1
    *line_arg C1
@@ -2572,8 +2623,9 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |associated_anchor_command:[E51]
  |associated_node:[E51]
  |section_directions:D[next->E54|prev->E50|up->E1]
+ |section_heading_number:{25}
  |section_level:{1}
- |section_number:{25}
+ |section_number:{26}
  |toplevel_directions:D[next->E54|prev->E50|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -2594,6 +2646,7 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E55|prev->E51|up->E0]
  |node_directions:D[next->E55|prev->E51|up->E0]
+ |node_number:{27}
  |normalized:{gH-3rd}
   *arguments_line C1
    *line_arg C3
@@ -2615,8 +2668,9 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |associated_anchor_command:[E53]
  |associated_node:[E53]
  |section_directions:D[next->E56|prev->E52|up->E1]
+ |section_heading_number:{26}
  |section_level:{1}
- |section_number:{26}
+ |section_number:{27}
  |toplevel_directions:D[next->E56|prev->E52|up->E1]
   *arguments_line C1
    *line_arg C3
@@ -2641,6 +2695,7 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[prev->E53|up->E0]
  |node_directions:D[prev->E53|up->E0]
+ |node_number:{28}
  
|normalized:{http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls}
   *arguments_line C1
    *line_arg C5
@@ -2674,8 +2729,9 @@ $result_tree_text{'at_commands_in_refs_latin1'} = 
'*document_root C58
  |associated_anchor_command:[E55]
  |associated_node:[E55]
  |section_directions:D[prev->E54|up->E1]
+ |section_heading_number:{27}
  |section_level:{1}
- |section_number:{27}
+ |section_number:{28}
  |toplevel_directions:D[prev->E54|up->E1]
   *arguments_line C1
    *line_arg C5
diff --git a/tta/perl/t/results/formats_encodings/at_commands_in_refs_utf8.pl 
b/tta/perl/t/results/formats_encodings/at_commands_in_refs_utf8.pl
index 0e766c9805..92a6373d83 100644
--- a/tta/perl/t/results/formats_encodings/at_commands_in_refs_utf8.pl
+++ b/tta/perl/t/results/formats_encodings/at_commands_in_refs_utf8.pl
@@ -42,6 +42,7 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -58,6 +59,7 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |associated_node:[E0]
  
|section_childs:EC[E4|E6|E8|E10|E12|E14|E16|E18|E20|E22|E24|E26|E28|E30|E32|E34|E36|E38|E40|E42|E44|E46|E48|E50|E52|E54|E56]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -832,6 +834,7 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{-_007b-_007d}
   *arguments_line C1
    *line_arg C5
@@ -851,8 +854,9 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C5
@@ -875,6 +879,7 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E7|prev->E3|up->E0]
  |node_directions:D[next->E7|prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{-_0021-_002e-_002e-_003f-_0040}
   *arguments_line C1
    *line_arg C17
@@ -906,8 +911,9 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[next->E8|prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E8|prev->E4|up->E1]
   *arguments_line C1
    *line_arg C17
@@ -942,6 +948,7 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E9|prev->E5|up->E0]
  |node_directions:D[next->E9|prev->E5|up->E0]
+ |node_number:{4}
  |normalized:{_0040-_007b-_007d-_005c-_0023}
   *arguments_line C1
    *line_arg C9
@@ -970,8 +977,9 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |associated_anchor_command:[E7]
  |associated_node:[E7]
  |section_directions:D[next->E10|prev->E6|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{4}
  |toplevel_directions:D[next->E10|prev->E6|up->E1]
   *arguments_line C1
    *line_arg C9
@@ -1003,6 +1011,7 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E11|prev->E7|up->E0]
  |node_directions:D[next->E11|prev->E7|up->E0]
+ |node_number:{5}
  |normalized:{LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e}
   *arguments_line C1
    *line_arg C13
@@ -1037,8 +1046,9 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[next->E12|prev->E8|up->E1]
+ |section_heading_number:{4}
  |section_level:{1}
- |section_number:{4}
+ |section_number:{5}
  |toplevel_directions:D[next->E12|prev->E8|up->E1]
   *arguments_line C1
    *line_arg C13
@@ -1076,6 +1086,7 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E13|prev->E9|up->E0]
  |node_directions:D[next->E13|prev->E9|up->E0]
+ |node_number:{6}
  |normalized:{_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212}
   *arguments_line C1
    *line_arg C11
@@ -1107,8 +1118,9 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |associated_anchor_command:[E11]
  |associated_node:[E11]
  |section_directions:D[next->E14|prev->E10|up->E1]
+ |section_heading_number:{5}
  |section_level:{1}
- |section_number:{5}
+ |section_number:{6}
  |toplevel_directions:D[next->E14|prev->E10|up->E1]
   *arguments_line C1
    *line_arg C11
@@ -1143,6 +1155,7 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E15|prev->E11|up->E0]
  |node_directions:D[next->E15|prev->E11|up->E0]
+ |node_number:{7}
  |normalized:{_2265-_2264-_2192}
   *arguments_line C1
    *line_arg C5
@@ -1165,8 +1178,9 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |associated_anchor_command:[E13]
  |associated_node:[E13]
  |section_directions:D[next->E16|prev->E12|up->E1]
+ |section_heading_number:{6}
  |section_level:{1}
- |section_number:{6}
+ |section_number:{7}
  |toplevel_directions:D[next->E16|prev->E12|up->E1]
   *arguments_line C1
    *line_arg C5
@@ -1192,6 +1206,7 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E17|prev->E13|up->E0]
  |node_directions:D[next->E17|prev->E13|up->E0]
+ |node_number:{8}
  |normalized:{_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae}
   *arguments_line C1
    *line_arg C13
@@ -1226,8 +1241,9 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |associated_anchor_command:[E15]
  |associated_node:[E15]
  |section_directions:D[next->E18|prev->E14|up->E1]
+ |section_heading_number:{7}
  |section_level:{1}
- |section_number:{7}
+ |section_number:{8}
  |toplevel_directions:D[next->E18|prev->E14|up->E1]
   *arguments_line C1
    *line_arg C13
@@ -1265,6 +1281,7 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E19|prev->E15|up->E0]
  |node_directions:D[next->E19|prev->E15|up->E0]
+ |node_number:{9}
  |normalized:{_21d2-_00b0-a-b-_00e5}
   *arguments_line C1
    *line_arg C9
@@ -1293,8 +1310,9 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |associated_anchor_command:[E17]
  |associated_node:[E17]
  |section_directions:D[next->E20|prev->E16|up->E1]
+ |section_heading_number:{8}
  |section_level:{1}
- |section_number:{8}
+ |section_number:{9}
  |toplevel_directions:D[next->E20|prev->E16|up->E1]
   *arguments_line C1
    *line_arg C9
@@ -1326,6 +1344,7 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E21|prev->E17|up->E0]
  |node_directions:D[next->E21|prev->E17|up->E0]
+ |node_number:{10}
  
|normalized:{_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe}
   *arguments_line C1
    *line_arg C27
@@ -1381,8 +1400,9 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |associated_anchor_command:[E19]
  |associated_node:[E19]
  |section_directions:D[next->E22|prev->E18|up->E1]
+ |section_heading_number:{9}
  |section_level:{1}
- |section_number:{9}
+ |section_number:{10}
  |toplevel_directions:D[next->E22|prev->E18|up->E1]
   *arguments_line C1
    *line_arg C27
@@ -1441,6 +1461,7 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E23|prev->E19|up->E0]
  |node_directions:D[next->E23|prev->E19|up->E0]
+ |node_number:{11}
  
|normalized:{_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119}
   *arguments_line C1
    *line_arg C21
@@ -1500,8 +1521,9 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |associated_anchor_command:[E21]
  |associated_node:[E21]
  |section_directions:D[next->E24|prev->E20|up->E1]
+ |section_heading_number:{10}
  |section_level:{1}
- |section_number:{10}
+ |section_number:{11}
  |toplevel_directions:D[next->E24|prev->E20|up->E1]
   *arguments_line C1
    *line_arg C21
@@ -1564,6 +1586,7 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E25|prev->E21|up->E0]
  |node_directions:D[next->E25|prev->E21|up->E0]
+ |node_number:{12}
  |normalized:{_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e}
   *arguments_line C1
    *line_arg C13
@@ -1605,8 +1628,9 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |associated_anchor_command:[E23]
  |associated_node:[E23]
  |section_directions:D[next->E26|prev->E22|up->E1]
+ |section_heading_number:{11}
  |section_level:{1}
- |section_number:{11}
+ |section_number:{12}
  |toplevel_directions:D[next->E26|prev->E22|up->E1]
   *arguments_line C1
    *line_arg C13
@@ -1651,6 +1675,7 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E27|prev->E23|up->E0]
  |node_directions:D[next->E27|prev->E23|up->E0]
+ |node_number:{13}
  |normalized:{_0131-_1e14-_1e08}
   *arguments_line C1
    *line_arg C5
@@ -1680,8 +1705,9 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |associated_anchor_command:[E25]
  |associated_node:[E25]
  |section_directions:D[next->E28|prev->E24|up->E1]
+ |section_heading_number:{12}
  |section_level:{1}
- |section_number:{12}
+ |section_number:{13}
  |toplevel_directions:D[next->E28|prev->E24|up->E1]
   *arguments_line C1
    *line_arg C5
@@ -1714,6 +1740,7 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E29|prev->E25|up->E0]
  |node_directions:D[next->E29|prev->E25|up->E0]
+ |node_number:{14}
  |normalized:{_201c-_201d-_2018-_2019-_201e-_201a}
   *arguments_line C1
    *line_arg C11
@@ -1745,8 +1772,9 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |associated_anchor_command:[E27]
  |associated_node:[E27]
  |section_directions:D[next->E30|prev->E26|up->E1]
+ |section_heading_number:{13}
  |section_level:{1}
- |section_number:{13}
+ |section_number:{14}
  |toplevel_directions:D[next->E30|prev->E26|up->E1]
   *arguments_line C1
    *line_arg C11
@@ -1781,6 +1809,7 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E31|prev->E27|up->E0]
  |node_directions:D[next->E31|prev->E27|up->E0]
+ |node_number:{15}
  |normalized:{_00ab-_00bb-_00ab-_00bb-_2039-_203a}
   *arguments_line C1
    *line_arg C11
@@ -1812,8 +1841,9 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |associated_anchor_command:[E29]
  |associated_node:[E29]
  |section_directions:D[next->E32|prev->E28|up->E1]
+ |section_heading_number:{14}
  |section_level:{1}
- |section_number:{14}
+ |section_number:{15}
  |toplevel_directions:D[next->E32|prev->E28|up->E1]
   *arguments_line C1
    *line_arg C11
@@ -1848,6 +1878,7 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E33|prev->E29|up->E0]
  |node_directions:D[next->E33|prev->E29|up->E0]
+ |node_number:{16}
  |normalized:{_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027}
   *arguments_line C1
    *line_arg C1
@@ -1863,8 +1894,9 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |associated_anchor_command:[E31]
  |associated_node:[E31]
  |section_directions:D[next->E34|prev->E30|up->E1]
+ |section_heading_number:{15}
  |section_level:{1}
- |section_number:{15}
+ |section_number:{16}
  |toplevel_directions:D[next->E34|prev->E30|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -1883,6 +1915,7 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E35|prev->E31|up->E0]
  |node_directions:D[next->E35|prev->E31|up->E0]
+ |node_number:{17}
  |normalized:{AAA-AAA-BBB}
   *arguments_line C1
    *line_arg C5
@@ -1913,8 +1946,9 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |associated_anchor_command:[E33]
  |associated_node:[E33]
  |section_directions:D[next->E36|prev->E32|up->E1]
+ |section_heading_number:{16}
  |section_level:{1}
- |section_number:{16}
+ |section_number:{17}
  |toplevel_directions:D[next->E36|prev->E32|up->E1]
   *arguments_line C1
    *line_arg C5
@@ -1948,6 +1982,7 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E37|prev->E33|up->E0]
  |node_directions:D[next->E37|prev->E33|up->E0]
+ |node_number:{18}
  |normalized:{CCC-CCC-DDD}
   *arguments_line C1
   >SOURCEMARKS
@@ -1986,8 +2021,9 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |associated_anchor_command:[E35]
  |associated_node:[E35]
  |section_directions:D[next->E38|prev->E34|up->E1]
+ |section_heading_number:{17}
  |section_level:{1}
- |section_number:{17}
+ |section_number:{18}
  |toplevel_directions:D[next->E38|prev->E34|up->E1]
   *arguments_line C1
   >SOURCEMARKS
@@ -2034,6 +2070,7 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E39|prev->E35|up->E0]
  |node_directions:D[next->E39|prev->E35|up->E0]
+ |node_number:{19}
  |normalized:{someone_0040somewher-no_005fexplain_0040there}
   *arguments_line C1
    *line_arg C3
@@ -2064,8 +2101,9 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |associated_anchor_command:[E37]
  |associated_node:[E37]
  |section_directions:D[next->E40|prev->E36|up->E1]
+ |section_heading_number:{18}
  |section_level:{1}
- |section_number:{18}
+ |section_number:{19}
  |toplevel_directions:D[next->E40|prev->E36|up->E1]
   *arguments_line C1
    *line_arg C3
@@ -2099,6 +2137,7 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E41|prev->E37|up->E0]
  |node_directions:D[next->E41|prev->E37|up->E0]
+ |node_number:{20}
  |normalized:{f_002d_002dile1-f_002d_002dile}
   *arguments_line C1
   >SOURCEMARKS
@@ -2140,8 +2179,9 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |associated_anchor_command:[E39]
  |associated_node:[E39]
  |section_directions:D[next->E42|prev->E38|up->E1]
+ |section_heading_number:{19}
  |section_level:{1}
- |section_number:{19}
+ |section_number:{20}
  |toplevel_directions:D[next->E42|prev->E38|up->E1]
   *arguments_line C1
   >SOURCEMARKS
@@ -2191,6 +2231,7 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E43|prev->E39|up->E0]
  |node_directions:D[next->E43|prev->E39|up->E0]
+ |node_number:{21}
  |normalized:{-_0040-_007b_007d-_002e-}
   *arguments_line C1
   >SOURCEMARKS
@@ -2218,8 +2259,9 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |associated_anchor_command:[E41]
  |associated_node:[E41]
  |section_directions:D[next->E44|prev->E40|up->E1]
+ |section_heading_number:{20}
  |section_level:{1}
- |section_number:{20}
+ |section_number:{21}
  |toplevel_directions:D[next->E44|prev->E40|up->E1]
   *arguments_line C1
   >SOURCEMARKS
@@ -2255,6 +2297,7 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E45|prev->E41|up->E0]
  |node_directions:D[next->E45|prev->E41|up->E0]
+ |node_number:{22}
  |normalized:{cite-asis-in-_0040w-b-in-r-sc-str-t-var-dfn-i}
   *arguments_line C1
    *line_arg C17
@@ -2312,8 +2355,9 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |associated_anchor_command:[E43]
  |associated_node:[E43]
  |section_directions:D[next->E46|prev->E42|up->E1]
+ |section_heading_number:{21}
  |section_level:{1}
- |section_number:{21}
+ |section_number:{22}
  |toplevel_directions:D[next->E46|prev->E42|up->E1]
   *arguments_line C1
    *line_arg C17
@@ -2374,6 +2418,7 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E47|prev->E43|up->E0]
  |node_directions:D[next->E47|prev->E43|up->E0]
+ |node_number:{23}
  |normalized:{env-code-option-samp-command-file-C_002dx-ESC}
   *arguments_line C1
    *line_arg C13
@@ -2418,8 +2463,9 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |associated_anchor_command:[E45]
  |associated_node:[E45]
  |section_directions:D[next->E48|prev->E44|up->E1]
+ |section_heading_number:{22}
  |section_level:{1}
- |section_number:{22}
+ |section_number:{23}
  |toplevel_directions:D[next->E48|prev->E44|up->E1]
   *arguments_line C1
    *line_arg C13
@@ -2467,6 +2513,7 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E49|prev->E45|up->E0]
  |node_directions:D[next->E49|prev->E45|up->E0]
+ |node_number:{24}
  |normalized:{8_002e27in}
   *arguments_line C1
    *line_arg C2
@@ -2485,8 +2532,9 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |associated_anchor_command:[E47]
  |associated_node:[E47]
  |section_directions:D[next->E50|prev->E46|up->E1]
+ |section_heading_number:{23}
  |section_level:{1}
- |section_number:{23}
+ |section_number:{24}
  |toplevel_directions:D[next->E50|prev->E46|up->E1]
   *arguments_line C1
    *line_arg C2
@@ -2508,6 +2556,7 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E51|prev->E47|up->E0]
  |node_directions:D[next->E51|prev->E47|up->E0]
+ |node_number:{25}
  |normalized:{sansserif-slanted}
   *arguments_line C1
    *line_arg C3
@@ -2529,8 +2578,9 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |associated_anchor_command:[E49]
  |associated_node:[E49]
  |section_directions:D[next->E52|prev->E48|up->E1]
+ |section_heading_number:{24}
  |section_level:{1}
- |section_number:{24}
+ |section_number:{25}
  |toplevel_directions:D[next->E52|prev->E48|up->E1]
   *arguments_line C1
    *line_arg C3
@@ -2555,6 +2605,7 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E53|prev->E49|up->E0]
  |node_directions:D[next->E53|prev->E49|up->E0]
+ |node_number:{26}
  |normalized:{indicateurl}
   *arguments_line C1
    *line_arg C1
@@ -2572,8 +2623,9 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |associated_anchor_command:[E51]
  |associated_node:[E51]
  |section_directions:D[next->E54|prev->E50|up->E1]
+ |section_heading_number:{25}
  |section_level:{1}
- |section_number:{25}
+ |section_number:{26}
  |toplevel_directions:D[next->E54|prev->E50|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -2594,6 +2646,7 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[next->E55|prev->E51|up->E0]
  |node_directions:D[next->E55|prev->E51|up->E0]
+ |node_number:{27}
  |normalized:{gH-3rd}
   *arguments_line C1
    *line_arg C3
@@ -2615,8 +2668,9 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |associated_anchor_command:[E53]
  |associated_node:[E53]
  |section_directions:D[next->E56|prev->E52|up->E1]
+ |section_heading_number:{26}
  |section_level:{1}
- |section_number:{26}
+ |section_number:{27}
  |toplevel_directions:D[next->E56|prev->E52|up->E1]
   *arguments_line C1
    *line_arg C3
@@ -2641,6 +2695,7 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |is_target:{1}
  |menu_directions:D[prev->E53|up->E0]
  |node_directions:D[prev->E53|up->E0]
+ |node_number:{28}
  
|normalized:{http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls}
   *arguments_line C1
    *line_arg C5
@@ -2674,8 +2729,9 @@ $result_tree_text{'at_commands_in_refs_utf8'} = 
'*document_root C58
  |associated_anchor_command:[E55]
  |associated_node:[E55]
  |section_directions:D[prev->E54|up->E1]
+ |section_heading_number:{27}
  |section_level:{1}
- |section_number:{27}
+ |section_number:{28}
  |toplevel_directions:D[prev->E54|up->E1]
   *arguments_line C1
    *line_arg C5
diff --git a/tta/perl/t/results/formats_encodings/char_latin1_latin1_in_refs.pl 
b/tta/perl/t/results/formats_encodings/char_latin1_latin1_in_refs.pl
index e502716bbc..cd32b57669 100644
--- a/tta/perl/t/results/formats_encodings/char_latin1_latin1_in_refs.pl
+++ b/tta/perl/t/results/formats_encodings/char_latin1_latin1_in_refs.pl
@@ -35,6 +35,7 @@ $result_tree_text{'char_latin1_latin1_in_refs'} = 
'*document_root C14
  |isindex:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -51,6 +52,7 @@ $result_tree_text{'char_latin1_latin1_in_refs'} = 
'*document_root C14
  |associated_node:[E0]
  |section_childs:EC[E4|E6|E8|E10|E12]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -160,6 +162,7 @@ $result_tree_text{'char_latin1_latin1_in_refs'} = 
'*document_root C14
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  
|normalized:{_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc}
   *arguments_line C1
    *line_arg C1
@@ -175,8 +178,9 @@ $result_tree_text{'char_latin1_latin1_in_refs'} = 
'*document_root C14
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -195,6 +199,7 @@ $result_tree_text{'char_latin1_latin1_in_refs'} = 
'*document_root C14
  |is_target:{1}
  |menu_directions:D[next->E7|prev->E3|up->E0]
  |node_directions:D[next->E7|prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{_00e9}
   *arguments_line C1
    *line_arg C1
@@ -210,8 +215,9 @@ $result_tree_text{'char_latin1_latin1_in_refs'} = 
'*document_root C14
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[next->E8|prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E8|prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -230,6 +236,7 @@ $result_tree_text{'char_latin1_latin1_in_refs'} = 
'*document_root C14
  |is_target:{1}
  |menu_directions:D[next->E9|prev->E5|up->E0]
  |node_directions:D[next->E9|prev->E5|up->E0]
+ |node_number:{4}
  |normalized:{_00e0-_00e8-_00f9}
   *arguments_line C1
    *line_arg C1
@@ -245,8 +252,9 @@ $result_tree_text{'char_latin1_latin1_in_refs'} = 
'*document_root C14
  |associated_anchor_command:[E7]
  |associated_node:[E7]
  |section_directions:D[next->E10|prev->E6|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{4}
  |toplevel_directions:D[next->E10|prev->E6|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -265,6 +273,7 @@ $result_tree_text{'char_latin1_latin1_in_refs'} = 
'*document_root C14
  |is_target:{1}
  |menu_directions:D[next->E11|prev->E7|up->E0]
  |node_directions:D[next->E11|prev->E7|up->E0]
+ |node_number:{5}
  |normalized:{_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db}
   *arguments_line C1
    *line_arg C1
@@ -280,8 +289,9 @@ $result_tree_text{'char_latin1_latin1_in_refs'} = 
'*document_root C14
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[next->E12|prev->E8|up->E1]
+ |section_heading_number:{4}
  |section_level:{1}
- |section_number:{4}
+ |section_number:{5}
  |toplevel_directions:D[next->E12|prev->E8|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -300,6 +310,7 @@ $result_tree_text{'char_latin1_latin1_in_refs'} = 
'*document_root C14
  |is_target:{1}
  |menu_directions:D[prev->E9|up->E0]
  |node_directions:D[prev->E9|up->E0]
+ |node_number:{6}
  |normalized:{_00e7}
   *arguments_line C1
    *line_arg C1
@@ -315,8 +326,9 @@ $result_tree_text{'char_latin1_latin1_in_refs'} = 
'*document_root C14
  |associated_anchor_command:[E11]
  |associated_node:[E11]
  |section_directions:D[prev->E10|up->E1]
+ |section_heading_number:{5}
  |section_level:{1}
- |section_number:{5}
+ |section_number:{6}
  |toplevel_directions:D[prev->E10|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/formats_encodings/char_latin2_latin2_in_refs.pl 
b/tta/perl/t/results/formats_encodings/char_latin2_latin2_in_refs.pl
index d46d645beb..e963d7e0bc 100644
--- a/tta/perl/t/results/formats_encodings/char_latin2_latin2_in_refs.pl
+++ b/tta/perl/t/results/formats_encodings/char_latin2_latin2_in_refs.pl
@@ -35,6 +35,7 @@ $result_tree_text{'char_latin2_latin2_in_refs'} = 
'*document_root C6
  |isindex:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -51,6 +52,7 @@ $result_tree_text{'char_latin2_latin2_in_refs'} = 
'*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -127,6 +129,7 @@ $result_tree_text{'char_latin2_latin2_in_refs'} = 
'*document_root C6
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{_0104-_0105-_02db-_0118-_0119}
   *arguments_line C1
    *line_arg C1
@@ -142,8 +145,9 @@ $result_tree_text{'char_latin2_latin2_in_refs'} = 
'*document_root C6
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/formats_encodings/char_us_ascii_latin1_in_refs.pl 
b/tta/perl/t/results/formats_encodings/char_us_ascii_latin1_in_refs.pl
index 1e2421f101..d92914d801 100644
--- a/tta/perl/t/results/formats_encodings/char_us_ascii_latin1_in_refs.pl
+++ b/tta/perl/t/results/formats_encodings/char_us_ascii_latin1_in_refs.pl
@@ -35,6 +35,7 @@ $result_tree_text{'char_us_ascii_latin1_in_refs'} = 
'*document_root C14
  |isindex:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -51,6 +52,7 @@ $result_tree_text{'char_us_ascii_latin1_in_refs'} = 
'*document_root C14
  |associated_node:[E0]
  |section_childs:EC[E4|E6|E8|E10|E12]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -160,6 +162,7 @@ $result_tree_text{'char_us_ascii_latin1_in_refs'} = 
'*document_root C14
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  
|normalized:{_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc}
   *arguments_line C1
    *line_arg C1
@@ -175,8 +178,9 @@ $result_tree_text{'char_us_ascii_latin1_in_refs'} = 
'*document_root C14
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -195,6 +199,7 @@ $result_tree_text{'char_us_ascii_latin1_in_refs'} = 
'*document_root C14
  |is_target:{1}
  |menu_directions:D[next->E7|prev->E3|up->E0]
  |node_directions:D[next->E7|prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{_00e9}
   *arguments_line C1
    *line_arg C1
@@ -210,8 +215,9 @@ $result_tree_text{'char_us_ascii_latin1_in_refs'} = 
'*document_root C14
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[next->E8|prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E8|prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -230,6 +236,7 @@ $result_tree_text{'char_us_ascii_latin1_in_refs'} = 
'*document_root C14
  |is_target:{1}
  |menu_directions:D[next->E9|prev->E5|up->E0]
  |node_directions:D[next->E9|prev->E5|up->E0]
+ |node_number:{4}
  |normalized:{_00e0-_00e8-_00f9}
   *arguments_line C1
    *line_arg C1
@@ -245,8 +252,9 @@ $result_tree_text{'char_us_ascii_latin1_in_refs'} = 
'*document_root C14
  |associated_anchor_command:[E7]
  |associated_node:[E7]
  |section_directions:D[next->E10|prev->E6|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{4}
  |toplevel_directions:D[next->E10|prev->E6|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -265,6 +273,7 @@ $result_tree_text{'char_us_ascii_latin1_in_refs'} = 
'*document_root C14
  |is_target:{1}
  |menu_directions:D[next->E11|prev->E7|up->E0]
  |node_directions:D[next->E11|prev->E7|up->E0]
+ |node_number:{5}
  |normalized:{_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db}
   *arguments_line C1
    *line_arg C1
@@ -280,8 +289,9 @@ $result_tree_text{'char_us_ascii_latin1_in_refs'} = 
'*document_root C14
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[next->E12|prev->E8|up->E1]
+ |section_heading_number:{4}
  |section_level:{1}
- |section_number:{4}
+ |section_number:{5}
  |toplevel_directions:D[next->E12|prev->E8|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -300,6 +310,7 @@ $result_tree_text{'char_us_ascii_latin1_in_refs'} = 
'*document_root C14
  |is_target:{1}
  |menu_directions:D[prev->E9|up->E0]
  |node_directions:D[prev->E9|up->E0]
+ |node_number:{6}
  |normalized:{_00e7}
   *arguments_line C1
    *line_arg C1
@@ -315,8 +326,9 @@ $result_tree_text{'char_us_ascii_latin1_in_refs'} = 
'*document_root C14
  |associated_anchor_command:[E11]
  |associated_node:[E11]
  |section_directions:D[prev->E10|up->E1]
+ |section_heading_number:{5}
  |section_level:{1}
- |section_number:{5}
+ |section_number:{6}
  |toplevel_directions:D[prev->E10|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/formats_encodings/char_us_ascii_latin1_in_refs_no_translit_files.pl
 
b/tta/perl/t/results/formats_encodings/char_us_ascii_latin1_in_refs_no_translit_files.pl
index 73d5c8b6e2..66b9d3200a 100644
--- 
a/tta/perl/t/results/formats_encodings/char_us_ascii_latin1_in_refs_no_translit_files.pl
+++ 
b/tta/perl/t/results/formats_encodings/char_us_ascii_latin1_in_refs_no_translit_files.pl
@@ -35,6 +35,7 @@ 
$result_tree_text{'char_us_ascii_latin1_in_refs_no_translit_files'} = '*document
  |isindex:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -51,6 +52,7 @@ 
$result_tree_text{'char_us_ascii_latin1_in_refs_no_translit_files'} = '*document
  |associated_node:[E0]
  |section_childs:EC[E4|E6|E8|E10|E12]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -160,6 +162,7 @@ 
$result_tree_text{'char_us_ascii_latin1_in_refs_no_translit_files'} = '*document
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  
|normalized:{_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc}
   *arguments_line C1
    *line_arg C1
@@ -175,8 +178,9 @@ 
$result_tree_text{'char_us_ascii_latin1_in_refs_no_translit_files'} = '*document
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -195,6 +199,7 @@ 
$result_tree_text{'char_us_ascii_latin1_in_refs_no_translit_files'} = '*document
  |is_target:{1}
  |menu_directions:D[next->E7|prev->E3|up->E0]
  |node_directions:D[next->E7|prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{_00e9}
   *arguments_line C1
    *line_arg C1
@@ -210,8 +215,9 @@ 
$result_tree_text{'char_us_ascii_latin1_in_refs_no_translit_files'} = '*document
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[next->E8|prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E8|prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -230,6 +236,7 @@ 
$result_tree_text{'char_us_ascii_latin1_in_refs_no_translit_files'} = '*document
  |is_target:{1}
  |menu_directions:D[next->E9|prev->E5|up->E0]
  |node_directions:D[next->E9|prev->E5|up->E0]
+ |node_number:{4}
  |normalized:{_00e0-_00e8-_00f9}
   *arguments_line C1
    *line_arg C1
@@ -245,8 +252,9 @@ 
$result_tree_text{'char_us_ascii_latin1_in_refs_no_translit_files'} = '*document
  |associated_anchor_command:[E7]
  |associated_node:[E7]
  |section_directions:D[next->E10|prev->E6|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{4}
  |toplevel_directions:D[next->E10|prev->E6|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -265,6 +273,7 @@ 
$result_tree_text{'char_us_ascii_latin1_in_refs_no_translit_files'} = '*document
  |is_target:{1}
  |menu_directions:D[next->E11|prev->E7|up->E0]
  |node_directions:D[next->E11|prev->E7|up->E0]
+ |node_number:{5}
  |normalized:{_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db}
   *arguments_line C1
    *line_arg C1
@@ -280,8 +289,9 @@ 
$result_tree_text{'char_us_ascii_latin1_in_refs_no_translit_files'} = '*document
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[next->E12|prev->E8|up->E1]
+ |section_heading_number:{4}
  |section_level:{1}
- |section_number:{4}
+ |section_number:{5}
  |toplevel_directions:D[next->E12|prev->E8|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -300,6 +310,7 @@ 
$result_tree_text{'char_us_ascii_latin1_in_refs_no_translit_files'} = '*document
  |is_target:{1}
  |menu_directions:D[prev->E9|up->E0]
  |node_directions:D[prev->E9|up->E0]
+ |node_number:{6}
  |normalized:{_00e7}
   *arguments_line C1
    *line_arg C1
@@ -315,8 +326,9 @@ 
$result_tree_text{'char_us_ascii_latin1_in_refs_no_translit_files'} = '*document
  |associated_anchor_command:[E11]
  |associated_node:[E11]
  |section_directions:D[prev->E10|up->E1]
+ |section_heading_number:{5}
  |section_level:{1}
- |section_number:{5}
+ |section_number:{6}
  |toplevel_directions:D[prev->E10|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/formats_encodings/char_utf8_latin1_in_refs.pl 
b/tta/perl/t/results/formats_encodings/char_utf8_latin1_in_refs.pl
index 8248c424f0..4198f5e74b 100644
--- a/tta/perl/t/results/formats_encodings/char_utf8_latin1_in_refs.pl
+++ b/tta/perl/t/results/formats_encodings/char_utf8_latin1_in_refs.pl
@@ -35,6 +35,7 @@ $result_tree_text{'char_utf8_latin1_in_refs'} = 
'*document_root C14
  |isindex:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -51,6 +52,7 @@ $result_tree_text{'char_utf8_latin1_in_refs'} = 
'*document_root C14
  |associated_node:[E0]
  |section_childs:EC[E4|E6|E8|E10|E12]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -160,6 +162,7 @@ $result_tree_text{'char_utf8_latin1_in_refs'} = 
'*document_root C14
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  
|normalized:{_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc}
   *arguments_line C1
    *line_arg C1
@@ -175,8 +178,9 @@ $result_tree_text{'char_utf8_latin1_in_refs'} = 
'*document_root C14
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -195,6 +199,7 @@ $result_tree_text{'char_utf8_latin1_in_refs'} = 
'*document_root C14
  |is_target:{1}
  |menu_directions:D[next->E7|prev->E3|up->E0]
  |node_directions:D[next->E7|prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{_00e9}
   *arguments_line C1
    *line_arg C1
@@ -210,8 +215,9 @@ $result_tree_text{'char_utf8_latin1_in_refs'} = 
'*document_root C14
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[next->E8|prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E8|prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -230,6 +236,7 @@ $result_tree_text{'char_utf8_latin1_in_refs'} = 
'*document_root C14
  |is_target:{1}
  |menu_directions:D[next->E9|prev->E5|up->E0]
  |node_directions:D[next->E9|prev->E5|up->E0]
+ |node_number:{4}
  |normalized:{_00e0-_00e8-_00f9}
   *arguments_line C1
    *line_arg C1
@@ -245,8 +252,9 @@ $result_tree_text{'char_utf8_latin1_in_refs'} = 
'*document_root C14
  |associated_anchor_command:[E7]
  |associated_node:[E7]
  |section_directions:D[next->E10|prev->E6|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{4}
  |toplevel_directions:D[next->E10|prev->E6|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -265,6 +273,7 @@ $result_tree_text{'char_utf8_latin1_in_refs'} = 
'*document_root C14
  |is_target:{1}
  |menu_directions:D[next->E11|prev->E7|up->E0]
  |node_directions:D[next->E11|prev->E7|up->E0]
+ |node_number:{5}
  |normalized:{_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db}
   *arguments_line C1
    *line_arg C1
@@ -280,8 +289,9 @@ $result_tree_text{'char_utf8_latin1_in_refs'} = 
'*document_root C14
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[next->E12|prev->E8|up->E1]
+ |section_heading_number:{4}
  |section_level:{1}
- |section_number:{4}
+ |section_number:{5}
  |toplevel_directions:D[next->E12|prev->E8|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -300,6 +310,7 @@ $result_tree_text{'char_utf8_latin1_in_refs'} = 
'*document_root C14
  |is_target:{1}
  |menu_directions:D[prev->E9|up->E0]
  |node_directions:D[prev->E9|up->E0]
+ |node_number:{6}
  |normalized:{_00e7}
   *arguments_line C1
    *line_arg C1
@@ -315,8 +326,9 @@ $result_tree_text{'char_utf8_latin1_in_refs'} = 
'*document_root C14
  |associated_anchor_command:[E11]
  |associated_node:[E11]
  |section_directions:D[prev->E10|up->E1]
+ |section_heading_number:{5}
  |section_level:{1}
- |section_number:{5}
+ |section_number:{6}
  |toplevel_directions:D[prev->E10|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/formats_encodings/dotless_argument_non_ascii.pl 
b/tta/perl/t/results/formats_encodings/dotless_argument_non_ascii.pl
index b0933b39fa..c98df9909c 100644
--- a/tta/perl/t/results/formats_encodings/dotless_argument_non_ascii.pl
+++ b/tta/perl/t/results/formats_encodings/dotless_argument_non_ascii.pl
@@ -16,6 +16,7 @@ $result_tree_text{'dotless_argument_non_ascii'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'dotless_argument_non_ascii'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'dotless_argument_non_ascii'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'dotless_argument_non_ascii'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/formats_encodings/japanese_shift_jis.pl 
b/tta/perl/t/results/formats_encodings/japanese_shift_jis.pl
index 0df608e0cb..53578f3fb7 100644
--- a/tta/perl/t/results/formats_encodings/japanese_shift_jis.pl
+++ b/tta/perl/t/results/formats_encodings/japanese_shift_jis.pl
@@ -67,6 +67,7 @@ $result_tree_text{'japanese_shift_jis'} = '*document_root C8
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -83,6 +84,7 @@ $result_tree_text{'japanese_shift_jis'} = '*document_root C8
  |associated_node:[E0]
  |section_childs:EC[E4|E6]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -188,6 +190,7 @@ $result_tree_text{'japanese_shift_jis'} = '*document_root C8
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Preface}
   *arguments_line C1
    *line_arg C1
@@ -203,8 +206,9 @@ $result_tree_text{'japanese_shift_jis'} = '*document_root C8
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -227,6 +231,7 @@ $result_tree_text{'japanese_shift_jis'} = '*document_root C8
  |is_target:{1}
  |menu_directions:D[prev->E3|up->E0]
  |node_directions:D[prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{Introduction}
   *arguments_line C1
    *line_arg C1
@@ -242,8 +247,9 @@ $result_tree_text{'japanese_shift_jis'} = '*document_root C8
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/formats_encodings/manual_simple_latin1_with_error.pl 
b/tta/perl/t/results/formats_encodings/manual_simple_latin1_with_error.pl
index 988cf2fb99..acbf6a5cdf 100644
--- a/tta/perl/t/results/formats_encodings/manual_simple_latin1_with_error.pl
+++ b/tta/perl/t/results/formats_encodings/manual_simple_latin1_with_error.pl
@@ -33,6 +33,7 @@ $result_tree_text{'manual_simple_latin1_with_error'} = 
'*document_root C6
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -49,6 +50,7 @@ $result_tree_text{'manual_simple_latin1_with_error'} = 
'*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -68,6 +70,7 @@ $result_tree_text{'manual_simple_latin1_with_error'} = 
'*document_root C6
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{2}
  |normalized:{_00e9sseul_00e9}
   *arguments_line C1
    *line_arg C1
@@ -85,6 +88,7 @@ $result_tree_text{'manual_simple_latin1_with_error'} = 
'*document_root C6
  |associated_title_command:[E4]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{3}
  |normalized:{Chapitr_00e9}
   *arguments_line C1
    *line_arg C1
@@ -100,8 +104,9 @@ $result_tree_text{'manual_simple_latin1_with_error'} = 
'*document_root C6
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/formats_encodings/manual_simple_utf8_with_error.pl 
b/tta/perl/t/results/formats_encodings/manual_simple_utf8_with_error.pl
index c452ce5886..cf3afc4147 100644
--- a/tta/perl/t/results/formats_encodings/manual_simple_utf8_with_error.pl
+++ b/tta/perl/t/results/formats_encodings/manual_simple_utf8_with_error.pl
@@ -19,6 +19,7 @@ $result_tree_text{'manual_simple_utf8_with_error'} = 
'*document_root C6
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -35,6 +36,7 @@ $result_tree_text{'manual_simple_utf8_with_error'} = 
'*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'manual_simple_utf8_with_error'} = 
'*document_root C6
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{2}
  |normalized:{_00e9sseul_00e9}
   *arguments_line C1
    *line_arg C1
@@ -71,6 +74,7 @@ $result_tree_text{'manual_simple_utf8_with_error'} = 
'*document_root C6
  |associated_title_command:[E4]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{3}
  |normalized:{Chapitr_00e9}
   *arguments_line C1
    *line_arg C1
@@ -86,8 +90,9 @@ $result_tree_text{'manual_simple_utf8_with_error'} = 
'*document_root C6
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/formats_encodings/multiple_include_encodings.pl 
b/tta/perl/t/results/formats_encodings/multiple_include_encodings.pl
index ff20324342..97af541f24 100644
--- a/tta/perl/t/results/formats_encodings/multiple_include_encodings.pl
+++ b/tta/perl/t/results/formats_encodings/multiple_include_encodings.pl
@@ -115,6 +115,7 @@ $result_tree_text{'multiple_include_encodings'} = 
'*document_root C19
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -131,6 +132,7 @@ $result_tree_text{'multiple_include_encodings'} = 
'*document_root C19
  |associated_node:[E0]
  |section_childs:EC[E3|E5|E7|E9|E14|E16]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -171,6 +173,7 @@ $result_tree_text{'multiple_include_encodings'} = 
'*document_root C19
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4|prev->E0|up->E0]
+ |node_number:{2}
  
|normalized:{_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc}
   *arguments_line C1
    *line_arg C1
@@ -186,8 +189,9 @@ $result_tree_text{'multiple_include_encodings'} = 
'*document_root C19
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -245,6 +249,7 @@ $result_tree_text{'multiple_include_encodings'} = 
'*document_root C19
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[next->E6|prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{Preface}
   *arguments_line C1
    *line_arg C1
@@ -260,8 +265,9 @@ $result_tree_text{'multiple_include_encodings'} = 
'*document_root C19
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[next->E7|prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E7|prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -286,6 +292,7 @@ $result_tree_text{'multiple_include_encodings'} = 
'*document_root C19
  |associated_title_command:[E7]
  |is_target:{1}
  |node_directions:D[next->E8|prev->E4|up->E0]
+ |node_number:{4}
  |normalized:{Introduction}
   *arguments_line C1
    *line_arg C1
@@ -301,8 +308,9 @@ $result_tree_text{'multiple_include_encodings'} = 
'*document_root C19
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[next->E9|prev->E5|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{4}
  |toplevel_directions:D[next->E9|prev->E5|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -355,6 +363,7 @@ $result_tree_text{'multiple_include_encodings'} = 
'*document_root C19
  |isindex:{1}
  |menus:EC[E10]
  |node_directions:D[next->E13|prev->E6|up->E0]
+ |node_number:{5}
  |normalized:{char-latin2-latin2}
   *arguments_line C1
    *line_arg C1
@@ -371,8 +380,9 @@ $result_tree_text{'multiple_include_encodings'} = 
'*document_root C19
  |associated_node:[E8]
  |section_childs:EC[E12]
  |section_directions:D[next->E14|prev->E7|up->E1]
+ |section_heading_number:{4}
  |section_level:{1}
- |section_number:{4}
+ |section_number:{5}
  |toplevel_directions:D[next->E14|prev->E7|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -444,6 +454,7 @@ $result_tree_text{'multiple_include_encodings'} = 
'*document_root C19
  |is_target:{1}
  |menu_directions:D[up->E8]
  |node_directions:D[up->E8]
+ |node_number:{6}
  |normalized:{_0104-_0105-_02db-_0118-_0119}
   *arguments_line C1
    *line_arg C1
@@ -459,8 +470,9 @@ $result_tree_text{'multiple_include_encodings'} = 
'*document_root C19
  |associated_anchor_command:[E11]
  |associated_node:[E11]
  |section_directions:D[up->E9]
+ |section_heading_number:{4.1}
  |section_level:{2}
- |section_number:{4.1}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -521,6 +533,7 @@ $result_tree_text{'multiple_include_encodings'} = 
'*document_root C19
  |associated_title_command:[E14]
  |is_target:{1}
  |node_directions:D[next->E15|prev->E8|up->E0]
+ |node_number:{7}
  |normalized:{Mixed-english-and-chinese-EUC_002dCN}
   *arguments_line C1
    *line_arg C1
@@ -536,8 +549,9 @@ $result_tree_text{'multiple_include_encodings'} = 
'*document_root C19
  |associated_anchor_command:[E13]
  |associated_node:[E13]
  |section_directions:D[next->E16|prev->E9|up->E1]
+ |section_heading_number:{5}
  |section_level:{1}
- |section_number:{5}
+ |section_number:{7}
  |toplevel_directions:D[next->E16|prev->E9|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -625,6 +639,7 @@ $result_tree_text{'multiple_include_encodings'} = 
'*document_root C19
  |associated_title_command:[E16]
  |is_target:{1}
  |node_directions:D[prev->E13|up->E0]
+ |node_number:{8}
  |normalized:{Mixed-chinese-and-english-utf_002d8}
   *arguments_line C1
    *line_arg C1
@@ -640,8 +655,9 @@ $result_tree_text{'multiple_include_encodings'} = 
'*document_root C19
  |associated_anchor_command:[E15]
  |associated_node:[E15]
  |section_directions:D[prev->E14|up->E1]
+ |section_heading_number:{6}
  |section_level:{1}
- |section_number:{6}
+ |section_number:{8}
  |toplevel_directions:D[prev->E14|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/formats_encodings/sample_utf8.pl 
b/tta/perl/t/results/formats_encodings/sample_utf8.pl
index c6cdf30c82..ab39ada1a2 100644
--- a/tta/perl/t/results/formats_encodings/sample_utf8.pl
+++ b/tta/perl/t/results/formats_encodings/sample_utf8.pl
@@ -134,6 +134,7 @@ $result_tree_text{'sample_utf8'} = '*document_root C10
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -150,6 +151,7 @@ $result_tree_text{'sample_utf8'} = '*document_root C10
  |associated_node:[E0]
  |section_childs:EC[E4|E6|E8]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -244,6 +246,7 @@ $result_tree_text{'sample_utf8'} = '*document_root C10
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{_7b2c_4e00_7ae0_ff08First-Chapter_ff09}
   *arguments_line C1
    *line_arg C1
@@ -259,8 +262,9 @@ $result_tree_text{'sample_utf8'} = '*document_root C10
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -373,6 +377,7 @@ $result_tree_text{'sample_utf8'} = '*document_root C10
  |is_target:{1}
  |menu_directions:D[next->E7|prev->E3|up->E0]
  |node_directions:D[next->E7|prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{Second-Chapter-AE-_0104_0118-ae-_0105_0119}
   *arguments_line C1
    *line_arg C1
@@ -388,8 +393,9 @@ $result_tree_text{'sample_utf8'} = '*document_root C10
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[next->E8|prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E8|prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -412,6 +418,7 @@ $result_tree_text{'sample_utf8'} = '*document_root C10
  |isindex:{1}
  |menu_directions:D[prev->E5|up->E0]
  |node_directions:D[prev->E5|up->E0]
+ |node_number:{4}
  |normalized:{Index-node}
   *arguments_line C1
    *line_arg C1
@@ -428,6 +435,7 @@ $result_tree_text{'sample_utf8'} = '*document_root C10
  |associated_node:[E7]
  |section_directions:D[prev->E6|up->E1]
  |section_level:{1}
+ |section_number:{4}
  |toplevel_directions:D[prev->E6|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/formats_encodings/verb_delimiter_not_ascii.pl 
b/tta/perl/t/results/formats_encodings/verb_delimiter_not_ascii.pl
index 7e898ea6ed..cc478fdf87 100644
--- a/tta/perl/t/results/formats_encodings/verb_delimiter_not_ascii.pl
+++ b/tta/perl/t/results/formats_encodings/verb_delimiter_not_ascii.pl
@@ -16,6 +16,7 @@ $result_tree_text{'verb_delimiter_not_ascii'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'verb_delimiter_not_ascii'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'verb_delimiter_not_ascii'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'verb_delimiter_not_ascii'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/formats_encodings/weird_accents.pl 
b/tta/perl/t/results/formats_encodings/weird_accents.pl
index 811cc586d4..740c56552a 100644
--- a/tta/perl/t/results/formats_encodings/weird_accents.pl
+++ b/tta/perl/t/results/formats_encodings/weird_accents.pl
@@ -30,6 +30,7 @@ $result_tree_text{'weird_accents'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -46,6 +47,7 @@ $result_tree_text{'weird_accents'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -68,6 +70,7 @@ $result_tree_text{'weird_accents'} = '*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -83,8 +86,9 @@ $result_tree_text{'weird_accents'} = '*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/formats_encodings/weird_accents_disable_encoding.pl 
b/tta/perl/t/results/formats_encodings/weird_accents_disable_encoding.pl
index df87efcb8f..614d3f5781 100644
--- a/tta/perl/t/results/formats_encodings/weird_accents_disable_encoding.pl
+++ b/tta/perl/t/results/formats_encodings/weird_accents_disable_encoding.pl
@@ -30,6 +30,7 @@ $result_tree_text{'weird_accents_disable_encoding'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -46,6 +47,7 @@ $result_tree_text{'weird_accents_disable_encoding'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -68,6 +70,7 @@ $result_tree_text{'weird_accents_disable_encoding'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -83,8 +86,9 @@ $result_tree_text{'weird_accents_disable_encoding'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/heading/heading_in_copying.pl 
b/tta/perl/t/results/heading/heading_in_copying.pl
index f447bde320..73afc3b8f0 100644
--- a/tta/perl/t/results/heading/heading_in_copying.pl
+++ b/tta/perl/t/results/heading/heading_in_copying.pl
@@ -19,6 +19,7 @@ $result_tree_text{'heading_in_copying'} = '*document_root C3
     |{ }
    |EXTRA
    |global_command_number:{1}
+   |heading_number:{1}
     *line_arg C4
     |INFO
     |spaces_after_argument:
@@ -49,6 +50,7 @@ $result_tree_text{'heading_in_copying'} = '*document_root C3
     |{ }
    |EXTRA
    |global_command_number:{1}
+   |heading_number:{2}
     *line_arg C4
     |INFO
     |spaces_after_argument:
@@ -78,6 +80,7 @@ $result_tree_text{'heading_in_copying'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -92,6 +95,7 @@ $result_tree_text{'heading_in_copying'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E2]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/heading/heading_in_example.pl 
b/tta/perl/t/results/heading/heading_in_example.pl
index ddb4ba09f6..46951fd88f 100644
--- a/tta/perl/t/results/heading/heading_in_example.pl
+++ b/tta/perl/t/results/heading/heading_in_example.pl
@@ -18,6 +18,7 @@ $result_tree_text{'heading_in_example'} = '*document_root C1
     |{ }
    |EXTRA
    |global_command_number:{1}
+   |heading_number:{1}
     *line_arg C4
     |INFO
     |spaces_after_argument:
diff --git a/tta/perl/t/results/heading/heading_in_quotation.pl 
b/tta/perl/t/results/heading/heading_in_quotation.pl
index 56d33db7a8..f8684c7e92 100644
--- a/tta/perl/t/results/heading/heading_in_quotation.pl
+++ b/tta/perl/t/results/heading/heading_in_quotation.pl
@@ -19,6 +19,7 @@ $result_tree_text{'heading_in_quotation'} = '*document_root C1
     |{ }
    |EXTRA
    |global_command_number:{1}
+   |heading_number:{1}
     *line_arg C4
     |INFO
     |spaces_after_argument:
diff --git a/tta/perl/t/results/html_tests/U_in_index.pl 
b/tta/perl/t/results/html_tests/U_in_index.pl
index 00de5dc47a..347e70cfd0 100644
--- a/tta/perl/t/results/html_tests/U_in_index.pl
+++ b/tta/perl/t/results/html_tests/U_in_index.pl
@@ -15,6 +15,7 @@ $result_tree_text{'U_in_index'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'U_in_index'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'U_in_index'} = '*document_root C5
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'U_in_index'} = '*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/acronym_in_node_and_section.pl 
b/tta/perl/t/results/html_tests/acronym_in_node_and_section.pl
index 12b174e830..24f631fba1 100644
--- a/tta/perl/t/results/html_tests/acronym_in_node_and_section.pl
+++ b/tta/perl/t/results/html_tests/acronym_in_node_and_section.pl
@@ -15,6 +15,7 @@ $result_tree_text{'acronym_in_node_and_section'} = 
'*document_root C9
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'acronym_in_node_and_section'} = 
'*document_root C9
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -53,6 +55,7 @@ $result_tree_text{'acronym_in_node_and_section'} = 
'*document_root C9
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'acronym_in_node_and_section'} = 
'*document_root C9
  |associated_node:[E2]
  |section_childs:EC[E5|E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -88,6 +92,7 @@ $result_tree_text{'acronym_in_node_and_section'} = 
'*document_root C9
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[next->E6|up->E2]
+ |node_number:{3}
  |normalized:{sec-define}
   *arguments_line C1
    *line_arg C1
@@ -103,8 +108,9 @@ $result_tree_text{'acronym_in_node_and_section'} = 
'*document_root C9
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[next->E7|up->E3]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -132,6 +138,7 @@ $result_tree_text{'acronym_in_node_and_section'} = 
'*document_root C9
  |associated_title_command:[E7]
  |is_target:{1}
  |node_directions:D[prev->E4|up->E2]
+ |node_number:{4}
  |normalized:{sec-here-is-GHJ}
   *arguments_line C1
    *line_arg C2
@@ -150,8 +157,9 @@ $result_tree_text{'acronym_in_node_and_section'} = 
'*document_root C9
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[prev->E5|up->E3]
+ |section_heading_number:{1.2}
  |section_level:{2}
- |section_number:{1.2}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C2
    |INFO
diff --git 
a/tta/perl/t/results/html_tests/anchor_in_menu_on_sectioning_command_line.pl 
b/tta/perl/t/results/html_tests/anchor_in_menu_on_sectioning_command_line.pl
index 9a81920a0a..55167fb7b5 100644
--- a/tta/perl/t/results/html_tests/anchor_in_menu_on_sectioning_command_line.pl
+++ b/tta/perl/t/results/html_tests/anchor_in_menu_on_sectioning_command_line.pl
@@ -15,6 +15,7 @@ 
$result_tree_text{'anchor_in_menu_on_sectioning_command_line'} = '*document_root
  |associated_title_command:[E1]
  |is_target:{1}
  |menus:EC[E3]
+ |node_number:{1}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -29,6 +30,7 @@ 
$result_tree_text{'anchor_in_menu_on_sectioning_command_line'} = '*document_root
  |EXTRA
  |associated_anchor_command:[E0]
  |associated_node:[E0]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
diff --git a/tta/perl/t/results/html_tests/anchor_on_vtable_item.pl 
b/tta/perl/t/results/html_tests/anchor_on_vtable_item.pl
index f468f8e2a2..196671453c 100644
--- a/tta/perl/t/results/html_tests/anchor_on_vtable_item.pl
+++ b/tta/perl/t/results/html_tests/anchor_on_vtable_item.pl
@@ -15,6 +15,7 @@ $result_tree_text{'anchor_on_vtable_item'} = '*document_root 
C7
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'anchor_on_vtable_item'} = '*document_root 
C7
  |associated_node:[E0]
  |section_childs:EC[E3|E7]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -53,6 +55,7 @@ $result_tree_text{'anchor_on_vtable_item'} = '*document_root 
C7
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E6|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -68,8 +71,9 @@ $result_tree_text{'anchor_on_vtable_item'} = '*document_root 
C7
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E7|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E7|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -177,6 +181,7 @@ $result_tree_text{'anchor_on_vtable_item'} = 
'*document_root C7
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{Idx}
   *arguments_line C1
    *line_arg C1
@@ -192,8 +197,9 @@ $result_tree_text{'anchor_on_vtable_item'} = 
'*document_root C7
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/automatic_menus.pl 
b/tta/perl/t/results/html_tests/automatic_menus.pl
index b56f0a9954..ecd13a4a48 100644
--- a/tta/perl/t/results/html_tests/automatic_menus.pl
+++ b/tta/perl/t/results/html_tests/automatic_menus.pl
@@ -15,6 +15,7 @@ $result_tree_text{'automatic_menus'} = '*document_root C9
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'automatic_menus'} = '*document_root C9
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'automatic_menus'} = '*document_root C9
  |is_target:{1}
  |node_description:[E4]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -70,8 +73,9 @@ $result_tree_text{'automatic_menus'} = '*document_root C9
  |associated_node:[E2]
  |section_childs:EC[E6|E9]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -101,6 +105,7 @@ $result_tree_text{'automatic_menus'} = '*document_root C9
  |is_target:{1}
  |node_description:[E7]
  |node_directions:D[next->E8|up->E2]
+ |node_number:{3}
  |normalized:{sec}
   *arguments_line C1
    *line_arg C1
@@ -116,8 +121,9 @@ $result_tree_text{'automatic_menus'} = '*document_root C9
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[next->E9|up->E3]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -145,6 +151,7 @@ $result_tree_text{'automatic_menus'} = '*document_root C9
  |associated_title_command:[E9]
  |is_target:{1}
  |node_directions:D[prev->E5|up->E2]
+ |node_number:{4}
  |normalized:{sec-after}
   *arguments_line C1
    *line_arg C1
@@ -160,8 +167,9 @@ $result_tree_text{'automatic_menus'} = '*document_root C9
  |associated_anchor_command:[E8]
  |associated_node:[E8]
  |section_directions:D[prev->E6|up->E3]
+ |section_heading_number:{1.2}
  |section_level:{2}
- |section_number:{1.2}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git 
a/tta/perl/t/results/html_tests/automatic_menus_format_menu_no_detailmenu.pl 
b/tta/perl/t/results/html_tests/automatic_menus_format_menu_no_detailmenu.pl
index 6a39d73062..ad9cf724b5 100644
--- a/tta/perl/t/results/html_tests/automatic_menus_format_menu_no_detailmenu.pl
+++ b/tta/perl/t/results/html_tests/automatic_menus_format_menu_no_detailmenu.pl
@@ -15,6 +15,7 @@ 
$result_tree_text{'automatic_menus_format_menu_no_detailmenu'} = '*document_root
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ 
$result_tree_text{'automatic_menus_format_menu_no_detailmenu'} = '*document_root
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ 
$result_tree_text{'automatic_menus_format_menu_no_detailmenu'} = '*document_root
  |is_target:{1}
  |node_description:[E4]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -70,8 +73,9 @@ 
$result_tree_text{'automatic_menus_format_menu_no_detailmenu'} = '*document_root
  |associated_node:[E2]
  |section_childs:EC[E6|E9]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -101,6 +105,7 @@ 
$result_tree_text{'automatic_menus_format_menu_no_detailmenu'} = '*document_root
  |is_target:{1}
  |node_description:[E7]
  |node_directions:D[next->E8|up->E2]
+ |node_number:{3}
  |normalized:{sec}
   *arguments_line C1
    *line_arg C1
@@ -116,8 +121,9 @@ 
$result_tree_text{'automatic_menus_format_menu_no_detailmenu'} = '*document_root
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[next->E9|up->E3]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -145,6 +151,7 @@ 
$result_tree_text{'automatic_menus_format_menu_no_detailmenu'} = '*document_root
  |associated_title_command:[E9]
  |is_target:{1}
  |node_directions:D[prev->E5|up->E2]
+ |node_number:{4}
  |normalized:{sec-after}
   *arguments_line C1
    *line_arg C1
@@ -160,8 +167,9 @@ 
$result_tree_text{'automatic_menus_format_menu_no_detailmenu'} = '*document_root
  |associated_anchor_command:[E8]
  |associated_node:[E8]
  |section_directions:D[prev->E6|up->E3]
+ |section_heading_number:{1.2}
  |section_level:{2}
- |section_number:{1.2}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/html_tests/base_for_css_info_in_init_test.pl 
b/tta/perl/t/results/html_tests/base_for_css_info_in_init_test.pl
index d0fdf3d301..8d36c33595 100644
--- a/tta/perl/t/results/html_tests/base_for_css_info_in_init_test.pl
+++ b/tta/perl/t/results/html_tests/base_for_css_info_in_init_test.pl
@@ -15,6 +15,7 @@ $result_tree_text{'base_for_css_info_in_init_test'} = 
'*document_root C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -30,6 +31,7 @@ $result_tree_text{'base_for_css_info_in_init_test'} = 
'*document_root C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/html_tests/character_number_leading_toc_stoc.pl 
b/tta/perl/t/results/html_tests/character_number_leading_toc_stoc.pl
index b2a6f26dd4..266358c46e 100644
--- a/tta/perl/t/results/html_tests/character_number_leading_toc_stoc.pl
+++ b/tta/perl/t/results/html_tests/character_number_leading_toc_stoc.pl
@@ -13,6 +13,7 @@ $result_tree_text{'character_number_leading_toc_stoc'} = 
'*document_root C5
  |EXTRA
  |section_childs:EC[E1|E2]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -31,8 +32,9 @@ $result_tree_text{'character_number_leading_toc_stoc'} = 
'*document_root C5
   |{ }
  |EXTRA
  |section_directions:D[next->E2|up->E0]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E2|prev->E0|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -48,6 +50,7 @@ $result_tree_text{'character_number_leading_toc_stoc'} = 
'*document_root C5
  |section_childs:EC[E3]
  |section_directions:D[prev->E1|up->E0]
  |section_level:{1}
+ |section_number:{3}
  |toplevel_directions:D[prev->E1|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -62,6 +65,7 @@ $result_tree_text{'character_number_leading_toc_stoc'} = 
'*document_root C5
  |EXTRA
  |section_directions:D[up->E2]
  |section_level:{2}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/html_tests/check_htmlxref.pl 
b/tta/perl/t/results/html_tests/check_htmlxref.pl
index ffe44e40ea..0c40c5dd26 100644
--- a/tta/perl/t/results/html_tests/check_htmlxref.pl
+++ b/tta/perl/t/results/html_tests/check_htmlxref.pl
@@ -17,6 +17,7 @@ $result_tree_text{'check_htmlxref'} = '*document_root C6
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->MISSING: (line_arg)[C3]|prev->E3|up->MISSING: 
(line_arg)[C3]]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C4
    *line_arg C1
@@ -58,6 +59,7 @@ $result_tree_text{'check_htmlxref'} = '*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -175,6 +177,7 @@ $result_tree_text{'check_htmlxref'} = '*document_root C6
  |is_target:{1}
  |menu_directions:D[next->MISSING: (menu_entry_node)[C3]|up->E0]
  |node_directions:D[next->MISSING: (line_arg)[C3]]
+ |node_number:{2}
  |normalized:{first}
   *arguments_line C2
    *line_arg C1
@@ -201,6 +204,7 @@ $result_tree_text{'check_htmlxref'} = '*document_root C6
  |is_target:{1}
  |menu_directions:D[prev->MISSING: (menu_entry_node)[C3]|up->E0]
  |node_directions:D[next->MISSING: (line_arg)[C3]|prev->MISSING: 
(line_arg)[C4]]
+ |node_number:{3}
  |normalized:{chapter}
   *arguments_line C3
    *line_arg C1
@@ -236,8 +240,9 @@ $result_tree_text{'check_htmlxref'} = '*document_root C6
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/check_htmlxref_ignore_ref_top_up.pl 
b/tta/perl/t/results/html_tests/check_htmlxref_ignore_ref_top_up.pl
index c1983139ff..636730b582 100644
--- a/tta/perl/t/results/html_tests/check_htmlxref_ignore_ref_top_up.pl
+++ b/tta/perl/t/results/html_tests/check_htmlxref_ignore_ref_top_up.pl
@@ -17,6 +17,7 @@ $result_tree_text{'check_htmlxref_ignore_ref_top_up'} = 
'*document_root C6
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->MISSING: (line_arg)[C3]|prev->E3|up->MISSING: 
(line_arg)[C3]]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C4
    *line_arg C1
@@ -58,6 +59,7 @@ $result_tree_text{'check_htmlxref_ignore_ref_top_up'} = 
'*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -175,6 +177,7 @@ $result_tree_text{'check_htmlxref_ignore_ref_top_up'} = 
'*document_root C6
  |is_target:{1}
  |menu_directions:D[next->MISSING: (menu_entry_node)[C3]|up->E0]
  |node_directions:D[next->MISSING: (line_arg)[C3]]
+ |node_number:{2}
  |normalized:{first}
   *arguments_line C2
    *line_arg C1
@@ -201,6 +204,7 @@ $result_tree_text{'check_htmlxref_ignore_ref_top_up'} = 
'*document_root C6
  |is_target:{1}
  |menu_directions:D[prev->MISSING: (menu_entry_node)[C3]|up->E0]
  |node_directions:D[next->MISSING: (line_arg)[C3]|prev->MISSING: 
(line_arg)[C4]]
+ |node_number:{3}
  |normalized:{chapter}
   *arguments_line C3
    *line_arg C1
@@ -236,8 +240,9 @@ $result_tree_text{'check_htmlxref_ignore_ref_top_up'} = 
'*document_root C6
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/check_htmlxref_menu.pl 
b/tta/perl/t/results/html_tests/check_htmlxref_menu.pl
index bd99bceea7..21f0475552 100644
--- a/tta/perl/t/results/html_tests/check_htmlxref_menu.pl
+++ b/tta/perl/t/results/html_tests/check_htmlxref_menu.pl
@@ -19,6 +19,7 @@ $result_tree_text{'check_htmlxref_menu'} = '*document_root C6
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->MISSING: (line_arg)[C3]|prev->E3|up->MISSING: 
(line_arg)[C3]]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C4
    *line_arg C1
@@ -60,6 +61,7 @@ $result_tree_text{'check_htmlxref_menu'} = '*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -177,6 +179,7 @@ $result_tree_text{'check_htmlxref_menu'} = '*document_root 
C6
  |is_target:{1}
  |menu_directions:D[next->MISSING: (menu_entry_node)[C3]|up->E0]
  |node_directions:D[next->MISSING: (line_arg)[C3]]
+ |node_number:{2}
  |normalized:{first}
   *arguments_line C2
    *line_arg C1
@@ -203,6 +206,7 @@ $result_tree_text{'check_htmlxref_menu'} = '*document_root 
C6
  |is_target:{1}
  |menu_directions:D[prev->MISSING: (menu_entry_node)[C3]|up->E0]
  |node_directions:D[next->MISSING: (line_arg)[C3]|prev->MISSING: 
(line_arg)[C4]]
+ |node_number:{3}
  |normalized:{chapter}
   *arguments_line C3
    *line_arg C1
@@ -238,8 +242,9 @@ $result_tree_text{'check_htmlxref_menu'} = '*document_root 
C6
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/check_htmlxref_no_use_nodes.pl 
b/tta/perl/t/results/html_tests/check_htmlxref_no_use_nodes.pl
index 8ad323bb23..37712e65d0 100644
--- a/tta/perl/t/results/html_tests/check_htmlxref_no_use_nodes.pl
+++ b/tta/perl/t/results/html_tests/check_htmlxref_no_use_nodes.pl
@@ -19,6 +19,7 @@ $result_tree_text{'check_htmlxref_no_use_nodes'} = 
'*document_root C6
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->MISSING: (line_arg)[C3]|prev->E3|up->MISSING: 
(line_arg)[C3]]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C4
    *line_arg C1
@@ -60,6 +61,7 @@ $result_tree_text{'check_htmlxref_no_use_nodes'} = 
'*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -177,6 +179,7 @@ $result_tree_text{'check_htmlxref_no_use_nodes'} = 
'*document_root C6
  |is_target:{1}
  |menu_directions:D[next->MISSING: (menu_entry_node)[C3]|up->E0]
  |node_directions:D[next->MISSING: (line_arg)[C3]]
+ |node_number:{2}
  |normalized:{first}
   *arguments_line C2
    *line_arg C1
@@ -203,6 +206,7 @@ $result_tree_text{'check_htmlxref_no_use_nodes'} = 
'*document_root C6
  |is_target:{1}
  |menu_directions:D[prev->MISSING: (menu_entry_node)[C3]|up->E0]
  |node_directions:D[next->MISSING: (line_arg)[C3]|prev->MISSING: 
(line_arg)[C4]]
+ |node_number:{3}
  |normalized:{chapter}
   *arguments_line C3
    *line_arg C1
@@ -238,8 +242,9 @@ $result_tree_text{'check_htmlxref_no_use_nodes'} = 
'*document_root C6
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/command_in_node_redirection.pl 
b/tta/perl/t/results/html_tests/command_in_node_redirection.pl
index a54efeeaca..70d1983cc5 100644
--- a/tta/perl/t/results/html_tests/command_in_node_redirection.pl
+++ b/tta/perl/t/results/html_tests/command_in_node_redirection.pl
@@ -15,6 +15,7 @@ $result_tree_text{'command_in_node_redirection'} = 
'*document_root C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -30,6 +31,7 @@ $result_tree_text{'command_in_node_redirection'} = 
'*document_root C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git 
a/tta/perl/t/results/html_tests/command_in_node_redirection_multiple.pl 
b/tta/perl/t/results/html_tests/command_in_node_redirection_multiple.pl
index b4f30903a5..e5e9176c7a 100644
--- a/tta/perl/t/results/html_tests/command_in_node_redirection_multiple.pl
+++ b/tta/perl/t/results/html_tests/command_in_node_redirection_multiple.pl
@@ -15,6 +15,7 @@ $result_tree_text{'command_in_node_redirection_multiple'} = 
'*document_root C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -30,6 +31,7 @@ $result_tree_text{'command_in_node_redirection_multiple'} = 
'*document_root C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git 
a/tta/perl/t/results/html_tests/command_in_node_redirection_other_command.pl 
b/tta/perl/t/results/html_tests/command_in_node_redirection_other_command.pl
index 3bb71dfb65..ae0f539b9c 100644
--- a/tta/perl/t/results/html_tests/command_in_node_redirection_other_command.pl
+++ b/tta/perl/t/results/html_tests/command_in_node_redirection_other_command.pl
@@ -15,6 +15,7 @@ 
$result_tree_text{'command_in_node_redirection_other_command'} = '*document_root
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -30,6 +31,7 @@ 
$result_tree_text{'command_in_node_redirection_other_command'} = '*document_root
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git 
a/tta/perl/t/results/html_tests/command_in_node_redirection_same_command.pl 
b/tta/perl/t/results/html_tests/command_in_node_redirection_same_command.pl
index f37d9ca857..4d4d0f6a1a 100644
--- a/tta/perl/t/results/html_tests/command_in_node_redirection_same_command.pl
+++ b/tta/perl/t/results/html_tests/command_in_node_redirection_same_command.pl
@@ -15,6 +15,7 @@ $result_tree_text{'command_in_node_redirection_same_command'} 
= '*document_root
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -30,6 +31,7 @@ $result_tree_text{'command_in_node_redirection_same_command'} 
= '*document_root
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git 
a/tta/perl/t/results/html_tests/command_in_node_redirection_two_commands.pl 
b/tta/perl/t/results/html_tests/command_in_node_redirection_two_commands.pl
index 80ed57c64f..e0389ae17c 100644
--- a/tta/perl/t/results/html_tests/command_in_node_redirection_two_commands.pl
+++ b/tta/perl/t/results/html_tests/command_in_node_redirection_two_commands.pl
@@ -15,6 +15,7 @@ $result_tree_text{'command_in_node_redirection_two_commands'} 
= '*document_root
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -30,6 +31,7 @@ $result_tree_text{'command_in_node_redirection_two_commands'} 
= '*document_root
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/html_tests/contents_at_end.pl 
b/tta/perl/t/results/html_tests/contents_at_end.pl
index 0e4330ca24..d344eb533c 100644
--- a/tta/perl/t/results/html_tests/contents_at_end.pl
+++ b/tta/perl/t/results/html_tests/contents_at_end.pl
@@ -20,6 +20,7 @@ $result_tree_text{'contents_at_end'} = '*document_root C6
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'contents_at_end'} = '*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -91,6 +93,7 @@ $result_tree_text{'contents_at_end'} = '*document_root C6
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -106,8 +109,9 @@ $result_tree_text{'contents_at_end'} = '*document_root C6
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/contents_at_end_inline.pl 
b/tta/perl/t/results/html_tests/contents_at_end_inline.pl
index 3b1854a12e..b7343b28be 100644
--- a/tta/perl/t/results/html_tests/contents_at_end_inline.pl
+++ b/tta/perl/t/results/html_tests/contents_at_end_inline.pl
@@ -20,6 +20,7 @@ $result_tree_text{'contents_at_end_inline'} = '*document_root 
C6
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'contents_at_end_inline'} = '*document_root 
C6
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -91,6 +93,7 @@ $result_tree_text{'contents_at_end_inline'} = '*document_root 
C6
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -106,8 +109,9 @@ $result_tree_text{'contents_at_end_inline'} = 
'*document_root C6
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/contents_at_end_separate_element.pl 
b/tta/perl/t/results/html_tests/contents_at_end_separate_element.pl
index fff33c018e..64f44f5d6a 100644
--- a/tta/perl/t/results/html_tests/contents_at_end_separate_element.pl
+++ b/tta/perl/t/results/html_tests/contents_at_end_separate_element.pl
@@ -20,6 +20,7 @@ $result_tree_text{'contents_at_end_separate_element'} = 
'*document_root C6
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'contents_at_end_separate_element'} = 
'*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -91,6 +93,7 @@ $result_tree_text{'contents_at_end_separate_element'} = 
'*document_root C6
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -106,8 +109,9 @@ $result_tree_text{'contents_at_end_separate_element'} = 
'*document_root C6
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/contents_in_middle_chapter.pl 
b/tta/perl/t/results/html_tests/contents_in_middle_chapter.pl
index ac99ddfc62..d8bbacf36d 100644
--- a/tta/perl/t/results/html_tests/contents_in_middle_chapter.pl
+++ b/tta/perl/t/results/html_tests/contents_in_middle_chapter.pl
@@ -20,6 +20,7 @@ $result_tree_text{'contents_in_middle_chapter'} = 
'*document_root C8
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'contents_in_middle_chapter'} = 
'*document_root C8
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -92,6 +94,7 @@ $result_tree_text{'contents_in_middle_chapter'} = 
'*document_root C8
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -108,8 +111,9 @@ $result_tree_text{'contents_in_middle_chapter'} = 
'*document_root C8
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -164,6 +168,7 @@ $result_tree_text{'contents_in_middle_chapter'} = 
'*document_root C8
  |is_target:{1}
  |menu_directions:D[up->E3]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -179,8 +184,9 @@ $result_tree_text{'contents_in_middle_chapter'} = 
'*document_root C8
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/html_tests/contents_in_middle_chapter_inline.pl 
b/tta/perl/t/results/html_tests/contents_in_middle_chapter_inline.pl
index 2812c9d6d4..995ff1f1bb 100644
--- a/tta/perl/t/results/html_tests/contents_in_middle_chapter_inline.pl
+++ b/tta/perl/t/results/html_tests/contents_in_middle_chapter_inline.pl
@@ -20,6 +20,7 @@ $result_tree_text{'contents_in_middle_chapter_inline'} = 
'*document_root C8
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'contents_in_middle_chapter_inline'} = 
'*document_root C8
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -92,6 +94,7 @@ $result_tree_text{'contents_in_middle_chapter_inline'} = 
'*document_root C8
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -108,8 +111,9 @@ $result_tree_text{'contents_in_middle_chapter_inline'} = 
'*document_root C8
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -164,6 +168,7 @@ $result_tree_text{'contents_in_middle_chapter_inline'} = 
'*document_root C8
  |is_target:{1}
  |menu_directions:D[up->E3]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -179,8 +184,9 @@ $result_tree_text{'contents_in_middle_chapter_inline'} = 
'*document_root C8
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git 
a/tta/perl/t/results/html_tests/contents_in_middle_chapter_separate_element.pl 
b/tta/perl/t/results/html_tests/contents_in_middle_chapter_separate_element.pl
index ca4f5c6d33..c8b9baf122 100644
--- 
a/tta/perl/t/results/html_tests/contents_in_middle_chapter_separate_element.pl
+++ 
b/tta/perl/t/results/html_tests/contents_in_middle_chapter_separate_element.pl
@@ -20,6 +20,7 @@ 
$result_tree_text{'contents_in_middle_chapter_separate_element'} = '*document_ro
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ 
$result_tree_text{'contents_in_middle_chapter_separate_element'} = '*document_ro
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -92,6 +94,7 @@ 
$result_tree_text{'contents_in_middle_chapter_separate_element'} = '*document_ro
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -108,8 +111,9 @@ 
$result_tree_text{'contents_in_middle_chapter_separate_element'} = '*document_ro
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -164,6 +168,7 @@ 
$result_tree_text{'contents_in_middle_chapter_separate_element'} = '*document_ro
  |is_target:{1}
  |menu_directions:D[up->E3]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -179,8 +184,9 @@ 
$result_tree_text{'contents_in_middle_chapter_separate_element'} = '*document_ro
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/html_tests/contents_in_middle_section.pl 
b/tta/perl/t/results/html_tests/contents_in_middle_section.pl
index efd31b6585..431c870600 100644
--- a/tta/perl/t/results/html_tests/contents_in_middle_section.pl
+++ b/tta/perl/t/results/html_tests/contents_in_middle_section.pl
@@ -20,6 +20,7 @@ $result_tree_text{'contents_in_middle_section'} = 
'*document_root C10
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'contents_in_middle_section'} = 
'*document_root C10
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -92,6 +94,7 @@ $result_tree_text{'contents_in_middle_section'} = 
'*document_root C10
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -108,8 +111,9 @@ $result_tree_text{'contents_in_middle_section'} = 
'*document_root C10
  |associated_node:[E3]
  |section_childs:EC[E7|E9]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -169,6 +173,7 @@ $result_tree_text{'contents_in_middle_section'} = 
'*document_root C10
  |is_target:{1}
  |menu_directions:D[next->E8|up->E3]
  |node_directions:D[next->E8|up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -184,8 +189,9 @@ $result_tree_text{'contents_in_middle_section'} = 
'*document_root C10
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[next->E9|up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -210,6 +216,7 @@ $result_tree_text{'contents_in_middle_section'} = 
'*document_root C10
  |is_target:{1}
  |menu_directions:D[prev->E6|up->E3]
  |node_directions:D[prev->E6|up->E3]
+ |node_number:{4}
  |normalized:{section1}
   *arguments_line C1
    *line_arg C1
@@ -225,8 +232,9 @@ $result_tree_text{'contents_in_middle_section'} = 
'*document_root C10
  |associated_anchor_command:[E8]
  |associated_node:[E8]
  |section_directions:D[prev->E7|up->E4]
+ |section_heading_number:{1.2}
  |section_level:{2}
- |section_number:{1.2}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/html_tests/contents_in_middle_section_inline.pl 
b/tta/perl/t/results/html_tests/contents_in_middle_section_inline.pl
index 11ab4a2b5e..672bfd3713 100644
--- a/tta/perl/t/results/html_tests/contents_in_middle_section_inline.pl
+++ b/tta/perl/t/results/html_tests/contents_in_middle_section_inline.pl
@@ -20,6 +20,7 @@ $result_tree_text{'contents_in_middle_section_inline'} = 
'*document_root C10
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'contents_in_middle_section_inline'} = 
'*document_root C10
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -92,6 +94,7 @@ $result_tree_text{'contents_in_middle_section_inline'} = 
'*document_root C10
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -108,8 +111,9 @@ $result_tree_text{'contents_in_middle_section_inline'} = 
'*document_root C10
  |associated_node:[E3]
  |section_childs:EC[E7|E9]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -169,6 +173,7 @@ $result_tree_text{'contents_in_middle_section_inline'} = 
'*document_root C10
  |is_target:{1}
  |menu_directions:D[next->E8|up->E3]
  |node_directions:D[next->E8|up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -184,8 +189,9 @@ $result_tree_text{'contents_in_middle_section_inline'} = 
'*document_root C10
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[next->E9|up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -210,6 +216,7 @@ $result_tree_text{'contents_in_middle_section_inline'} = 
'*document_root C10
  |is_target:{1}
  |menu_directions:D[prev->E6|up->E3]
  |node_directions:D[prev->E6|up->E3]
+ |node_number:{4}
  |normalized:{section1}
   *arguments_line C1
    *line_arg C1
@@ -225,8 +232,9 @@ $result_tree_text{'contents_in_middle_section_inline'} = 
'*document_root C10
  |associated_anchor_command:[E8]
  |associated_node:[E8]
  |section_directions:D[prev->E7|up->E4]
+ |section_heading_number:{1.2}
  |section_level:{2}
- |section_number:{1.2}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git 
a/tta/perl/t/results/html_tests/contents_in_middle_section_separate_element.pl 
b/tta/perl/t/results/html_tests/contents_in_middle_section_separate_element.pl
index efa6a3fc2d..811484f87b 100644
--- 
a/tta/perl/t/results/html_tests/contents_in_middle_section_separate_element.pl
+++ 
b/tta/perl/t/results/html_tests/contents_in_middle_section_separate_element.pl
@@ -20,6 +20,7 @@ 
$result_tree_text{'contents_in_middle_section_separate_element'} = '*document_ro
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ 
$result_tree_text{'contents_in_middle_section_separate_element'} = '*document_ro
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -92,6 +94,7 @@ 
$result_tree_text{'contents_in_middle_section_separate_element'} = '*document_ro
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -108,8 +111,9 @@ 
$result_tree_text{'contents_in_middle_section_separate_element'} = '*document_ro
  |associated_node:[E3]
  |section_childs:EC[E7|E9]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -169,6 +173,7 @@ 
$result_tree_text{'contents_in_middle_section_separate_element'} = '*document_ro
  |is_target:{1}
  |menu_directions:D[next->E8|up->E3]
  |node_directions:D[next->E8|up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -184,8 +189,9 @@ 
$result_tree_text{'contents_in_middle_section_separate_element'} = '*document_ro
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[next->E9|up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -210,6 +216,7 @@ 
$result_tree_text{'contents_in_middle_section_separate_element'} = '*document_ro
  |is_target:{1}
  |menu_directions:D[prev->E6|up->E3]
  |node_directions:D[prev->E6|up->E3]
+ |node_number:{4}
  |normalized:{section1}
   *arguments_line C1
    *line_arg C1
@@ -225,8 +232,9 @@ 
$result_tree_text{'contents_in_middle_section_separate_element'} = '*document_ro
  |associated_anchor_command:[E8]
  |associated_node:[E8]
  |section_directions:D[prev->E7|up->E4]
+ |section_heading_number:{1.2}
  |section_level:{2}
- |section_number:{1.2}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/html_tests/contents_with_only_top_node.pl 
b/tta/perl/t/results/html_tests/contents_with_only_top_node.pl
index c8e8f65cf7..6589ee9426 100644
--- a/tta/perl/t/results/html_tests/contents_with_only_top_node.pl
+++ b/tta/perl/t/results/html_tests/contents_with_only_top_node.pl
@@ -15,6 +15,7 @@ $result_tree_text{'contents_with_only_top_node'} = 
'*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/css_in_node_redirection_page.pl 
b/tta/perl/t/results/html_tests/css_in_node_redirection_page.pl
index 88e0a8b40f..f483785fbb 100644
--- a/tta/perl/t/results/html_tests/css_in_node_redirection_page.pl
+++ b/tta/perl/t/results/html_tests/css_in_node_redirection_page.pl
@@ -28,6 +28,7 @@ $result_tree_text{'css_in_node_redirection_page'} = 
'*document_root C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -43,6 +44,7 @@ $result_tree_text{'css_in_node_redirection_page'} = 
'*document_root C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git 
a/tta/perl/t/results/html_tests/deftypefnnewline_for_copying_after.pl 
b/tta/perl/t/results/html_tests/deftypefnnewline_for_copying_after.pl
index 21121c2f11..dd4d6140aa 100644
--- a/tta/perl/t/results/html_tests/deftypefnnewline_for_copying_after.pl
+++ b/tta/perl/t/results/html_tests/deftypefnnewline_for_copying_after.pl
@@ -105,6 +105,7 @@ $result_tree_text{'deftypefnnewline_for_copying_after'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -121,6 +122,7 @@ $result_tree_text{'deftypefnnewline_for_copying_after'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -143,6 +145,7 @@ $result_tree_text{'deftypefnnewline_for_copying_after'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -158,8 +161,9 @@ $result_tree_text{'deftypefnnewline_for_copying_after'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/html_tests/deftypefnnewline_for_copying_before.pl 
b/tta/perl/t/results/html_tests/deftypefnnewline_for_copying_before.pl
index 8c7861053b..354bb08f3d 100644
--- a/tta/perl/t/results/html_tests/deftypefnnewline_for_copying_before.pl
+++ b/tta/perl/t/results/html_tests/deftypefnnewline_for_copying_before.pl
@@ -96,6 +96,7 @@ $result_tree_text{'deftypefnnewline_for_copying_before'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -112,6 +113,7 @@ $result_tree_text{'deftypefnnewline_for_copying_before'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -134,6 +136,7 @@ $result_tree_text{'deftypefnnewline_for_copying_before'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -149,8 +152,9 @@ $result_tree_text{'deftypefnnewline_for_copying_before'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/documentdescription.pl 
b/tta/perl/t/results/html_tests/documentdescription.pl
index 0ee200abd0..c7ceec35c8 100644
--- a/tta/perl/t/results/html_tests/documentdescription.pl
+++ b/tta/perl/t/results/html_tests/documentdescription.pl
@@ -64,6 +64,7 @@ $result_tree_text{'documentdescription'} = '*document_root C2
   |{ }
  |EXTRA
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/html_tests/double_contents.pl 
b/tta/perl/t/results/html_tests/double_contents.pl
index 7e6120c209..608351f3eb 100644
--- a/tta/perl/t/results/html_tests/double_contents.pl
+++ b/tta/perl/t/results/html_tests/double_contents.pl
@@ -25,6 +25,7 @@ $result_tree_text{'double_contents'} = '*document_root C8
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -41,6 +42,7 @@ $result_tree_text{'double_contents'} = '*document_root C8
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -97,6 +99,7 @@ $result_tree_text{'double_contents'} = '*document_root C8
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -113,8 +116,9 @@ $result_tree_text{'double_contents'} = '*document_root C8
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -169,6 +173,7 @@ $result_tree_text{'double_contents'} = '*document_root C8
  |is_target:{1}
  |menu_directions:D[up->E3]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -184,8 +189,9 @@ $result_tree_text{'double_contents'} = '*document_root C8
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/html_tests/double_contents_after_title.pl 
b/tta/perl/t/results/html_tests/double_contents_after_title.pl
index a0c8ba09dc..e0a3c6fc30 100644
--- a/tta/perl/t/results/html_tests/double_contents_after_title.pl
+++ b/tta/perl/t/results/html_tests/double_contents_after_title.pl
@@ -25,6 +25,7 @@ $result_tree_text{'double_contents_after_title'} = 
'*document_root C8
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -41,6 +42,7 @@ $result_tree_text{'double_contents_after_title'} = 
'*document_root C8
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -97,6 +99,7 @@ $result_tree_text{'double_contents_after_title'} = 
'*document_root C8
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -113,8 +116,9 @@ $result_tree_text{'double_contents_after_title'} = 
'*document_root C8
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -169,6 +173,7 @@ $result_tree_text{'double_contents_after_title'} = 
'*document_root C8
  |is_target:{1}
  |menu_directions:D[up->E3]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -184,8 +189,9 @@ $result_tree_text{'double_contents_after_title'} = 
'*document_root C8
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git 
a/tta/perl/t/results/html_tests/double_contents_after_title_show_title.pl 
b/tta/perl/t/results/html_tests/double_contents_after_title_show_title.pl
index 572703161d..dce53b7c3e 100644
--- a/tta/perl/t/results/html_tests/double_contents_after_title_show_title.pl
+++ b/tta/perl/t/results/html_tests/double_contents_after_title_show_title.pl
@@ -25,6 +25,7 @@ $result_tree_text{'double_contents_after_title_show_title'} = 
'*document_root C8
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -41,6 +42,7 @@ $result_tree_text{'double_contents_after_title_show_title'} = 
'*document_root C8
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -97,6 +99,7 @@ $result_tree_text{'double_contents_after_title_show_title'} = 
'*document_root C8
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -113,8 +116,9 @@ $result_tree_text{'double_contents_after_title_show_title'} 
= '*document_root C8
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -169,6 +173,7 @@ $result_tree_text{'double_contents_after_title_show_title'} 
= '*document_root C8
  |is_target:{1}
  |menu_directions:D[up->E3]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -184,8 +189,9 @@ $result_tree_text{'double_contents_after_title_show_title'} 
= '*document_root C8
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git 
a/tta/perl/t/results/html_tests/double_contents_after_title_show_title_nodes.pl 
b/tta/perl/t/results/html_tests/double_contents_after_title_show_title_nodes.pl
index fea7381a99..0d4e26165d 100644
--- 
a/tta/perl/t/results/html_tests/double_contents_after_title_show_title_nodes.pl
+++ 
b/tta/perl/t/results/html_tests/double_contents_after_title_show_title_nodes.pl
@@ -25,6 +25,7 @@ 
$result_tree_text{'double_contents_after_title_show_title_nodes'} = '*document_r
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -41,6 +42,7 @@ 
$result_tree_text{'double_contents_after_title_show_title_nodes'} = '*document_r
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -97,6 +99,7 @@ 
$result_tree_text{'double_contents_after_title_show_title_nodes'} = '*document_r
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -113,8 +116,9 @@ 
$result_tree_text{'double_contents_after_title_show_title_nodes'} = '*document_r
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -169,6 +173,7 @@ 
$result_tree_text{'double_contents_after_title_show_title_nodes'} = '*document_r
  |is_target:{1}
  |menu_directions:D[up->E3]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -184,8 +189,9 @@ 
$result_tree_text{'double_contents_after_title_show_title_nodes'} = '*document_r
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/html_tests/double_contents_book.pl 
b/tta/perl/t/results/html_tests/double_contents_book.pl
index 095d4ce47f..e7ea71f7e3 100644
--- a/tta/perl/t/results/html_tests/double_contents_book.pl
+++ b/tta/perl/t/results/html_tests/double_contents_book.pl
@@ -25,6 +25,7 @@ $result_tree_text{'double_contents_book'} = '*document_root C8
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -41,6 +42,7 @@ $result_tree_text{'double_contents_book'} = '*document_root C8
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -97,6 +99,7 @@ $result_tree_text{'double_contents_book'} = '*document_root C8
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -113,8 +116,9 @@ $result_tree_text{'double_contents_book'} = '*document_root 
C8
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -169,6 +173,7 @@ $result_tree_text{'double_contents_book'} = '*document_root 
C8
  |is_target:{1}
  |menu_directions:D[up->E3]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -184,8 +189,9 @@ $result_tree_text{'double_contents_book'} = '*document_root 
C8
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/html_tests/double_contents_chapter.pl 
b/tta/perl/t/results/html_tests/double_contents_chapter.pl
index 26ab277d18..c2246918ae 100644
--- a/tta/perl/t/results/html_tests/double_contents_chapter.pl
+++ b/tta/perl/t/results/html_tests/double_contents_chapter.pl
@@ -25,6 +25,7 @@ $result_tree_text{'double_contents_chapter'} = 
'*document_root C8
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -41,6 +42,7 @@ $result_tree_text{'double_contents_chapter'} = 
'*document_root C8
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -97,6 +99,7 @@ $result_tree_text{'double_contents_chapter'} = 
'*document_root C8
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -113,8 +116,9 @@ $result_tree_text{'double_contents_chapter'} = 
'*document_root C8
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -169,6 +173,7 @@ $result_tree_text{'double_contents_chapter'} = 
'*document_root C8
  |is_target:{1}
  |menu_directions:D[up->E3]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -184,8 +189,9 @@ $result_tree_text{'double_contents_chapter'} = 
'*document_root C8
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/html_tests/double_contents_inline.pl 
b/tta/perl/t/results/html_tests/double_contents_inline.pl
index 063ec97b80..5b2f46fc5c 100644
--- a/tta/perl/t/results/html_tests/double_contents_inline.pl
+++ b/tta/perl/t/results/html_tests/double_contents_inline.pl
@@ -25,6 +25,7 @@ $result_tree_text{'double_contents_inline'} = '*document_root 
C8
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -41,6 +42,7 @@ $result_tree_text{'double_contents_inline'} = '*document_root 
C8
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -97,6 +99,7 @@ $result_tree_text{'double_contents_inline'} = '*document_root 
C8
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -113,8 +116,9 @@ $result_tree_text{'double_contents_inline'} = 
'*document_root C8
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -169,6 +173,7 @@ $result_tree_text{'double_contents_inline'} = 
'*document_root C8
  |is_target:{1}
  |menu_directions:D[up->E3]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -184,8 +189,9 @@ $result_tree_text{'double_contents_inline'} = 
'*document_root C8
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/html_tests/double_contents_inline_chapter.pl 
b/tta/perl/t/results/html_tests/double_contents_inline_chapter.pl
index db66f6a27c..313d89d785 100644
--- a/tta/perl/t/results/html_tests/double_contents_inline_chapter.pl
+++ b/tta/perl/t/results/html_tests/double_contents_inline_chapter.pl
@@ -25,6 +25,7 @@ $result_tree_text{'double_contents_inline_chapter'} = 
'*document_root C8
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -41,6 +42,7 @@ $result_tree_text{'double_contents_inline_chapter'} = 
'*document_root C8
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -97,6 +99,7 @@ $result_tree_text{'double_contents_inline_chapter'} = 
'*document_root C8
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -113,8 +116,9 @@ $result_tree_text{'double_contents_inline_chapter'} = 
'*document_root C8
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -169,6 +173,7 @@ $result_tree_text{'double_contents_inline_chapter'} = 
'*document_root C8
  |is_target:{1}
  |menu_directions:D[up->E3]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -184,8 +189,9 @@ $result_tree_text{'double_contents_inline_chapter'} = 
'*document_root C8
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/html_tests/double_contents_inline_nodes.pl 
b/tta/perl/t/results/html_tests/double_contents_inline_nodes.pl
index bbf4e3e6b4..1056d26749 100644
--- a/tta/perl/t/results/html_tests/double_contents_inline_nodes.pl
+++ b/tta/perl/t/results/html_tests/double_contents_inline_nodes.pl
@@ -25,6 +25,7 @@ $result_tree_text{'double_contents_inline_nodes'} = 
'*document_root C8
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -41,6 +42,7 @@ $result_tree_text{'double_contents_inline_nodes'} = 
'*document_root C8
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -97,6 +99,7 @@ $result_tree_text{'double_contents_inline_nodes'} = 
'*document_root C8
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -113,8 +116,9 @@ $result_tree_text{'double_contents_inline_nodes'} = 
'*document_root C8
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -169,6 +173,7 @@ $result_tree_text{'double_contents_inline_nodes'} = 
'*document_root C8
  |is_target:{1}
  |menu_directions:D[up->E3]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -184,8 +189,9 @@ $result_tree_text{'double_contents_inline_nodes'} = 
'*document_root C8
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/html_tests/double_contents_inline_section.pl 
b/tta/perl/t/results/html_tests/double_contents_inline_section.pl
index 056617bfce..0bee1710a8 100644
--- a/tta/perl/t/results/html_tests/double_contents_inline_section.pl
+++ b/tta/perl/t/results/html_tests/double_contents_inline_section.pl
@@ -25,6 +25,7 @@ $result_tree_text{'double_contents_inline_section'} = 
'*document_root C8
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -41,6 +42,7 @@ $result_tree_text{'double_contents_inline_section'} = 
'*document_root C8
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -97,6 +99,7 @@ $result_tree_text{'double_contents_inline_section'} = 
'*document_root C8
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -113,8 +116,9 @@ $result_tree_text{'double_contents_inline_section'} = 
'*document_root C8
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -169,6 +173,7 @@ $result_tree_text{'double_contents_inline_section'} = 
'*document_root C8
  |is_target:{1}
  |menu_directions:D[up->E3]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -184,8 +189,9 @@ $result_tree_text{'double_contents_inline_section'} = 
'*document_root C8
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/html_tests/double_contents_nodes.pl 
b/tta/perl/t/results/html_tests/double_contents_nodes.pl
index ee891014e1..346fa34f96 100644
--- a/tta/perl/t/results/html_tests/double_contents_nodes.pl
+++ b/tta/perl/t/results/html_tests/double_contents_nodes.pl
@@ -25,6 +25,7 @@ $result_tree_text{'double_contents_nodes'} = '*document_root 
C8
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -41,6 +42,7 @@ $result_tree_text{'double_contents_nodes'} = '*document_root 
C8
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -97,6 +99,7 @@ $result_tree_text{'double_contents_nodes'} = '*document_root 
C8
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -113,8 +116,9 @@ $result_tree_text{'double_contents_nodes'} = 
'*document_root C8
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -169,6 +173,7 @@ $result_tree_text{'double_contents_nodes'} = 
'*document_root C8
  |is_target:{1}
  |menu_directions:D[up->E3]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -184,8 +189,9 @@ $result_tree_text{'double_contents_nodes'} = 
'*document_root C8
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/html_tests/double_contents_section.pl 
b/tta/perl/t/results/html_tests/double_contents_section.pl
index 6c9b4b05d6..0b6120e56e 100644
--- a/tta/perl/t/results/html_tests/double_contents_section.pl
+++ b/tta/perl/t/results/html_tests/double_contents_section.pl
@@ -25,6 +25,7 @@ $result_tree_text{'double_contents_section'} = 
'*document_root C8
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -41,6 +42,7 @@ $result_tree_text{'double_contents_section'} = 
'*document_root C8
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -97,6 +99,7 @@ $result_tree_text{'double_contents_section'} = 
'*document_root C8
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -113,8 +116,9 @@ $result_tree_text{'double_contents_section'} = 
'*document_root C8
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -169,6 +173,7 @@ $result_tree_text{'double_contents_section'} = 
'*document_root C8
  |is_target:{1}
  |menu_directions:D[up->E3]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -184,8 +189,9 @@ $result_tree_text{'double_contents_section'} = 
'*document_root C8
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/html_tests/double_contents_separate_element.pl 
b/tta/perl/t/results/html_tests/double_contents_separate_element.pl
index a04533238c..7d3989530e 100644
--- a/tta/perl/t/results/html_tests/double_contents_separate_element.pl
+++ b/tta/perl/t/results/html_tests/double_contents_separate_element.pl
@@ -25,6 +25,7 @@ $result_tree_text{'double_contents_separate_element'} = 
'*document_root C8
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -41,6 +42,7 @@ $result_tree_text{'double_contents_separate_element'} = 
'*document_root C8
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -97,6 +99,7 @@ $result_tree_text{'double_contents_separate_element'} = 
'*document_root C8
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -113,8 +116,9 @@ $result_tree_text{'double_contents_separate_element'} = 
'*document_root C8
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -169,6 +173,7 @@ $result_tree_text{'double_contents_separate_element'} = 
'*document_root C8
  |is_target:{1}
  |menu_directions:D[up->E3]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -184,8 +189,9 @@ $result_tree_text{'double_contents_separate_element'} = 
'*document_root C8
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git 
a/tta/perl/t/results/html_tests/double_contents_separate_element_chapter.pl 
b/tta/perl/t/results/html_tests/double_contents_separate_element_chapter.pl
index e3182f181e..86eef5de42 100644
--- a/tta/perl/t/results/html_tests/double_contents_separate_element_chapter.pl
+++ b/tta/perl/t/results/html_tests/double_contents_separate_element_chapter.pl
@@ -25,6 +25,7 @@ $result_tree_text{'double_contents_separate_element_chapter'} 
= '*document_root
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -41,6 +42,7 @@ $result_tree_text{'double_contents_separate_element_chapter'} 
= '*document_root
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -97,6 +99,7 @@ $result_tree_text{'double_contents_separate_element_chapter'} 
= '*document_root
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -113,8 +116,9 @@ 
$result_tree_text{'double_contents_separate_element_chapter'} = '*document_root
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -169,6 +173,7 @@ 
$result_tree_text{'double_contents_separate_element_chapter'} = '*document_root
  |is_target:{1}
  |menu_directions:D[up->E3]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -184,8 +189,9 @@ 
$result_tree_text{'double_contents_separate_element_chapter'} = '*document_root
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git 
a/tta/perl/t/results/html_tests/double_contents_separate_element_nodes.pl 
b/tta/perl/t/results/html_tests/double_contents_separate_element_nodes.pl
index 49995aa419..b690ffbcb7 100644
--- a/tta/perl/t/results/html_tests/double_contents_separate_element_nodes.pl
+++ b/tta/perl/t/results/html_tests/double_contents_separate_element_nodes.pl
@@ -25,6 +25,7 @@ $result_tree_text{'double_contents_separate_element_nodes'} = 
'*document_root C8
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -41,6 +42,7 @@ $result_tree_text{'double_contents_separate_element_nodes'} = 
'*document_root C8
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -97,6 +99,7 @@ $result_tree_text{'double_contents_separate_element_nodes'} = 
'*document_root C8
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -113,8 +116,9 @@ $result_tree_text{'double_contents_separate_element_nodes'} 
= '*document_root C8
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -169,6 +173,7 @@ $result_tree_text{'double_contents_separate_element_nodes'} 
= '*document_root C8
  |is_target:{1}
  |menu_directions:D[up->E3]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -184,8 +189,9 @@ $result_tree_text{'double_contents_separate_element_nodes'} 
= '*document_root C8
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git 
a/tta/perl/t/results/html_tests/double_contents_separate_element_section.pl 
b/tta/perl/t/results/html_tests/double_contents_separate_element_section.pl
index 3b7afd217d..c0dc0feb03 100644
--- a/tta/perl/t/results/html_tests/double_contents_separate_element_section.pl
+++ b/tta/perl/t/results/html_tests/double_contents_separate_element_section.pl
@@ -25,6 +25,7 @@ $result_tree_text{'double_contents_separate_element_section'} 
= '*document_root
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -41,6 +42,7 @@ $result_tree_text{'double_contents_separate_element_section'} 
= '*document_root
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -97,6 +99,7 @@ $result_tree_text{'double_contents_separate_element_section'} 
= '*document_root
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -113,8 +116,9 @@ 
$result_tree_text{'double_contents_separate_element_section'} = '*document_root
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -169,6 +173,7 @@ 
$result_tree_text{'double_contents_separate_element_section'} = '*document_root
  |is_target:{1}
  |menu_directions:D[up->E3]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -184,8 +189,9 @@ 
$result_tree_text{'double_contents_separate_element_section'} = '*document_root
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git 
a/tta/perl/t/results/html_tests/double_recursive_self_section_reference_node_no_use_node.pl
 
b/tta/perl/t/results/html_tests/double_recursive_self_section_reference_node_no_use_node.pl
index 98a820c77d..274761408c 100644
--- 
a/tta/perl/t/results/html_tests/double_recursive_self_section_reference_node_no_use_node.pl
+++ 
b/tta/perl/t/results/html_tests/double_recursive_self_section_reference_node_no_use_node.pl
@@ -16,6 +16,7 @@ 
$result_tree_text{'double_recursive_self_section_reference_node_no_use_node'} =
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{n1}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ 
$result_tree_text{'double_recursive_self_section_reference_node_no_use_node'} =
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_directions:D[next->E3]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
@@ -60,6 +62,7 @@ 
$result_tree_text{'double_recursive_self_section_reference_node_no_use_node'} =
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{n2}
   *arguments_line C1
    *line_arg C1
@@ -75,6 +78,7 @@ 
$result_tree_text{'double_recursive_self_section_reference_node_no_use_node'} =
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[prev->E1]
+ |section_heading_number:{2}
  |section_level:{1}
  |section_number:{2}
  |toplevel_directions:D[prev->E1]
diff --git a/tta/perl/t/results/html_tests/empty_chapter_in_html_title.pl 
b/tta/perl/t/results/html_tests/empty_chapter_in_html_title.pl
index a766e3cb20..56ec8768a5 100644
--- a/tta/perl/t/results/html_tests/empty_chapter_in_html_title.pl
+++ b/tta/perl/t/results/html_tests/empty_chapter_in_html_title.pl
@@ -16,6 +16,7 @@ $result_tree_text{'empty_chapter_in_html_title'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'empty_chapter_in_html_title'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'empty_chapter_in_html_title'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -66,8 +69,9 @@ $result_tree_text{'empty_chapter_in_html_title'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg
diff --git 
a/tta/perl/t/results/html_tests/empty_chapter_in_html_title_no_node_no_use_nodes.pl
 
b/tta/perl/t/results/html_tests/empty_chapter_in_html_title_no_node_no_use_nodes.pl
index 1154dfed9b..b19f963b90 100644
--- 
a/tta/perl/t/results/html_tests/empty_chapter_in_html_title_no_node_no_use_nodes.pl
+++ 
b/tta/perl/t/results/html_tests/empty_chapter_in_html_title_no_node_no_use_nodes.pl
@@ -15,6 +15,7 @@ 
$result_tree_text{'empty_chapter_in_html_title_no_node_no_use_nodes'} = '*docume
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ 
$result_tree_text{'empty_chapter_in_html_title_no_node_no_use_nodes'} = '*docume
  |associated_node:[E0]
  |section_childs:EC[E2]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -47,8 +49,9 @@ 
$result_tree_text{'empty_chapter_in_html_title_no_node_no_use_nodes'} = '*docume
  *2 @chapter C1 l4
  |EXTRA
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg
diff --git 
a/tta/perl/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl 
b/tta/perl/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
index b80a4703f1..a67bad1252 100644
--- a/tta/perl/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
+++ b/tta/perl/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
@@ -22,6 +22,7 @@ $result_tree_text{'empty_lines_at_beginning_no_setfilename'} 
= '*document_root C
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -37,6 +38,7 @@ $result_tree_text{'empty_lines_at_beginning_no_setfilename'} 
= '*document_root C
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git 
a/tta/perl/t/results/html_tests/empty_node_in_html_title_no_sec_name.pl 
b/tta/perl/t/results/html_tests/empty_node_in_html_title_no_sec_name.pl
index 420a78a61d..d5df12db1e 100644
--- a/tta/perl/t/results/html_tests/empty_node_in_html_title_no_sec_name.pl
+++ b/tta/perl/t/results/html_tests/empty_node_in_html_title_no_sec_name.pl
@@ -16,6 +16,7 @@ $result_tree_text{'empty_node_in_html_title_no_sec_name'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'empty_node_in_html_title_no_sec_name'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -62,8 +64,9 @@ $result_tree_text{'empty_node_in_html_title_no_sec_name'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/html_tests/file_name_case_insensitive_conflict_node.pl 
b/tta/perl/t/results/html_tests/file_name_case_insensitive_conflict_node.pl
index 223d70c4d5..78ce00d492 100644
--- a/tta/perl/t/results/html_tests/file_name_case_insensitive_conflict_node.pl
+++ b/tta/perl/t/results/html_tests/file_name_case_insensitive_conflict_node.pl
@@ -16,6 +16,7 @@ $result_tree_text{'file_name_case_insensitive_conflict_node'} 
= '*document_root
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'file_name_case_insensitive_conflict_node'} 
= '*document_root
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'file_name_case_insensitive_conflict_node'} 
= '*document_root
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -70,8 +73,9 @@ $result_tree_text{'file_name_case_insensitive_conflict_node'} 
= '*document_root
  |associated_node:[E2]
  |section_childs:EC[E6|E8|E10]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -97,6 +101,7 @@ 
$result_tree_text{'file_name_case_insensitive_conflict_node'} = '*document_root
  |associated_title_command:[E6]
  |is_target:{1}
  |node_directions:D[next->E7|up->E2]
+ |node_number:{3}
  |normalized:{Foo}
   *arguments_line C1
    *line_arg C1
@@ -112,8 +117,9 @@ 
$result_tree_text{'file_name_case_insensitive_conflict_node'} = '*document_root
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[next->E8|up->E3]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -130,6 +136,7 @@ 
$result_tree_text{'file_name_case_insensitive_conflict_node'} = '*document_root
  |associated_title_command:[E8]
  |is_target:{1}
  |node_directions:D[next->E9|prev->E5|up->E2]
+ |node_number:{4}
  |normalized:{Bar}
   *arguments_line C1
    *line_arg C1
@@ -145,8 +152,9 @@ 
$result_tree_text{'file_name_case_insensitive_conflict_node'} = '*document_root
  |associated_anchor_command:[E7]
  |associated_node:[E7]
  |section_directions:D[next->E10|prev->E6|up->E3]
+ |section_heading_number:{1.2}
  |section_level:{2}
- |section_number:{1.2}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -163,6 +171,7 @@ 
$result_tree_text{'file_name_case_insensitive_conflict_node'} = '*document_root
  |associated_title_command:[E10]
  |is_target:{1}
  |node_directions:D[prev->E7|up->E2]
+ |node_number:{5}
  |normalized:{foo}
   *arguments_line C1
    *line_arg C1
@@ -178,8 +187,9 @@ 
$result_tree_text{'file_name_case_insensitive_conflict_node'} = '*document_root
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[prev->E8|up->E3]
+ |section_heading_number:{1.3}
  |section_level:{2}
- |section_number:{1.3}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git 
a/tta/perl/t/results/html_tests/file_name_case_insensitive_conflict_node_no_redirections.pl
 
b/tta/perl/t/results/html_tests/file_name_case_insensitive_conflict_node_no_redirections.pl
index a7c6b92290..b9c613b9cb 100644
--- 
a/tta/perl/t/results/html_tests/file_name_case_insensitive_conflict_node_no_redirections.pl
+++ 
b/tta/perl/t/results/html_tests/file_name_case_insensitive_conflict_node_no_redirections.pl
@@ -16,6 +16,7 @@ 
$result_tree_text{'file_name_case_insensitive_conflict_node_no_redirections'} =
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ 
$result_tree_text{'file_name_case_insensitive_conflict_node_no_redirections'} =
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ 
$result_tree_text{'file_name_case_insensitive_conflict_node_no_redirections'} =
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -70,8 +73,9 @@ 
$result_tree_text{'file_name_case_insensitive_conflict_node_no_redirections'} =
  |associated_node:[E2]
  |section_childs:EC[E6|E8|E10]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -97,6 +101,7 @@ 
$result_tree_text{'file_name_case_insensitive_conflict_node_no_redirections'} =
  |associated_title_command:[E6]
  |is_target:{1}
  |node_directions:D[next->E7|up->E2]
+ |node_number:{3}
  |normalized:{Foo}
   *arguments_line C1
    *line_arg C1
@@ -112,8 +117,9 @@ 
$result_tree_text{'file_name_case_insensitive_conflict_node_no_redirections'} =
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[next->E8|up->E3]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -130,6 +136,7 @@ 
$result_tree_text{'file_name_case_insensitive_conflict_node_no_redirections'} =
  |associated_title_command:[E8]
  |is_target:{1}
  |node_directions:D[next->E9|prev->E5|up->E2]
+ |node_number:{4}
  |normalized:{Bar}
   *arguments_line C1
    *line_arg C1
@@ -145,8 +152,9 @@ 
$result_tree_text{'file_name_case_insensitive_conflict_node_no_redirections'} =
  |associated_anchor_command:[E7]
  |associated_node:[E7]
  |section_directions:D[next->E10|prev->E6|up->E3]
+ |section_heading_number:{1.2}
  |section_level:{2}
- |section_number:{1.2}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -163,6 +171,7 @@ 
$result_tree_text{'file_name_case_insensitive_conflict_node_no_redirections'} =
  |associated_title_command:[E10]
  |is_target:{1}
  |node_directions:D[prev->E7|up->E2]
+ |node_number:{5}
  |normalized:{foo}
   *arguments_line C1
    *line_arg C1
@@ -178,8 +187,9 @@ 
$result_tree_text{'file_name_case_insensitive_conflict_node_no_redirections'} =
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[prev->E8|up->E3]
+ |section_heading_number:{1.3}
  |section_level:{2}
- |section_number:{1.3}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git 
a/tta/perl/t/results/html_tests/file_name_case_insensitive_conflict_redirections.pl
 
b/tta/perl/t/results/html_tests/file_name_case_insensitive_conflict_redirections.pl
index 3f12a5f1b4..36180150f8 100644
--- 
a/tta/perl/t/results/html_tests/file_name_case_insensitive_conflict_redirections.pl
+++ 
b/tta/perl/t/results/html_tests/file_name_case_insensitive_conflict_redirections.pl
@@ -15,6 +15,7 @@ 
$result_tree_text{'file_name_case_insensitive_conflict_redirections'} = '*docume
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ 
$result_tree_text{'file_name_case_insensitive_conflict_redirections'} = '*docume
  |associated_node:[E0]
  |section_childs:EC[E2]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -50,8 +52,9 @@ 
$result_tree_text{'file_name_case_insensitive_conflict_redirections'} = '*docume
   |{ }
  |EXTRA
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/file_name_conflict_with_Top.pl 
b/tta/perl/t/results/html_tests/file_name_conflict_with_Top.pl
index 8f561e01c6..548965d08a 100644
--- a/tta/perl/t/results/html_tests/file_name_conflict_with_Top.pl
+++ b/tta/perl/t/results/html_tests/file_name_conflict_with_Top.pl
@@ -16,6 +16,7 @@ $result_tree_text{'file_name_conflict_with_Top'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'file_name_conflict_with_Top'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'file_name_conflict_with_Top'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Chapter}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'file_name_conflict_with_Top'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/file_name_conflict_with_section.pl 
b/tta/perl/t/results/html_tests/file_name_conflict_with_section.pl
index aacf32e95a..1c26448fc1 100644
--- a/tta/perl/t/results/html_tests/file_name_conflict_with_section.pl
+++ b/tta/perl/t/results/html_tests/file_name_conflict_with_section.pl
@@ -15,6 +15,7 @@ $result_tree_text{'file_name_conflict_with_section'} = 
'*document_root C4
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'file_name_conflict_with_section'} = 
'*document_root C4
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -57,8 +59,9 @@ $result_tree_text{'file_name_conflict_with_section'} = 
'*document_root C4
   |{ }
  |EXTRA
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/html_tests/file_name_conflict_with_user_defined.pl 
b/tta/perl/t/results/html_tests/file_name_conflict_with_user_defined.pl
index 9746ab9097..f6db4a8dff 100644
--- a/tta/perl/t/results/html_tests/file_name_conflict_with_user_defined.pl
+++ b/tta/perl/t/results/html_tests/file_name_conflict_with_user_defined.pl
@@ -16,6 +16,7 @@ $result_tree_text{'file_name_conflict_with_user_defined'} = 
'*document_root C7
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'file_name_conflict_with_user_defined'} = 
'*document_root C7
  |associated_node:[E0]
  |section_childs:EC[E3|E6]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'file_name_conflict_with_user_defined'} = 
'*document_root C7
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Chapter-1}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'file_name_conflict_with_user_defined'} = 
'*document_root C7
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -96,6 +100,7 @@ $result_tree_text{'file_name_conflict_with_user_defined'} = 
'*document_root C7
  |associated_title_command:[E6]
  |is_target:{1}
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{Chapter-2}
   *arguments_line C1
    *line_arg C1
@@ -111,8 +116,9 @@ $result_tree_text{'file_name_conflict_with_user_defined'} = 
'*document_root C7
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/filenameconflictwithnonsplit.pl 
b/tta/perl/t/results/html_tests/filenameconflictwithnonsplit.pl
index 5bac1e1692..7a9cfeed16 100644
--- a/tta/perl/t/results/html_tests/filenameconflictwithnonsplit.pl
+++ b/tta/perl/t/results/html_tests/filenameconflictwithnonsplit.pl
@@ -15,6 +15,7 @@ $result_tree_text{'filenameconflictwithnonsplit'} = 
'*document_root C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -30,6 +31,7 @@ $result_tree_text{'filenameconflictwithnonsplit'} = 
'*document_root C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git 
a/tta/perl/t/results/html_tests/filenameconflictwithspecialelement.pl 
b/tta/perl/t/results/html_tests/filenameconflictwithspecialelement.pl
index a8b2c33015..f37e2581be 100644
--- a/tta/perl/t/results/html_tests/filenameconflictwithspecialelement.pl
+++ b/tta/perl/t/results/html_tests/filenameconflictwithspecialelement.pl
@@ -16,6 +16,7 @@ $result_tree_text{'filenameconflictwithspecialelement'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'filenameconflictwithspecialelement'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -63,6 +65,7 @@ $result_tree_text{'filenameconflictwithspecialelement'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -78,8 +81,9 @@ $result_tree_text{'filenameconflictwithspecialelement'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/float_copying.pl 
b/tta/perl/t/results/html_tests/float_copying.pl
index 1298624430..9cebf51858 100644
--- a/tta/perl/t/results/html_tests/float_copying.pl
+++ b/tta/perl/t/results/html_tests/float_copying.pl
@@ -186,6 +186,7 @@ $result_tree_text{'float_copying'} = '*document_root C6
  |is_target:{1}
  |menus:EC[E5]
  |node_directions:D[next->E6]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -202,6 +203,7 @@ $result_tree_text{'float_copying'} = '*document_root C6
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -294,6 +296,7 @@ $result_tree_text{'float_copying'} = '*document_root C6
  |isindex:{1}
  |menu_directions:D[up->E3]
  |node_directions:D[prev->E3|up->E3]
+ |node_number:{2}
  |normalized:{Copying-and-floats}
   *arguments_line C1
    *line_arg C1
@@ -309,8 +312,9 @@ $result_tree_text{'float_copying'} = '*document_root C6
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E4]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{2}
  |toplevel_directions:D[prev->E4|up->E4]
   *arguments_line C1
    *line_arg C1
@@ -372,6 +376,7 @@ $result_tree_text{'float_copying'} = '*document_root C6
    |{ }
   |EXTRA
   |global_command_number:{1}
+  |heading_number:{1}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -396,6 +401,7 @@ $result_tree_text{'float_copying'} = '*document_root C6
    |{ }
   |EXTRA
   |global_command_number:{2}
+  |heading_number:{2}
    *line_arg C1
    |INFO
    |spaces_after_argument:
diff --git 
a/tta/perl/t/results/html_tests/footnotestyle_separate_html_text_no_monolithic.pl
 
b/tta/perl/t/results/html_tests/footnotestyle_separate_html_text_no_monolithic.pl
index b0fd1ea1cb..ef1724f167 100644
--- 
a/tta/perl/t/results/html_tests/footnotestyle_separate_html_text_no_monolithic.pl
+++ 
b/tta/perl/t/results/html_tests/footnotestyle_separate_html_text_no_monolithic.pl
@@ -27,6 +27,7 @@ 
$result_tree_text{'footnotestyle_separate_html_text_no_monolithic'} = '*document
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -43,6 +44,7 @@ 
$result_tree_text{'footnotestyle_separate_html_text_no_monolithic'} = '*document
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -74,6 +76,7 @@ 
$result_tree_text{'footnotestyle_separate_html_text_no_monolithic'} = '*document
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -89,8 +92,9 @@ 
$result_tree_text{'footnotestyle_separate_html_text_no_monolithic'} = '*document
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/footnotestyle_separate_late.pl 
b/tta/perl/t/results/html_tests/footnotestyle_separate_late.pl
index 02305d6ca7..73d40dcc89 100644
--- a/tta/perl/t/results/html_tests/footnotestyle_separate_late.pl
+++ b/tta/perl/t/results/html_tests/footnotestyle_separate_late.pl
@@ -23,6 +23,7 @@ NodeForward: [U1]
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -39,6 +40,7 @@ NodeForward: [U1]
  |associated_node:[E0]
  |section_childs:EC[E3|E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -76,6 +78,7 @@ NodeBack: [U0]
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap-f}
   *arguments_line C1
    *line_arg C1
@@ -91,8 +94,9 @@ NodeBack: [U0]
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -130,6 +134,7 @@ NodeBack: [U1]
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{chap-s}
   *arguments_line C1
    *line_arg C1
@@ -145,8 +150,9 @@ NodeBack: [U1]
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/heading_between.pl 
b/tta/perl/t/results/html_tests/heading_between.pl
index 15025dc148..eb702b4657 100644
--- a/tta/perl/t/results/html_tests/heading_between.pl
+++ b/tta/perl/t/results/html_tests/heading_between.pl
@@ -24,6 +24,7 @@ $result_tree_text{'heading_between'} = '*document_root C5
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Chapter}
   *arguments_line C1
    *line_arg C1
@@ -39,6 +40,7 @@ $result_tree_text{'heading_between'} = '*document_root C5
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_childs:EC[E4]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
@@ -59,6 +61,7 @@ $result_tree_text{'heading_between'} = '*document_root C5
    |{ }
   |EXTRA
   |global_command_number:{1}
+  |heading_number:{1}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -74,6 +77,7 @@ $result_tree_text{'heading_between'} = '*document_root C5
  |associated_title_command:[E4]
  |is_target:{1}
  |node_directions:D[up->E0]
+ |node_number:{2}
  |normalized:{Section}
   *arguments_line C1
    *line_arg C1
@@ -89,8 +93,9 @@ $result_tree_text{'heading_between'} = '*document_root C5
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/html_tests/heading_node_after_chap.pl 
b/tta/perl/t/results/html_tests/heading_node_after_chap.pl
index 8b688f2119..4e264c94b2 100644
--- a/tta/perl/t/results/html_tests/heading_node_after_chap.pl
+++ b/tta/perl/t/results/html_tests/heading_node_after_chap.pl
@@ -25,6 +25,7 @@ $result_tree_text{'heading_node_after_chap'} = 
'*document_root C6
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Cap-1}
   *arguments_line C1
    *line_arg C1
@@ -40,6 +41,7 @@ $result_tree_text{'heading_node_after_chap'} = 
'*document_root C6
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_directions:D[next->E3]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
@@ -75,6 +77,7 @@ $result_tree_text{'heading_node_after_chap'} = 
'*document_root C6
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{Cap-2}
   *arguments_line C1
    *line_arg C1
@@ -90,6 +93,7 @@ $result_tree_text{'heading_node_after_chap'} = 
'*document_root C6
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[prev->E1]
+ |section_heading_number:{2}
  |section_level:{1}
  |section_number:{2}
  |toplevel_directions:D[prev->E1]
@@ -107,6 +111,7 @@ $result_tree_text{'heading_node_after_chap'} = 
'*document_root C6
  |EXTRA
  |associated_title_command:[E5]
  |is_target:{1}
+ |node_number:{3}
  |normalized:{Node-1}
   *arguments_line C1
    *line_arg C1
@@ -121,6 +126,7 @@ $result_tree_text{'heading_node_after_chap'} = 
'*document_root C6
   |EXTRA
   |associated_anchor_command:[E4]
   |global_command_number:{1}
+  |heading_number:{1}
    *line_arg C1
    |INFO
    |spaces_after_argument:
diff --git a/tta/perl/t/results/html_tests/headings_after_lone_nodes.pl 
b/tta/perl/t/results/html_tests/headings_after_lone_nodes.pl
index 8b094cb0c4..65f208c50e 100644
--- a/tta/perl/t/results/html_tests/headings_after_lone_nodes.pl
+++ b/tta/perl/t/results/html_tests/headings_after_lone_nodes.pl
@@ -15,6 +15,7 @@ $result_tree_text{'headings_after_lone_nodes'} = 
'*document_root C13
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'headings_after_lone_nodes'} = 
'*document_root C13
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -53,6 +55,7 @@ $result_tree_text{'headings_after_lone_nodes'} = 
'*document_root C13
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -68,8 +71,9 @@ $result_tree_text{'headings_after_lone_nodes'} = 
'*document_root C13
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -85,6 +89,7 @@ $result_tree_text{'headings_after_lone_nodes'} = 
'*document_root C13
  |EXTRA
  |associated_title_command:[E5]
  |is_target:{1}
+ |node_number:{3}
  |normalized:{Qt}
   *arguments_line C1
    *line_arg C1
@@ -99,6 +104,7 @@ $result_tree_text{'headings_after_lone_nodes'} = 
'*document_root C13
   |EXTRA
   |associated_anchor_command:[E4]
   |global_command_number:{1}
+  |heading_number:{1}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -116,6 +122,7 @@ $result_tree_text{'headings_after_lone_nodes'} = 
'*document_root C13
  |associated_title_command:[E9]
  |is_target:{1}
  |node_description:[E8]
+ |node_number:{4}
  |normalized:{Other}
   *arguments_line C1
    *line_arg C1
@@ -232,6 +239,7 @@ $result_tree_text{'headings_after_lone_nodes'} = 
'*document_root C13
   |EXTRA
   |associated_anchor_command:[E6]
   |global_command_number:{1}
+  |heading_number:{2}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -245,6 +253,7 @@ $result_tree_text{'headings_after_lone_nodes'} = 
'*document_root C13
  |EXTRA
  |associated_title_command:[E11]
  |is_target:{1}
+ |node_number:{5}
  |normalized:{Not-associated}
   *arguments_line C1
    *line_arg C1
@@ -263,6 +272,7 @@ $result_tree_text{'headings_after_lone_nodes'} = 
'*document_root C13
   |EXTRA
   |associated_anchor_command:[E10]
   |global_command_number:{1}
+  |heading_number:{3}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -276,6 +286,7 @@ $result_tree_text{'headings_after_lone_nodes'} = 
'*document_root C13
  |EXTRA
  |associated_title_command:[E13]
  |is_target:{1}
+ |node_number:{6}
  |normalized:{2-not}
   *arguments_line C1
    *line_arg C1
@@ -311,6 +322,7 @@ $result_tree_text{'headings_after_lone_nodes'} = 
'*document_root C13
   |EXTRA
   |associated_anchor_command:[E12]
   |global_command_number:{2}
+  |heading_number:{4}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -324,6 +336,7 @@ $result_tree_text{'headings_after_lone_nodes'} = 
'*document_root C13
  |EXTRA
  |associated_title_command:[E15]
  |is_target:{1}
+ |node_number:{7}
  |normalized:{3-not}
   *arguments_line C1
    *line_arg C1
@@ -359,6 +372,7 @@ $result_tree_text{'headings_after_lone_nodes'} = 
'*document_root C13
   |EXTRA
   |associated_anchor_command:[E14]
   |global_command_number:{3}
+  |heading_number:{5}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -372,6 +386,7 @@ $result_tree_text{'headings_after_lone_nodes'} = 
'*document_root C13
  |EXTRA
  |associated_title_command:[E17]
  |is_target:{1}
+ |node_number:{8}
  |normalized:{4-not}
   *arguments_line C1
    *line_arg C1
@@ -399,6 +414,7 @@ $result_tree_text{'headings_after_lone_nodes'} = 
'*document_root C13
   |EXTRA
   |associated_anchor_command:[E16]
   |global_command_number:{4}
+  |heading_number:{6}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -413,6 +429,7 @@ $result_tree_text{'headings_after_lone_nodes'} = 
'*document_root C13
  |associated_title_command:[E20]
  |is_target:{1}
  |menus:EC[E19]
+ |node_number:{9}
  |normalized:{5-not}
   *arguments_line C1
    *line_arg C1
@@ -457,6 +474,7 @@ $result_tree_text{'headings_after_lone_nodes'} = 
'*document_root C13
   |EXTRA
   |associated_anchor_command:[E18]
   |global_command_number:{5}
+  |heading_number:{7}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -470,6 +488,7 @@ $result_tree_text{'headings_after_lone_nodes'} = 
'*document_root C13
  |EXTRA
  |is_target:{1}
  |menu_directions:D[up->E18]
+ |node_number:{10}
  |normalized:{subnode}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/headings_nodes_before_chapter.pl 
b/tta/perl/t/results/html_tests/headings_nodes_before_chapter.pl
index 57ca1058e6..181993523a 100644
--- a/tta/perl/t/results/html_tests/headings_nodes_before_chapter.pl
+++ b/tta/perl/t/results/html_tests/headings_nodes_before_chapter.pl
@@ -26,6 +26,7 @@ $result_tree_text{'headings_nodes_before_chapter'} = 
'*document_root C7
  |is_target:{1}
  |menu_directions:D[next->E2|up->E4]
  |node_directions:D[next->E2|up->E4]
+ |node_number:{1}
  |normalized:{Node-1}
   *arguments_line C1
    *line_arg C1
@@ -40,6 +41,7 @@ $result_tree_text{'headings_nodes_before_chapter'} = 
'*document_root C7
   |EXTRA
   |associated_anchor_command:[E0]
   |global_command_number:{1}
+  |heading_number:{1}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -55,6 +57,7 @@ $result_tree_text{'headings_nodes_before_chapter'} = 
'*document_root C7
  |is_target:{1}
  |menu_directions:D[prev->E0|up->E4]
  |node_directions:D[prev->E0|up->E4]
+ |node_number:{2}
  |normalized:{Node-2}
   *arguments_line C1
    *line_arg C1
@@ -69,6 +72,7 @@ $result_tree_text{'headings_nodes_before_chapter'} = 
'*document_root C7
   |EXTRA
   |associated_anchor_command:[E2]
   |global_command_number:{2}
+  |heading_number:{2}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -85,6 +89,7 @@ $result_tree_text{'headings_nodes_before_chapter'} = 
'*document_root C7
  |is_target:{1}
  |menus:EC[E6]
  |node_directions:D[next->E7]
+ |node_number:{3}
  |normalized:{Cap-1}
   *arguments_line C1
    *line_arg C1
@@ -100,6 +105,7 @@ $result_tree_text{'headings_nodes_before_chapter'} = 
'*document_root C7
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[next->E8]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
@@ -164,6 +170,7 @@ $result_tree_text{'headings_nodes_before_chapter'} = 
'*document_root C7
  |associated_title_command:[E8]
  |is_target:{1}
  |node_directions:D[prev->E4]
+ |node_number:{4}
  |normalized:{Cap-2}
   *arguments_line C1
    *line_arg C1
@@ -179,6 +186,7 @@ $result_tree_text{'headings_nodes_before_chapter'} = 
'*document_root C7
  |associated_anchor_command:[E7]
  |associated_node:[E7]
  |section_directions:D[prev->E5]
+ |section_heading_number:{2}
  |section_level:{1}
  |section_number:{2}
  |toplevel_directions:D[prev->E5]
diff --git a/tta/perl/t/results/html_tests/html_in_copying.pl 
b/tta/perl/t/results/html_tests/html_in_copying.pl
index 0625c3f86b..ec8768ac0e 100644
--- a/tta/perl/t/results/html_tests/html_in_copying.pl
+++ b/tta/perl/t/results/html_tests/html_in_copying.pl
@@ -55,6 +55,7 @@ $result_tree_text{'html_in_copying'} = '*document_root C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -70,6 +71,7 @@ $result_tree_text{'html_in_copying'} = '*document_root C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/html_tests/index_and_node_same_name.pl 
b/tta/perl/t/results/html_tests/index_and_node_same_name.pl
index 4008929952..ea5cce0231 100644
--- a/tta/perl/t/results/html_tests/index_and_node_same_name.pl
+++ b/tta/perl/t/results/html_tests/index_and_node_same_name.pl
@@ -12,6 +12,7 @@ $result_tree_text{'index_and_node_same_name'} = 
'*document_root C3
   |{ }
  |EXTRA
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -30,6 +31,7 @@ $result_tree_text{'index_and_node_same_name'} = 
'*document_root C3
  |EXTRA
  |is_target:{1}
  |isindex:{1}
+ |node_number:{1}
  |normalized:{index-node}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/index_below.pl 
b/tta/perl/t/results/html_tests/index_below.pl
index b8a31f78c2..6a602ee88f 100644
--- a/tta/perl/t/results/html_tests/index_below.pl
+++ b/tta/perl/t/results/html_tests/index_below.pl
@@ -18,6 +18,7 @@ FastForward: [U1]
  |EXTRA
  |section_childs:EC[E1]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -46,8 +47,9 @@ Up: [U0]
  |EXTRA
  |section_childs:EC[E2]
  |section_directions:D[up->E0]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E0|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -69,8 +71,9 @@ Up: [U1]
   |{ }
  |EXTRA
  |section_directions:D[up->E1]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/html_tests/info_js_dir_html.pl 
b/tta/perl/t/results/html_tests/info_js_dir_html.pl
index 6ffafee553..31c90eb430 100644
--- a/tta/perl/t/results/html_tests/info_js_dir_html.pl
+++ b/tta/perl/t/results/html_tests/info_js_dir_html.pl
@@ -15,6 +15,7 @@ $result_tree_text{'info_js_dir_html'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'info_js_dir_html'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -53,6 +55,7 @@ $result_tree_text{'info_js_dir_html'} = '*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -68,8 +71,9 @@ $result_tree_text{'info_js_dir_html'} = '*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/info_js_dir_html_file.pl 
b/tta/perl/t/results/html_tests/info_js_dir_html_file.pl
index e2d56ba1fc..e7a37a3955 100644
--- a/tta/perl/t/results/html_tests/info_js_dir_html_file.pl
+++ b/tta/perl/t/results/html_tests/info_js_dir_html_file.pl
@@ -16,6 +16,7 @@ $result_tree_text{'info_js_dir_html_file'} = '*document_root 
C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'info_js_dir_html_file'} = '*document_root 
C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'info_js_dir_html_file'} = '*document_root 
C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'info_js_dir_html_file'} = '*document_root 
C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/html_tests/info_js_dir_html_file_js_weblabels_file_undef.pl
 
b/tta/perl/t/results/html_tests/info_js_dir_html_file_js_weblabels_file_undef.pl
index 6f8cbc4daf..bbc93ae8f2 100644
--- 
a/tta/perl/t/results/html_tests/info_js_dir_html_file_js_weblabels_file_undef.pl
+++ 
b/tta/perl/t/results/html_tests/info_js_dir_html_file_js_weblabels_file_undef.pl
@@ -16,6 +16,7 @@ 
$result_tree_text{'info_js_dir_html_file_js_weblabels_file_undef'} = '*document_
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ 
$result_tree_text{'info_js_dir_html_file_js_weblabels_file_undef'} = '*document_
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ 
$result_tree_text{'info_js_dir_html_file_js_weblabels_file_undef'} = '*document_
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ 
$result_tree_text{'info_js_dir_html_file_js_weblabels_file_undef'} = '*document_
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/info_js_dir_html_text.pl 
b/tta/perl/t/results/html_tests/info_js_dir_html_text.pl
index 98d9e6f3bc..90a45efcc6 100644
--- a/tta/perl/t/results/html_tests/info_js_dir_html_text.pl
+++ b/tta/perl/t/results/html_tests/info_js_dir_html_text.pl
@@ -15,6 +15,7 @@ $result_tree_text{'info_js_dir_html_text'} = '*document_root 
C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'info_js_dir_html_text'} = '*document_root 
C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -53,6 +55,7 @@ $result_tree_text{'info_js_dir_html_text'} = '*document_root 
C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -68,8 +71,9 @@ $result_tree_text{'info_js_dir_html_text'} = '*document_root 
C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/inline_in_node.pl 
b/tta/perl/t/results/html_tests/inline_in_node.pl
index 417973d6cd..2e44a74089 100644
--- a/tta/perl/t/results/html_tests/inline_in_node.pl
+++ b/tta/perl/t/results/html_tests/inline_in_node.pl
@@ -42,6 +42,7 @@ $result_tree_text{'inline_in_node'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -55,6 +56,7 @@ $result_tree_text{'inline_in_node'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -76,6 +78,7 @@ $result_tree_text{'inline_in_node'} = '*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{htmlOnehtml}
   *arguments_line C1
    *line_arg C3
@@ -107,8 +110,9 @@ $result_tree_text{'inline_in_node'} = '*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C3
diff --git a/tta/perl/t/results/html_tests/letter_command_in_index.pl 
b/tta/perl/t/results/html_tests/letter_command_in_index.pl
index 15689c1672..e00aa8fcef 100644
--- a/tta/perl/t/results/html_tests/letter_command_in_index.pl
+++ b/tta/perl/t/results/html_tests/letter_command_in_index.pl
@@ -15,6 +15,7 @@ $result_tree_text{'letter_command_in_index'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'letter_command_in_index'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'letter_command_in_index'} = 
'*document_root C5
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'letter_command_in_index'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/menu.pl 
b/tta/perl/t/results/html_tests/menu.pl
index f9dd5b89f1..d255157622 100644
--- a/tta/perl/t/results/html_tests/menu.pl
+++ b/tta/perl/t/results/html_tests/menu.pl
@@ -17,6 +17,7 @@ $result_tree_text{'menu'} = '*document_root C3
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->MISSING: (menu_entry_node)[C3]]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -29,6 +30,7 @@ $result_tree_text{'menu'} = '*document_root C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/html_tests/menu_in_documentdescription.pl 
b/tta/perl/t/results/html_tests/menu_in_documentdescription.pl
index 09bae31fac..3e58304433 100644
--- a/tta/perl/t/results/html_tests/menu_in_documentdescription.pl
+++ b/tta/perl/t/results/html_tests/menu_in_documentdescription.pl
@@ -14,6 +14,7 @@ $result_tree_text{'menu_in_documentdescription'} = 
'*document_root C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -29,6 +30,7 @@ $result_tree_text{'menu_in_documentdescription'} = 
'*document_root C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/html_tests/menu_in_example.pl 
b/tta/perl/t/results/html_tests/menu_in_example.pl
index cc7a340e84..ad088d7566 100644
--- a/tta/perl/t/results/html_tests/menu_in_example.pl
+++ b/tta/perl/t/results/html_tests/menu_in_example.pl
@@ -12,6 +12,7 @@ $result_tree_text{'menu_in_example'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/no_content.pl 
b/tta/perl/t/results/html_tests/no_content.pl
index 532feab698..7defb633c9 100644
--- a/tta/perl/t/results/html_tests/no_content.pl
+++ b/tta/perl/t/results/html_tests/no_content.pl
@@ -20,6 +20,7 @@ $result_tree_text{'no_content'} = '*document_root C6
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'no_content'} = '*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -91,6 +93,7 @@ $result_tree_text{'no_content'} = '*document_root C6
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -106,8 +109,9 @@ $result_tree_text{'no_content'} = '*document_root C6
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/no_content_do_contents.pl 
b/tta/perl/t/results/html_tests/no_content_do_contents.pl
index 808de6d706..4ddd37cda6 100644
--- a/tta/perl/t/results/html_tests/no_content_do_contents.pl
+++ b/tta/perl/t/results/html_tests/no_content_do_contents.pl
@@ -20,6 +20,7 @@ $result_tree_text{'no_content_do_contents'} = '*document_root 
C6
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'no_content_do_contents'} = '*document_root 
C6
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -91,6 +93,7 @@ $result_tree_text{'no_content_do_contents'} = '*document_root 
C6
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -106,8 +109,9 @@ $result_tree_text{'no_content_do_contents'} = 
'*document_root C6
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/no_content_do_contents_inline.pl 
b/tta/perl/t/results/html_tests/no_content_do_contents_inline.pl
index 7b9d30046b..03808aad9e 100644
--- a/tta/perl/t/results/html_tests/no_content_do_contents_inline.pl
+++ b/tta/perl/t/results/html_tests/no_content_do_contents_inline.pl
@@ -20,6 +20,7 @@ $result_tree_text{'no_content_do_contents_inline'} = 
'*document_root C6
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'no_content_do_contents_inline'} = 
'*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -91,6 +93,7 @@ $result_tree_text{'no_content_do_contents_inline'} = 
'*document_root C6
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -106,8 +109,9 @@ $result_tree_text{'no_content_do_contents_inline'} = 
'*document_root C6
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/html_tests/no_content_do_contents_separate_element.pl 
b/tta/perl/t/results/html_tests/no_content_do_contents_separate_element.pl
index 203b66cde7..55500e06fb 100644
--- a/tta/perl/t/results/html_tests/no_content_do_contents_separate_element.pl
+++ b/tta/perl/t/results/html_tests/no_content_do_contents_separate_element.pl
@@ -20,6 +20,7 @@ $result_tree_text{'no_content_do_contents_separate_element'} 
= '*document_root C
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'no_content_do_contents_separate_element'} 
= '*document_root C
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -91,6 +93,7 @@ $result_tree_text{'no_content_do_contents_separate_element'} 
= '*document_root C
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -106,8 +109,9 @@ 
$result_tree_text{'no_content_do_contents_separate_element'} = '*document_root C
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/no_content_inline.pl 
b/tta/perl/t/results/html_tests/no_content_inline.pl
index afbe71112a..77a3145198 100644
--- a/tta/perl/t/results/html_tests/no_content_inline.pl
+++ b/tta/perl/t/results/html_tests/no_content_inline.pl
@@ -20,6 +20,7 @@ $result_tree_text{'no_content_inline'} = '*document_root C6
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'no_content_inline'} = '*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -91,6 +93,7 @@ $result_tree_text{'no_content_inline'} = '*document_root C6
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -106,8 +109,9 @@ $result_tree_text{'no_content_inline'} = '*document_root C6
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/no_content_separate_element.pl 
b/tta/perl/t/results/html_tests/no_content_separate_element.pl
index f8c31cf019..50cd034f06 100644
--- a/tta/perl/t/results/html_tests/no_content_separate_element.pl
+++ b/tta/perl/t/results/html_tests/no_content_separate_element.pl
@@ -20,6 +20,7 @@ $result_tree_text{'no_content_separate_element'} = 
'*document_root C6
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'no_content_separate_element'} = 
'*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -91,6 +93,7 @@ $result_tree_text{'no_content_separate_element'} = 
'*document_root C6
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -106,8 +109,9 @@ $result_tree_text{'no_content_separate_element'} = 
'*document_root C6
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/node_footnote_end.pl 
b/tta/perl/t/results/html_tests/node_footnote_end.pl
index 19b0dc61f3..bbb15a7442 100644
--- a/tta/perl/t/results/html_tests/node_footnote_end.pl
+++ b/tta/perl/t/results/html_tests/node_footnote_end.pl
@@ -21,6 +21,7 @@ $result_tree_text{'node_footnote_end'} = '*document_root C8
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -105,6 +106,7 @@ $result_tree_text{'node_footnote_end'} = '*document_root C8
  |is_target:{1}
  |menu_directions:D[next->E3|up->E0]
  |node_directions:D[next->E3|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{_00e1}
   *arguments_line C1
    *line_arg C1
@@ -141,6 +143,7 @@ $result_tree_text{'node_footnote_end'} = '*document_root C8
  |is_target:{1}
  |menu_directions:D[next->E4|prev->E2|up->E0]
  |node_directions:D[next->E4|prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{_00e2}
   *arguments_line C1
    *line_arg C1
@@ -180,6 +183,7 @@ $result_tree_text{'node_footnote_end'} = '*document_root C8
  |menu_directions:D[next->E7|prev->E3|up->E0]
  |menus:EC[E6]
  |node_directions:D[next->E7|prev->E3|up->E0]
+ |node_number:{4}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -194,6 +198,7 @@ $result_tree_text{'node_footnote_end'} = '*document_root C8
  |EXTRA
  |associated_anchor_command:[E4]
  |associated_node:[E4]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
@@ -247,6 +252,7 @@ $result_tree_text{'node_footnote_end'} = '*document_root C8
  |is_target:{1}
  |menu_directions:D[prev->E4|up->E4]
  |node_directions:D[prev->E4|up->E4]
+ |node_number:{5}
  |normalized:{_00e0}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/node_footnote_separated.pl 
b/tta/perl/t/results/html_tests/node_footnote_separated.pl
index 225fe9f81d..dc27e71afa 100644
--- a/tta/perl/t/results/html_tests/node_footnote_separated.pl
+++ b/tta/perl/t/results/html_tests/node_footnote_separated.pl
@@ -21,6 +21,7 @@ $result_tree_text{'node_footnote_separated'} = 
'*document_root C8
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -105,6 +106,7 @@ $result_tree_text{'node_footnote_separated'} = 
'*document_root C8
  |is_target:{1}
  |menu_directions:D[next->E3|up->E0]
  |node_directions:D[next->E3|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{_00e1}
   *arguments_line C1
    *line_arg C1
@@ -141,6 +143,7 @@ $result_tree_text{'node_footnote_separated'} = 
'*document_root C8
  |is_target:{1}
  |menu_directions:D[next->E4|prev->E2|up->E0]
  |node_directions:D[next->E4|prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{_00e2}
   *arguments_line C1
    *line_arg C1
@@ -180,6 +183,7 @@ $result_tree_text{'node_footnote_separated'} = 
'*document_root C8
  |menu_directions:D[next->E7|prev->E3|up->E0]
  |menus:EC[E6]
  |node_directions:D[next->E7|prev->E3|up->E0]
+ |node_number:{4}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -194,6 +198,7 @@ $result_tree_text{'node_footnote_separated'} = 
'*document_root C8
  |EXTRA
  |associated_anchor_command:[E4]
  |associated_node:[E4]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
@@ -247,6 +252,7 @@ $result_tree_text{'node_footnote_separated'} = 
'*document_root C8
  |is_target:{1}
  |menu_directions:D[prev->E4|up->E4]
  |node_directions:D[prev->E4|up->E4]
+ |node_number:{5}
  |normalized:{_00e0}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/node_footnote_use_node.pl 
b/tta/perl/t/results/html_tests/node_footnote_use_node.pl
index ddf11d7174..9c3b449119 100644
--- a/tta/perl/t/results/html_tests/node_footnote_use_node.pl
+++ b/tta/perl/t/results/html_tests/node_footnote_use_node.pl
@@ -21,6 +21,7 @@ $result_tree_text{'node_footnote_use_node'} = '*document_root 
C8
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -105,6 +106,7 @@ $result_tree_text{'node_footnote_use_node'} = 
'*document_root C8
  |is_target:{1}
  |menu_directions:D[next->E3|up->E0]
  |node_directions:D[next->E3|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{_00e1}
   *arguments_line C1
    *line_arg C1
@@ -141,6 +143,7 @@ $result_tree_text{'node_footnote_use_node'} = 
'*document_root C8
  |is_target:{1}
  |menu_directions:D[next->E4|prev->E2|up->E0]
  |node_directions:D[next->E4|prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{_00e2}
   *arguments_line C1
    *line_arg C1
@@ -180,6 +183,7 @@ $result_tree_text{'node_footnote_use_node'} = 
'*document_root C8
  |menu_directions:D[next->E7|prev->E3|up->E0]
  |menus:EC[E6]
  |node_directions:D[next->E7|prev->E3|up->E0]
+ |node_number:{4}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -194,6 +198,7 @@ $result_tree_text{'node_footnote_use_node'} = 
'*document_root C8
  |EXTRA
  |associated_anchor_command:[E4]
  |associated_node:[E4]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
@@ -247,6 +252,7 @@ $result_tree_text{'node_footnote_use_node'} = 
'*document_root C8
  |is_target:{1}
  |menu_directions:D[prev->E4|up->E4]
  |node_directions:D[prev->E4|up->E4]
+ |node_number:{5}
  |normalized:{_00e0}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/node_footnote_use_node_separate.pl 
b/tta/perl/t/results/html_tests/node_footnote_use_node_separate.pl
index f03c3f8b45..ab9ea3930a 100644
--- a/tta/perl/t/results/html_tests/node_footnote_use_node_separate.pl
+++ b/tta/perl/t/results/html_tests/node_footnote_use_node_separate.pl
@@ -21,6 +21,7 @@ $result_tree_text{'node_footnote_use_node_separate'} = 
'*document_root C8
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -105,6 +106,7 @@ $result_tree_text{'node_footnote_use_node_separate'} = 
'*document_root C8
  |is_target:{1}
  |menu_directions:D[next->E3|up->E0]
  |node_directions:D[next->E3|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{_00e1}
   *arguments_line C1
    *line_arg C1
@@ -141,6 +143,7 @@ $result_tree_text{'node_footnote_use_node_separate'} = 
'*document_root C8
  |is_target:{1}
  |menu_directions:D[next->E4|prev->E2|up->E0]
  |node_directions:D[next->E4|prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{_00e2}
   *arguments_line C1
    *line_arg C1
@@ -180,6 +183,7 @@ $result_tree_text{'node_footnote_use_node_separate'} = 
'*document_root C8
  |menu_directions:D[next->E7|prev->E3|up->E0]
  |menus:EC[E6]
  |node_directions:D[next->E7|prev->E3|up->E0]
+ |node_number:{4}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -194,6 +198,7 @@ $result_tree_text{'node_footnote_use_node_separate'} = 
'*document_root C8
  |EXTRA
  |associated_anchor_command:[E4]
  |associated_node:[E4]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
@@ -247,6 +252,7 @@ $result_tree_text{'node_footnote_use_node_separate'} = 
'*document_root C8
  |is_target:{1}
  |menu_directions:D[prev->E4|up->E4]
  |node_directions:D[prev->E4|up->E4]
+ |node_number:{5}
  |normalized:{_00e0}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/node_heading_between.pl 
b/tta/perl/t/results/html_tests/node_heading_between.pl
index eccfa4e8d4..0583fb5459 100644
--- a/tta/perl/t/results/html_tests/node_heading_between.pl
+++ b/tta/perl/t/results/html_tests/node_heading_between.pl
@@ -24,6 +24,7 @@ $result_tree_text{'node_heading_between'} = '*document_root C6
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Chapter}
   *arguments_line C1
    *line_arg C1
@@ -39,6 +40,7 @@ $result_tree_text{'node_heading_between'} = '*document_root C6
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_childs:EC[E5]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
@@ -60,6 +62,7 @@ $result_tree_text{'node_heading_between'} = '*document_root C6
  |EXTRA
  |associated_title_command:[E3]
  |is_target:{1}
+ |node_number:{2}
  |normalized:{Topic}
   *arguments_line C1
    *line_arg C1
@@ -74,6 +77,7 @@ $result_tree_text{'node_heading_between'} = '*document_root C6
   |EXTRA
   |associated_anchor_command:[E2]
   |global_command_number:{1}
+  |heading_number:{1}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -89,6 +93,7 @@ $result_tree_text{'node_heading_between'} = '*document_root C6
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[up->E0]
+ |node_number:{3}
  |normalized:{Section}
   *arguments_line C1
    *line_arg C1
@@ -104,8 +109,9 @@ $result_tree_text{'node_heading_between'} = '*document_root 
C6
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[up->E1]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/html_tests/nodedescription_description.pl 
b/tta/perl/t/results/html_tests/nodedescription_description.pl
index a891e3e856..b4894b6f4b 100644
--- a/tta/perl/t/results/html_tests/nodedescription_description.pl
+++ b/tta/perl/t/results/html_tests/nodedescription_description.pl
@@ -16,6 +16,7 @@ $result_tree_text{'nodedescription_description'} = 
'*document_root C9
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'nodedescription_description'} = 
'*document_root C9
  |associated_node:[E0]
  |section_childs:EC[E3|E7|E10]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -56,6 +58,7 @@ $result_tree_text{'nodedescription_description'} = 
'*document_root C9
  |node_description:[E4]
  |node_directions:D[next->E6|prev->E0|up->E0]
  |node_long_description:[E5]
+ |node_number:{2}
  |normalized:{toto}
   *arguments_line C1
    *line_arg C1
@@ -71,8 +74,9 @@ $result_tree_text{'nodedescription_description'} = 
'*document_root C9
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E7|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E7|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -146,6 +150,7 @@ $result_tree_text{'nodedescription_description'} = 
'*document_root C9
  |node_description:[E8]
  |node_directions:D[next->E9|prev->E2|up->E0]
  |node_long_description:[E8]
+ |node_number:{3}
  |normalized:{titi}
   *arguments_line C1
    *line_arg C1
@@ -161,8 +166,9 @@ $result_tree_text{'nodedescription_description'} = 
'*document_root C9
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[next->E10|prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E10|prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -203,6 +209,7 @@ $result_tree_text{'nodedescription_description'} = 
'*document_root C9
  |is_target:{1}
  |node_description:[E11]
  |node_directions:D[prev->E6|up->E0]
+ |node_number:{4}
  |normalized:{other}
   *arguments_line C1
    *line_arg C1
@@ -218,8 +225,9 @@ $result_tree_text{'nodedescription_description'} = 
'*document_root C9
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[prev->E7|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{4}
  |toplevel_directions:D[prev->E7|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/html_tests/nodedescription_description_no_use_nodes.pl 
b/tta/perl/t/results/html_tests/nodedescription_description_no_use_nodes.pl
index 0408e450ce..c69861496d 100644
--- a/tta/perl/t/results/html_tests/nodedescription_description_no_use_nodes.pl
+++ b/tta/perl/t/results/html_tests/nodedescription_description_no_use_nodes.pl
@@ -16,6 +16,7 @@ $result_tree_text{'nodedescription_description_no_use_nodes'} 
= '*document_root
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'nodedescription_description_no_use_nodes'} 
= '*document_root
  |associated_node:[E0]
  |section_childs:EC[E3|E7|E10]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -56,6 +58,7 @@ $result_tree_text{'nodedescription_description_no_use_nodes'} 
= '*document_root
  |node_description:[E4]
  |node_directions:D[next->E6|prev->E0|up->E0]
  |node_long_description:[E5]
+ |node_number:{2}
  |normalized:{toto}
   *arguments_line C1
    *line_arg C1
@@ -71,8 +74,9 @@ $result_tree_text{'nodedescription_description_no_use_nodes'} 
= '*document_root
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E7|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E7|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -146,6 +150,7 @@ 
$result_tree_text{'nodedescription_description_no_use_nodes'} = '*document_root
  |node_description:[E8]
  |node_directions:D[next->E9|prev->E2|up->E0]
  |node_long_description:[E8]
+ |node_number:{3}
  |normalized:{titi}
   *arguments_line C1
    *line_arg C1
@@ -161,8 +166,9 @@ 
$result_tree_text{'nodedescription_description_no_use_nodes'} = '*document_root
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[next->E10|prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E10|prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -203,6 +209,7 @@ 
$result_tree_text{'nodedescription_description_no_use_nodes'} = '*document_root
  |is_target:{1}
  |node_description:[E11]
  |node_directions:D[prev->E6|up->E0]
+ |node_number:{4}
  |normalized:{other}
   *arguments_line C1
    *line_arg C1
@@ -218,8 +225,9 @@ 
$result_tree_text{'nodedescription_description_no_use_nodes'} = '*document_root
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[prev->E7|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{4}
  |toplevel_directions:D[prev->E7|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/redirection_same_labels.pl 
b/tta/perl/t/results/html_tests/redirection_same_labels.pl
index 3a92ee67d2..769475ec8e 100644
--- a/tta/perl/t/results/html_tests/redirection_same_labels.pl
+++ b/tta/perl/t/results/html_tests/redirection_same_labels.pl
@@ -24,6 +24,7 @@ NodeForward: [U1]
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -40,6 +41,7 @@ NodeForward: [U1]
  |associated_node:[E0]
  |section_childs:EC[E4|E9]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -127,6 +129,7 @@ NodeBack: [U0]
  |menu_directions:D[next->E8|up->E0]
  |menus:EC[E5]
  |node_directions:D[next->E8|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{umlaut}
   *arguments_line C1
    *line_arg C1
@@ -142,8 +145,9 @@ NodeBack: [U0]
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E9|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E9|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -206,6 +210,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[next->E7|up->E3]
  |node_directions:D[next->E7|up->E3]
+ |node_number:{3}
  |normalized:{_00ef}
   *arguments_line C1
    *line_arg C1
@@ -224,6 +229,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[prev->E6|up->E3]
  |node_directions:D[prev->E6|up->E3]
+ |node_number:{4}
  |normalized:{_0129}
   *arguments_line C1
    *line_arg C1
@@ -259,6 +265,7 @@ NodeBack: [U2]
  |menu_directions:D[prev->E3|up->E0]
  |menus:EC[E10]
  |node_directions:D[prev->E3|up->E0]
+ |node_number:{5}
  |normalized:{circumflex}
   *arguments_line C1
    *line_arg C1
@@ -274,8 +281,9 @@ NodeBack: [U2]
  |associated_anchor_command:[E8]
  |associated_node:[E8]
  |section_directions:D[prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -323,6 +331,7 @@ NodeBack: [U2]
  |is_target:{1}
  |menu_directions:D[up->E8]
  |node_directions:D[up->E8]
+ |node_number:{6}
  |normalized:{_00ee}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/ref_in_preformatted.pl 
b/tta/perl/t/results/html_tests/ref_in_preformatted.pl
index eb31e9818c..b57a9b2ca3 100644
--- a/tta/perl/t/results/html_tests/ref_in_preformatted.pl
+++ b/tta/perl/t/results/html_tests/ref_in_preformatted.pl
@@ -14,6 +14,7 @@ $result_tree_text{'ref_in_preformatted'} = '*document_root C3
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -87,6 +88,7 @@ $result_tree_text{'ref_in_preformatted'} = '*document_root C3
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap-nnn-the-node-name}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/sectioning_check_menu_structure.pl 
b/tta/perl/t/results/html_tests/sectioning_check_menu_structure.pl
index d1f1035270..747e745a24 100644
--- a/tta/perl/t/results/html_tests/sectioning_check_menu_structure.pl
+++ b/tta/perl/t/results/html_tests/sectioning_check_menu_structure.pl
@@ -20,6 +20,7 @@ $result_tree_text{'sectioning_check_menu_structure'} = 
'*document_root C29
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3|prev->MISSING: (line_arg)[C3]]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C3
    *line_arg C1
@@ -44,6 +45,7 @@ $result_tree_text{'sectioning_check_menu_structure'} = 
'*document_root C29
  |associated_node:[E0]
  |section_childs:EC[E4|E26|E28]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -173,6 +175,7 @@ $result_tree_text{'sectioning_check_menu_structure'} = 
'*document_root C29
  |menu_directions:D[next->E24|up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{First-node}
   *arguments_line C4
    *line_arg C1
@@ -200,8 +203,9 @@ $result_tree_text{'sectioning_check_menu_structure'} = 
'*document_root C29
  |associated_node:[E3]
  |section_childs:EC[E7|E18|E23]
  |section_directions:D[next->E26|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E26|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -277,6 +281,7 @@ $result_tree_text{'sectioning_check_menu_structure'} = 
'*document_root C29
  |menu_directions:D[next->E17|up->E3]
  |menus:EC[E8]
  |node_directions:D[next->E17|up->E3]
+ |node_number:{3}
  |normalized:{unnumbered}
   *arguments_line C1
    *line_arg C1
@@ -294,6 +299,7 @@ $result_tree_text{'sectioning_check_menu_structure'} = 
'*document_root C29
  |section_childs:EC[E10|E12|E14|E16]
  |section_directions:D[next->E18|up->E4]
  |section_level:{2}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -373,6 +379,7 @@ $result_tree_text{'sectioning_check_menu_structure'} = 
'*document_root C29
  |is_target:{1}
  |menu_directions:D[next->E11|up->E6]
  |node_directions:D[next->E11|up->E6]
+ |node_number:{4}
  |normalized:{unnumbered-sub}
   *arguments_line C1
    *line_arg C1
@@ -389,6 +396,7 @@ $result_tree_text{'sectioning_check_menu_structure'} = 
'*document_root C29
  |associated_node:[E9]
  |section_directions:D[next->E12|up->E7]
  |section_level:{3}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -406,6 +414,7 @@ $result_tree_text{'sectioning_check_menu_structure'} = 
'*document_root C29
  |is_target:{1}
  |menu_directions:D[next->E13|prev->E9|up->E6]
  |node_directions:D[next->E13|prev->E9|up->E6]
+ |node_number:{5}
  |normalized:{numbered-sub}
   *arguments_line C1
    *line_arg C1
@@ -422,6 +431,7 @@ $result_tree_text{'sectioning_check_menu_structure'} = 
'*document_root C29
  |associated_node:[E11]
  |section_directions:D[next->E14|prev->E10|up->E7]
  |section_level:{3}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -439,6 +449,7 @@ $result_tree_text{'sectioning_check_menu_structure'} = 
'*document_root C29
  |is_target:{1}
  |menu_directions:D[next->E15|prev->E11|up->E6]
  |node_directions:D[next->E15|prev->E11|up->E6]
+ |node_number:{6}
  |normalized:{unnumbered-sub2}
   *arguments_line C1
    *line_arg C1
@@ -455,6 +466,7 @@ $result_tree_text{'sectioning_check_menu_structure'} = 
'*document_root C29
  |associated_node:[E13]
  |section_directions:D[next->E16|prev->E12|up->E7]
  |section_level:{3}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -472,6 +484,7 @@ $result_tree_text{'sectioning_check_menu_structure'} = 
'*document_root C29
  |is_target:{1}
  |menu_directions:D[prev->E13|up->E6]
  |node_directions:D[prev->E13|up->E6]
+ |node_number:{7}
  |normalized:{numbered-sub2}
   *arguments_line C1
    *line_arg C1
@@ -488,6 +501,7 @@ $result_tree_text{'sectioning_check_menu_structure'} = 
'*document_root C29
  |associated_node:[E15]
  |section_directions:D[prev->E14|up->E7]
  |section_level:{3}
+ |section_number:{7}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -506,6 +520,7 @@ $result_tree_text{'sectioning_check_menu_structure'} = 
'*document_root C29
  |menu_directions:D[next->E22|prev->E6|up->E3]
  |menus:EC[E19]
  |node_directions:D[next->E22|prev->E6|up->E3]
+ |node_number:{8}
  |normalized:{unnumbered2}
   *arguments_line C1
    *line_arg C1
@@ -523,6 +538,7 @@ $result_tree_text{'sectioning_check_menu_structure'} = 
'*document_root C29
  |section_childs:EC[E21]
  |section_directions:D[next->E23|prev->E7|up->E4]
  |section_level:{2}
+ |section_number:{8}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -569,6 +585,7 @@ $result_tree_text{'sectioning_check_menu_structure'} = 
'*document_root C29
  |is_target:{1}
  |menu_directions:D[up->E17]
  |node_directions:D[up->E17]
+ |node_number:{9}
  |normalized:{numbered-sub3}
   *arguments_line C1
    *line_arg C1
@@ -585,6 +602,7 @@ $result_tree_text{'sectioning_check_menu_structure'} = 
'*document_root C29
  |associated_node:[E20]
  |section_directions:D[up->E18]
  |section_level:{3}
+ |section_number:{9}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -603,6 +621,7 @@ $result_tree_text{'sectioning_check_menu_structure'} = 
'*document_root C29
  |is_target:{1}
  |menu_directions:D[prev->E17|up->E3]
  |node_directions:D[prev->E17|up->E3]
+ |node_number:{10}
  |normalized:{numbered}
   *arguments_line C1
    *line_arg C1
@@ -618,8 +637,9 @@ $result_tree_text{'sectioning_check_menu_structure'} = 
'*document_root C29
  |associated_anchor_command:[E22]
  |associated_node:[E22]
  |section_directions:D[prev->E18|up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{10}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -635,6 +655,7 @@ $result_tree_text{'sectioning_check_menu_structure'} = 
'*document_root C29
  |is_target:{1}
  |menu_directions:D[next->E25|prev->E3|up->E0]
  |node_directions:D[up->E0]
+ |node_number:{11}
  |normalized:{between-node}
   *arguments_line C4
    *line_arg C1
@@ -663,6 +684,7 @@ $result_tree_text{'sectioning_check_menu_structure'} = 
'*document_root C29
  |is_target:{1}
  |menu_directions:D[next->E27|prev->E24|up->E0]
  |node_directions:D[next->E27|up->E0]
+ |node_number:{12}
  |normalized:{Second-node}
   *arguments_line C4
    *line_arg C1
@@ -693,8 +715,9 @@ $result_tree_text{'sectioning_check_menu_structure'} = 
'*document_root C29
  |associated_anchor_command:[E25]
  |associated_node:[E25]
  |section_directions:D[next->E28|prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{11}
  |toplevel_directions:D[next->E28|prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -716,6 +739,7 @@ $result_tree_text{'sectioning_check_menu_structure'} = 
'*document_root C29
  |is_target:{1}
  |menu_directions:D[next->E29|prev->E25|up->E0]
  |node_directions:D[next->E29|prev->E25|up->E0]
+ |node_number:{13}
  |normalized:{Third-node-unnumbered}
   *arguments_line C1
    *line_arg C1
@@ -732,6 +756,7 @@ $result_tree_text{'sectioning_check_menu_structure'} = 
'*document_root C29
  |associated_node:[E27]
  |section_directions:D[prev->E26|up->E1]
  |section_level:{1}
+ |section_number:{12}
  |toplevel_directions:D[prev->E26|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -752,6 +777,7 @@ $result_tree_text{'sectioning_check_menu_structure'} = 
'*document_root C29
  |is_target:{1}
  |menu_directions:D[prev->E27|up->E0]
  |node_directions:D[prev->E27|up->E0]
+ |node_number:{14}
  |normalized:{Last-node-no-description}
   *arguments_line C4
    *line_arg C1
diff --git 
a/tta/perl/t/results/html_tests/set_add_transliterated_redirection_files.pl 
b/tta/perl/t/results/html_tests/set_add_transliterated_redirection_files.pl
index cab8bc4468..0321d56967 100644
--- a/tta/perl/t/results/html_tests/set_add_transliterated_redirection_files.pl
+++ b/tta/perl/t/results/html_tests/set_add_transliterated_redirection_files.pl
@@ -16,6 +16,7 @@ $result_tree_text{'set_add_transliterated_redirection_files'} 
= '*document_root
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'set_add_transliterated_redirection_files'} 
= '*document_root
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'set_add_transliterated_redirection_files'} 
= '*document_root
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Chap}
   *arguments_line C1
    *line_arg C1
@@ -70,8 +73,9 @@ $result_tree_text{'set_add_transliterated_redirection_files'} 
= '*document_root
  |associated_node:[E2]
  |section_childs:EC[E5]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -89,6 +93,7 @@ $result_tree_text{'set_add_transliterated_redirection_files'} 
= '*document_root
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[up->E2]
+ |node_number:{3}
  |normalized:{s_00e8c}
   *arguments_line C1
    *line_arg C3
@@ -108,8 +113,9 @@ 
$result_tree_text{'set_add_transliterated_redirection_files'} = '*document_root
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[up->E3]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/html_tests/set_unit_file_name_filepath.pl 
b/tta/perl/t/results/html_tests/set_unit_file_name_filepath.pl
index 4e40548e19..a7cfa029ea 100644
--- a/tta/perl/t/results/html_tests/set_unit_file_name_filepath.pl
+++ b/tta/perl/t/results/html_tests/set_unit_file_name_filepath.pl
@@ -16,6 +16,7 @@ $result_tree_text{'set_unit_file_name_filepath'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'set_unit_file_name_filepath'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'set_unit_file_name_filepath'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'set_unit_file_name_filepath'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/shortcontents_no_top.pl 
b/tta/perl/t/results/html_tests/shortcontents_no_top.pl
index 5405fcf086..33542a11bd 100644
--- a/tta/perl/t/results/html_tests/shortcontents_no_top.pl
+++ b/tta/perl/t/results/html_tests/shortcontents_no_top.pl
@@ -12,6 +12,7 @@ $result_tree_text{'shortcontents_no_top'} = '*document_root C4
   |{ }
  |EXTRA
  |section_directions:D[next->E1]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
@@ -34,6 +35,7 @@ $result_tree_text{'shortcontents_no_top'} = '*document_root C4
  |EXTRA
  |section_childs:EC[E2]
  |section_directions:D[prev->E0]
+ |section_heading_number:{2}
  |section_level:{1}
  |section_number:{2}
  |toplevel_directions:D[prev->E0]
@@ -50,8 +52,9 @@ $result_tree_text{'shortcontents_no_top'} = '*document_root C4
   |{ }
  |EXTRA
  |section_directions:D[up->E1]
+ |section_heading_number:{2.1}
  |section_level:{2}
- |section_number:{2.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/html_tests/shorttitlepage.pl 
b/tta/perl/t/results/html_tests/shorttitlepage.pl
index c379727b72..0b7c46ab06 100644
--- a/tta/perl/t/results/html_tests/shorttitlepage.pl
+++ b/tta/perl/t/results/html_tests/shorttitlepage.pl
@@ -33,6 +33,7 @@ $result_tree_text{'shorttitlepage'} = '*document_root C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -48,6 +49,7 @@ $result_tree_text{'shorttitlepage'} = '*document_root C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/html_tests/simple_only_special_spaces_node.pl 
b/tta/perl/t/results/html_tests/simple_only_special_spaces_node.pl
index 32b4c03b00..5abf26c81a 100644
--- a/tta/perl/t/results/html_tests/simple_only_special_spaces_node.pl
+++ b/tta/perl/t/results/html_tests/simple_only_special_spaces_node.pl
@@ -16,6 +16,7 @@ $result_tree_text{'simple_only_special_spaces_node'} = 
'*document_root C9
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'simple_only_special_spaces_node'} = 
'*document_root C9
  |associated_node:[E0]
  |section_childs:EC[E3|E5|E7]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'simple_only_special_spaces_node'} = 
'*document_root C9
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{_2002_2003}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'simple_only_special_spaces_node'} = 
'*document_root C9
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -96,8 +100,9 @@ $result_tree_text{'simple_only_special_spaces_node'} = 
'*document_root C9
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[next->E7|prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E7|prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -115,6 +120,7 @@ $result_tree_text{'simple_only_special_spaces_node'} = 
'*document_root C9
  |associated_title_command:[E7]
  |is_target:{1}
  |node_directions:D[prev->E4|up->E0]
+ |node_number:{3}
  |normalized:{_2004_2005}
   *arguments_line C1
    *line_arg C1
@@ -130,8 +136,9 @@ $result_tree_text{'simple_only_special_spaces_node'} = 
'*document_root C9
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[prev->E5|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{4}
  |toplevel_directions:D[prev->E5|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/html_tests/simple_only_special_spaces_node_no_translit_files.pl
 
b/tta/perl/t/results/html_tests/simple_only_special_spaces_node_no_translit_files.pl
index 9e14a47087..7a418883df 100644
--- 
a/tta/perl/t/results/html_tests/simple_only_special_spaces_node_no_translit_files.pl
+++ 
b/tta/perl/t/results/html_tests/simple_only_special_spaces_node_no_translit_files.pl
@@ -16,6 +16,7 @@ 
$result_tree_text{'simple_only_special_spaces_node_no_translit_files'} = '*docum
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ 
$result_tree_text{'simple_only_special_spaces_node_no_translit_files'} = '*docum
  |associated_node:[E0]
  |section_childs:EC[E3|E5|E7]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ 
$result_tree_text{'simple_only_special_spaces_node_no_translit_files'} = '*docum
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{_2002_2003}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ 
$result_tree_text{'simple_only_special_spaces_node_no_translit_files'} = '*docum
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -96,8 +100,9 @@ 
$result_tree_text{'simple_only_special_spaces_node_no_translit_files'} = '*docum
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[next->E7|prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E7|prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -115,6 +120,7 @@ 
$result_tree_text{'simple_only_special_spaces_node_no_translit_files'} = '*docum
  |associated_title_command:[E7]
  |is_target:{1}
  |node_directions:D[prev->E4|up->E0]
+ |node_number:{3}
  |normalized:{_2004_2005}
   *arguments_line C1
    *line_arg C1
@@ -130,8 +136,9 @@ 
$result_tree_text{'simple_only_special_spaces_node_no_translit_files'} = '*docum
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[prev->E5|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{4}
  |toplevel_directions:D[prev->E5|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/simplest_test_date_in_header.pl 
b/tta/perl/t/results/html_tests/simplest_test_date_in_header.pl
index 6343dda348..736cd28617 100644
--- a/tta/perl/t/results/html_tests/simplest_test_date_in_header.pl
+++ b/tta/perl/t/results/html_tests/simplest_test_date_in_header.pl
@@ -16,6 +16,7 @@ $result_tree_text{'simplest_test_date_in_header'} = 
'*document_root C3
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/split_html_text.pl 
b/tta/perl/t/results/html_tests/split_html_text.pl
index cfde4a2d62..63eadc12a3 100644
--- a/tta/perl/t/results/html_tests/split_html_text.pl
+++ b/tta/perl/t/results/html_tests/split_html_text.pl
@@ -22,6 +22,7 @@ NodeForward: [U1]
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -38,6 +39,7 @@ NodeForward: [U1]
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -72,6 +74,7 @@ NodeBack: [U0]
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -87,8 +90,9 @@ NodeBack: [U0]
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/test_accents_sc_default.pl 
b/tta/perl/t/results/html_tests/test_accents_sc_default.pl
index 5f0eb29323..79ba6b1d04 100644
--- a/tta/perl/t/results/html_tests/test_accents_sc_default.pl
+++ b/tta/perl/t/results/html_tests/test_accents_sc_default.pl
@@ -19,6 +19,7 @@ $result_tree_text{'test_accents_sc_default'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -35,6 +36,7 @@ $result_tree_text{'test_accents_sc_default'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -57,6 +59,7 @@ $result_tree_text{'test_accents_sc_default'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node-chap}
   *arguments_line C1
    *line_arg C1
@@ -72,8 +75,9 @@ $result_tree_text{'test_accents_sc_default'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/test_accents_sc_default_latin1.pl 
b/tta/perl/t/results/html_tests/test_accents_sc_default_latin1.pl
index f9b04c306f..7732106ff6 100644
--- a/tta/perl/t/results/html_tests/test_accents_sc_default_latin1.pl
+++ b/tta/perl/t/results/html_tests/test_accents_sc_default_latin1.pl
@@ -33,6 +33,7 @@ $result_tree_text{'test_accents_sc_default_latin1'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -49,6 +50,7 @@ $result_tree_text{'test_accents_sc_default_latin1'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -71,6 +73,7 @@ $result_tree_text{'test_accents_sc_default_latin1'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node-chap}
   *arguments_line C1
    *line_arg C1
@@ -86,8 +89,9 @@ $result_tree_text{'test_accents_sc_default_latin1'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/test_accents_sc_default_usascii.pl 
b/tta/perl/t/results/html_tests/test_accents_sc_default_usascii.pl
index 5392ca14f7..1e27556571 100644
--- a/tta/perl/t/results/html_tests/test_accents_sc_default_usascii.pl
+++ b/tta/perl/t/results/html_tests/test_accents_sc_default_usascii.pl
@@ -33,6 +33,7 @@ $result_tree_text{'test_accents_sc_default_usascii'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -49,6 +50,7 @@ $result_tree_text{'test_accents_sc_default_usascii'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -71,6 +73,7 @@ $result_tree_text{'test_accents_sc_default_usascii'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node-chap}
   *arguments_line C1
    *line_arg C1
@@ -86,8 +89,9 @@ $result_tree_text{'test_accents_sc_default_usascii'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/test_accents_sc_enable_encoding.pl 
b/tta/perl/t/results/html_tests/test_accents_sc_enable_encoding.pl
index c98553f9ef..ea37db8054 100644
--- a/tta/perl/t/results/html_tests/test_accents_sc_enable_encoding.pl
+++ b/tta/perl/t/results/html_tests/test_accents_sc_enable_encoding.pl
@@ -19,6 +19,7 @@ $result_tree_text{'test_accents_sc_enable_encoding'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -35,6 +36,7 @@ $result_tree_text{'test_accents_sc_enable_encoding'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -57,6 +59,7 @@ $result_tree_text{'test_accents_sc_enable_encoding'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node-chap}
   *arguments_line C1
    *line_arg C1
@@ -72,8 +75,9 @@ $result_tree_text{'test_accents_sc_enable_encoding'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/html_tests/test_accents_sc_enable_encoding_latin1.pl 
b/tta/perl/t/results/html_tests/test_accents_sc_enable_encoding_latin1.pl
index 5b092e1ca6..dbfd171ef2 100644
--- a/tta/perl/t/results/html_tests/test_accents_sc_enable_encoding_latin1.pl
+++ b/tta/perl/t/results/html_tests/test_accents_sc_enable_encoding_latin1.pl
@@ -33,6 +33,7 @@ $result_tree_text{'test_accents_sc_enable_encoding_latin1'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -49,6 +50,7 @@ $result_tree_text{'test_accents_sc_enable_encoding_latin1'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -71,6 +73,7 @@ $result_tree_text{'test_accents_sc_enable_encoding_latin1'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node-chap}
   *arguments_line C1
    *line_arg C1
@@ -86,8 +89,9 @@ $result_tree_text{'test_accents_sc_enable_encoding_latin1'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_latin1.pl
 
b/tta/perl/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_latin1.pl
index a04e0095ce..b96a0092c6 100644
--- 
a/tta/perl/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_latin1.pl
+++ 
b/tta/perl/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_latin1.pl
@@ -33,6 +33,7 @@ 
$result_tree_text{'test_accents_sc_enable_encoding_to_utf8_latin1'} = '*document
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -49,6 +50,7 @@ 
$result_tree_text{'test_accents_sc_enable_encoding_to_utf8_latin1'} = '*document
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -71,6 +73,7 @@ 
$result_tree_text{'test_accents_sc_enable_encoding_to_utf8_latin1'} = '*document
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node-chap}
   *arguments_line C1
    *line_arg C1
@@ -86,8 +89,9 @@ 
$result_tree_text{'test_accents_sc_enable_encoding_to_utf8_latin1'} = '*document
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_usascii.pl
 
b/tta/perl/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_usascii.pl
index 418f7329a6..0450eefbad 100644
--- 
a/tta/perl/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_usascii.pl
+++ 
b/tta/perl/t/results/html_tests/test_accents_sc_enable_encoding_to_utf8_usascii.pl
@@ -33,6 +33,7 @@ 
$result_tree_text{'test_accents_sc_enable_encoding_to_utf8_usascii'} = '*documen
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -49,6 +50,7 @@ 
$result_tree_text{'test_accents_sc_enable_encoding_to_utf8_usascii'} = '*documen
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -71,6 +73,7 @@ 
$result_tree_text{'test_accents_sc_enable_encoding_to_utf8_usascii'} = '*documen
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node-chap}
   *arguments_line C1
    *line_arg C1
@@ -86,8 +89,9 @@ 
$result_tree_text{'test_accents_sc_enable_encoding_to_utf8_usascii'} = '*documen
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/html_tests/test_accents_sc_enable_encoding_usascii.pl 
b/tta/perl/t/results/html_tests/test_accents_sc_enable_encoding_usascii.pl
index 639c2ea1db..1efc2d636f 100644
--- a/tta/perl/t/results/html_tests/test_accents_sc_enable_encoding_usascii.pl
+++ b/tta/perl/t/results/html_tests/test_accents_sc_enable_encoding_usascii.pl
@@ -33,6 +33,7 @@ $result_tree_text{'test_accents_sc_enable_encoding_usascii'} 
= '*document_root C
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -49,6 +50,7 @@ $result_tree_text{'test_accents_sc_enable_encoding_usascii'} 
= '*document_root C
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -71,6 +73,7 @@ $result_tree_text{'test_accents_sc_enable_encoding_usascii'} 
= '*document_root C
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node-chap}
   *arguments_line C1
    *line_arg C1
@@ -86,8 +89,9 @@ $result_tree_text{'test_accents_sc_enable_encoding_usascii'} 
= '*document_root C
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/test_accents_sc_to_utf8_latin1.pl 
b/tta/perl/t/results/html_tests/test_accents_sc_to_utf8_latin1.pl
index b25f6ad020..2a408e2d48 100644
--- a/tta/perl/t/results/html_tests/test_accents_sc_to_utf8_latin1.pl
+++ b/tta/perl/t/results/html_tests/test_accents_sc_to_utf8_latin1.pl
@@ -33,6 +33,7 @@ $result_tree_text{'test_accents_sc_to_utf8_latin1'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -49,6 +50,7 @@ $result_tree_text{'test_accents_sc_to_utf8_latin1'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -71,6 +73,7 @@ $result_tree_text{'test_accents_sc_to_utf8_latin1'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node-chap}
   *arguments_line C1
    *line_arg C1
@@ -86,8 +89,9 @@ $result_tree_text{'test_accents_sc_to_utf8_latin1'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/html_tests/test_accents_sc_use_numeric_entity.pl 
b/tta/perl/t/results/html_tests/test_accents_sc_use_numeric_entity.pl
index 17cda24a8a..15eba13cb9 100644
--- a/tta/perl/t/results/html_tests/test_accents_sc_use_numeric_entity.pl
+++ b/tta/perl/t/results/html_tests/test_accents_sc_use_numeric_entity.pl
@@ -19,6 +19,7 @@ $result_tree_text{'test_accents_sc_use_numeric_entity'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -35,6 +36,7 @@ $result_tree_text{'test_accents_sc_use_numeric_entity'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -57,6 +59,7 @@ $result_tree_text{'test_accents_sc_use_numeric_entity'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node-chap}
   *arguments_line C1
    *line_arg C1
@@ -72,8 +75,9 @@ $result_tree_text{'test_accents_sc_use_numeric_entity'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/html_tests/test_separated_contents_shortcontents.pl 
b/tta/perl/t/results/html_tests/test_separated_contents_shortcontents.pl
index 670ca25c25..fe05d1530a 100644
--- a/tta/perl/t/results/html_tests/test_separated_contents_shortcontents.pl
+++ b/tta/perl/t/results/html_tests/test_separated_contents_shortcontents.pl
@@ -21,6 +21,7 @@ $result_tree_text{'test_separated_contents_shortcontents'} = 
'*document_root C7
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -37,6 +38,7 @@ $result_tree_text{'test_separated_contents_shortcontents'} = 
'*document_root C7
  |associated_node:[E0]
  |section_childs:EC[E3|E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -59,6 +61,7 @@ $result_tree_text{'test_separated_contents_shortcontents'} = 
'*document_root C7
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -74,8 +77,9 @@ $result_tree_text{'test_separated_contents_shortcontents'} = 
'*document_root C7
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -93,6 +97,7 @@ $result_tree_text{'test_separated_contents_shortcontents'} = 
'*document_root C7
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{app}
   *arguments_line C1
    *line_arg C1
@@ -108,8 +113,9 @@ $result_tree_text{'test_separated_contents_shortcontents'} 
= '*document_root C7
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[prev->E3|up->E1]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{3}
  |toplevel_directions:D[prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/test_xrefautomaticsectiontitle.pl 
b/tta/perl/t/results/html_tests/test_xrefautomaticsectiontitle.pl
index bdc835fba6..19087204a3 100644
--- a/tta/perl/t/results/html_tests/test_xrefautomaticsectiontitle.pl
+++ b/tta/perl/t/results/html_tests/test_xrefautomaticsectiontitle.pl
@@ -16,6 +16,7 @@ $result_tree_text{'test_xrefautomaticsectiontitle'} = 
'*document_root C5
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'test_xrefautomaticsectiontitle'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -84,6 +86,7 @@ $result_tree_text{'test_xrefautomaticsectiontitle'} = 
'*document_root C5
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -99,8 +102,9 @@ $result_tree_text{'test_xrefautomaticsectiontitle'} = 
'*document_root C5
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl 
b/tta/perl/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
index ce48dc8cc6..f64eeda680 100644
--- a/tta/perl/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
+++ b/tta/perl/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
@@ -30,6 +30,7 @@ $result_tree_text{'test_xrefautomaticsectiontitle_off_first'} 
= '*document_root
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -46,6 +47,7 @@ $result_tree_text{'test_xrefautomaticsectiontitle_off_first'} 
= '*document_root
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -98,6 +100,7 @@ 
$result_tree_text{'test_xrefautomaticsectiontitle_off_first'} = '*document_root
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -113,8 +116,9 @@ 
$result_tree_text{'test_xrefautomaticsectiontitle_off_first'} = '*document_root
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/html_tests/text_before_top_and_contents_after_title.pl 
b/tta/perl/t/results/html_tests/text_before_top_and_contents_after_title.pl
index 2628343473..d2d72d9e59 100644
--- a/tta/perl/t/results/html_tests/text_before_top_and_contents_after_title.pl
+++ b/tta/perl/t/results/html_tests/text_before_top_and_contents_after_title.pl
@@ -18,6 +18,7 @@ $result_tree_text{'text_before_top_and_contents_after_title'} 
= '*document_root
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -34,6 +35,7 @@ $result_tree_text{'text_before_top_and_contents_after_title'} 
= '*document_root
  |associated_node:[E0]
  |section_childs:EC[E2]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -56,8 +58,9 @@ $result_tree_text{'text_before_top_and_contents_after_title'} 
= '*document_root
   |{ }
  |EXTRA
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl
 
b/tta/perl/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl
index 4a18805e01..c13c492643 100644
--- 
a/tta/perl/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl
+++ 
b/tta/perl/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl
@@ -18,6 +18,7 @@ 
$result_tree_text{'text_before_top_and_summarycontents_after_title'} = '*documen
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -34,6 +35,7 @@ 
$result_tree_text{'text_before_top_and_summarycontents_after_title'} = '*documen
  |associated_node:[E0]
  |section_childs:EC[E2]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -56,8 +58,9 @@ 
$result_tree_text{'text_before_top_and_summarycontents_after_title'} = '*documen
   |{ }
  |EXTRA
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/text_css_info_in_init.pl 
b/tta/perl/t/results/html_tests/text_css_info_in_init.pl
index 319040102b..fbae0f01fc 100644
--- a/tta/perl/t/results/html_tests/text_css_info_in_init.pl
+++ b/tta/perl/t/results/html_tests/text_css_info_in_init.pl
@@ -15,6 +15,7 @@ $result_tree_text{'text_css_info_in_init'} = '*document_root 
C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -30,6 +31,7 @@ $result_tree_text{'text_css_info_in_init'} = '*document_root 
C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/html_tests/titles.pl 
b/tta/perl/t/results/html_tests/titles.pl
index a6322ba3bc..e36d6e7a69 100644
--- a/tta/perl/t/results/html_tests/titles.pl
+++ b/tta/perl/t/results/html_tests/titles.pl
@@ -33,6 +33,7 @@ $result_tree_text{'titles'} = '*document_root C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -48,6 +49,7 @@ $result_tree_text{'titles'} = '*document_root C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git 
a/tta/perl/t/results/html_tests/top_file_name_and_node_name_collision.pl 
b/tta/perl/t/results/html_tests/top_file_name_and_node_name_collision.pl
index 1911bf23d6..364f5e527d 100644
--- a/tta/perl/t/results/html_tests/top_file_name_and_node_name_collision.pl
+++ b/tta/perl/t/results/html_tests/top_file_name_and_node_name_collision.pl
@@ -16,6 +16,7 @@ $result_tree_text{'top_file_name_and_node_name_collision'} = 
'*document_root C6
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{my-node}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'top_file_name_and_node_name_collision'} = 
'*document_root C6
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_directions:D[next->E3]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
@@ -55,6 +57,7 @@ $result_tree_text{'top_file_name_and_node_name_collision'} = 
'*document_root C6
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{other-node}
   *arguments_line C1
    *line_arg C1
@@ -70,6 +73,7 @@ $result_tree_text{'top_file_name_and_node_name_collision'} = 
'*document_root C6
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E4|prev->E1]
+ |section_heading_number:{2}
  |section_level:{1}
  |section_number:{2}
  |toplevel_directions:D[next->E4|prev->E1]
@@ -87,6 +91,7 @@ $result_tree_text{'top_file_name_and_node_name_collision'} = 
'*document_root C6
  |EXTRA
  |section_directions:D[prev->E3]
  |section_level:{1}
+ |section_number:{3}
  |toplevel_directions:D[prev->E3]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/top_node_top_contents.pl 
b/tta/perl/t/results/html_tests/top_node_top_contents.pl
index 984ef1f9c1..631a4acdf9 100644
--- a/tta/perl/t/results/html_tests/top_node_top_contents.pl
+++ b/tta/perl/t/results/html_tests/top_node_top_contents.pl
@@ -20,6 +20,7 @@ $result_tree_text{'top_node_top_contents'} = '*document_root 
C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -35,6 +36,7 @@ $result_tree_text{'top_node_top_contents'} = '*document_root 
C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/html_tests/top_node_up_explicit.pl 
b/tta/perl/t/results/html_tests/top_node_up_explicit.pl
index 830cc49221..e1f7fe4047 100644
--- a/tta/perl/t/results/html_tests/top_node_up_explicit.pl
+++ b/tta/perl/t/results/html_tests/top_node_up_explicit.pl
@@ -16,6 +16,7 @@ $result_tree_text{'top_node_up_explicit'} = '*document_root C5
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->MISSING: (line_arg)[C3]|prev->MISSING: 
(line_arg)[C3]|up->MISSING: (line_arg)[C3]]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C4
    *line_arg C1
@@ -58,6 +59,7 @@ $result_tree_text{'top_node_up_explicit'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -113,6 +115,7 @@ $result_tree_text{'top_node_up_explicit'} = '*document_root 
C5
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[up->E0]
+ |node_number:{2}
  |normalized:{Chap}
   *arguments_line C1
    *line_arg C1
@@ -128,8 +131,9 @@ $result_tree_text{'top_node_up_explicit'} = '*document_root 
C5
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/top_node_up_explicit_no_nodes.pl 
b/tta/perl/t/results/html_tests/top_node_up_explicit_no_nodes.pl
index a65dc54c8e..579dbd351c 100644
--- a/tta/perl/t/results/html_tests/top_node_up_explicit_no_nodes.pl
+++ b/tta/perl/t/results/html_tests/top_node_up_explicit_no_nodes.pl
@@ -16,6 +16,7 @@ $result_tree_text{'top_node_up_explicit_no_nodes'} = 
'*document_root C5
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->MISSING: (line_arg)[C3]|prev->MISSING: 
(line_arg)[C3]|up->MISSING: (line_arg)[C3]]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C4
    *line_arg C1
@@ -58,6 +59,7 @@ $result_tree_text{'top_node_up_explicit_no_nodes'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -113,6 +115,7 @@ $result_tree_text{'top_node_up_explicit_no_nodes'} = 
'*document_root C5
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[up->E0]
+ |node_number:{2}
  |normalized:{Chap}
   *arguments_line C1
    *line_arg C1
@@ -128,8 +131,9 @@ $result_tree_text{'top_node_up_explicit_no_nodes'} = 
'*document_root C5
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/top_node_up_implicit.pl 
b/tta/perl/t/results/html_tests/top_node_up_implicit.pl
index 40d690ec72..b4a35a0aed 100644
--- a/tta/perl/t/results/html_tests/top_node_up_implicit.pl
+++ b/tta/perl/t/results/html_tests/top_node_up_implicit.pl
@@ -16,6 +16,7 @@ $result_tree_text{'top_node_up_implicit'} = '*document_root C5
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'top_node_up_implicit'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -87,6 +89,7 @@ $result_tree_text{'top_node_up_implicit'} = '*document_root C5
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Chap}
   *arguments_line C1
    *line_arg C1
@@ -102,8 +105,9 @@ $result_tree_text{'top_node_up_implicit'} = '*document_root 
C5
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/top_node_up_implicit_no_nodes.pl 
b/tta/perl/t/results/html_tests/top_node_up_implicit_no_nodes.pl
index 7b8ef92926..07c27edb9c 100644
--- a/tta/perl/t/results/html_tests/top_node_up_implicit_no_nodes.pl
+++ b/tta/perl/t/results/html_tests/top_node_up_implicit_no_nodes.pl
@@ -16,6 +16,7 @@ $result_tree_text{'top_node_up_implicit_no_nodes'} = 
'*document_root C5
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'top_node_up_implicit_no_nodes'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -87,6 +89,7 @@ $result_tree_text{'top_node_up_implicit_no_nodes'} = 
'*document_root C5
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Chap}
   *arguments_line C1
    *line_arg C1
@@ -102,8 +105,9 @@ $result_tree_text{'top_node_up_implicit_no_nodes'} = 
'*document_root C5
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/transliterated_names_conflicts.pl 
b/tta/perl/t/results/html_tests/transliterated_names_conflicts.pl
index ca468ba42e..c6adabaad7 100644
--- a/tta/perl/t/results/html_tests/transliterated_names_conflicts.pl
+++ b/tta/perl/t/results/html_tests/transliterated_names_conflicts.pl
@@ -26,6 +26,7 @@ NodeForward: [U1]
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -42,6 +43,7 @@ NodeForward: [U1]
  |associated_node:[E0]
  |section_childs:EC[E3|E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -79,6 +81,7 @@ NodeBack: [U0]
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Pr_00e9s}
   *arguments_line C1
    *line_arg C1
@@ -94,8 +97,9 @@ NodeBack: [U0]
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -124,6 +128,7 @@ NodeBack: [U1]
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{Other-node}
   *arguments_line C1
    *line_arg C1
@@ -139,8 +144,9 @@ NodeBack: [U1]
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/html_tests/undef_split_and_big_rule.pl 
b/tta/perl/t/results/html_tests/undef_split_and_big_rule.pl
index 503a8863f0..6a012e2a60 100644
--- a/tta/perl/t/results/html_tests/undef_split_and_big_rule.pl
+++ b/tta/perl/t/results/html_tests/undef_split_and_big_rule.pl
@@ -16,6 +16,7 @@ $result_tree_text{'undef_split_and_big_rule'} = 
'*document_root C6
  |EXTRA
  |section_childs:EC[E2]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -37,6 +38,7 @@ $result_tree_text{'undef_split_and_big_rule'} = 
'*document_root C6
  |associated_section:[E2]
  |associated_title_command:[E2]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -53,8 +55,9 @@ $result_tree_text{'undef_split_and_big_rule'} = 
'*document_root C6
  |associated_node:[E1]
  |section_childs:EC[E4]
  |section_directions:D[up->E0]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E0|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -72,6 +75,7 @@ $result_tree_text{'undef_split_and_big_rule'} = 
'*document_root C6
  |associated_title_command:[E4]
  |is_target:{1}
  |node_directions:D[up->E1]
+ |node_number:{2}
  |normalized:{sec}
   *arguments_line C1
    *line_arg C1
@@ -87,8 +91,9 @@ $result_tree_text{'undef_split_and_big_rule'} = 
'*document_root C6
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E2]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/html_tests/xhtml_rule_element_already_closed.pl 
b/tta/perl/t/results/html_tests/xhtml_rule_element_already_closed.pl
index 8865a8002f..2c0b7a4aaf 100644
--- a/tta/perl/t/results/html_tests/xhtml_rule_element_already_closed.pl
+++ b/tta/perl/t/results/html_tests/xhtml_rule_element_already_closed.pl
@@ -15,6 +15,7 @@ $result_tree_text{'xhtml_rule_element_already_closed'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'xhtml_rule_element_already_closed'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -53,6 +55,7 @@ $result_tree_text{'xhtml_rule_element_already_closed'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -68,8 +71,9 @@ $result_tree_text{'xhtml_rule_element_already_closed'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/htmlxref/htmlxref.pl 
b/tta/perl/t/results/htmlxref/htmlxref.pl
index 3e45a4b509..e389f9efff 100644
--- a/tta/perl/t/results/htmlxref/htmlxref.pl
+++ b/tta/perl/t/results/htmlxref/htmlxref.pl
@@ -20,6 +20,7 @@ $result_tree_text{'htmlxref'} = '*document_root C9
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E6]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'htmlxref'} = '*document_root C9
  |associated_node:[E0]
  |section_childs:EC[E7]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -84,6 +86,7 @@ $result_tree_text{'htmlxref'} = '*document_root C9
    |{ }
   |EXTRA
   |global_command_number:{1}
+  |heading_number:{1}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -266,6 +269,7 @@ $result_tree_text{'htmlxref'} = '*document_root C9
    |{ }
   |EXTRA
   |global_command_number:{2}
+  |heading_number:{2}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -320,6 +324,7 @@ $result_tree_text{'htmlxref'} = '*document_root C9
    |{ }
   |EXTRA
   |global_command_number:{3}
+  |heading_number:{3}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -480,6 +485,7 @@ $result_tree_text{'htmlxref'} = '*document_root C9
  |menu_directions:D[up->E0]
  |menus:EC[E8]
  |node_directions:D[next->E9|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{other-nodes}
   *arguments_line C4
    *line_arg C1
@@ -518,8 +524,9 @@ $result_tree_text{'htmlxref'} = '*document_root C9
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -644,6 +651,7 @@ $result_tree_text{'htmlxref'} = '*document_root C9
  |is_target:{1}
  |menu_directions:D[next->E10|up->E6]
  |node_directions:D[next->E10|prev->E6|up->E6]
+ |node_number:{3}
  
|normalized:{_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e}
   *arguments_line C4
    *line_arg C1
@@ -702,6 +710,7 @@ $result_tree_text{'htmlxref'} = '*document_root C9
  |is_target:{1}
  |menu_directions:D[next->E11|prev->E9|up->E6]
  |node_directions:D[next->E11|prev->E9|up->E6]
+ |node_number:{4}
  
|normalized:{_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e}
   *arguments_line C4
    *line_arg C1
@@ -754,6 +763,7 @@ $result_tree_text{'htmlxref'} = '*document_root C9
  |is_target:{1}
  |menu_directions:D[prev->E10|up->E6]
  |node_directions:D[prev->E10|up->E6]
+ |node_number:{5}
  |normalized:{local-node}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/htmlxref/htmlxref_no_urlprefix_first.pl 
b/tta/perl/t/results/htmlxref/htmlxref_no_urlprefix_first.pl
index 062c2fa143..37d051eb1e 100644
--- a/tta/perl/t/results/htmlxref/htmlxref_no_urlprefix_first.pl
+++ b/tta/perl/t/results/htmlxref/htmlxref_no_urlprefix_first.pl
@@ -16,6 +16,7 @@ $result_tree_text{'htmlxref_no_urlprefix_first'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'htmlxref_no_urlprefix_first'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'htmlxref_no_urlprefix_first'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'htmlxref_no_urlprefix_first'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/htmlxref/htmlxref_nodes.pl 
b/tta/perl/t/results/htmlxref/htmlxref_nodes.pl
index a82d9796d2..941cab59d2 100644
--- a/tta/perl/t/results/htmlxref/htmlxref_nodes.pl
+++ b/tta/perl/t/results/htmlxref/htmlxref_nodes.pl
@@ -20,6 +20,7 @@ $result_tree_text{'htmlxref_nodes'} = '*document_root C9
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E6]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'htmlxref_nodes'} = '*document_root C9
  |associated_node:[E0]
  |section_childs:EC[E7]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -84,6 +86,7 @@ $result_tree_text{'htmlxref_nodes'} = '*document_root C9
    |{ }
   |EXTRA
   |global_command_number:{1}
+  |heading_number:{1}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -266,6 +269,7 @@ $result_tree_text{'htmlxref_nodes'} = '*document_root C9
    |{ }
   |EXTRA
   |global_command_number:{2}
+  |heading_number:{2}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -320,6 +324,7 @@ $result_tree_text{'htmlxref_nodes'} = '*document_root C9
    |{ }
   |EXTRA
   |global_command_number:{3}
+  |heading_number:{3}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -480,6 +485,7 @@ $result_tree_text{'htmlxref_nodes'} = '*document_root C9
  |menu_directions:D[up->E0]
  |menus:EC[E8]
  |node_directions:D[next->E9|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{other-nodes}
   *arguments_line C4
    *line_arg C1
@@ -518,8 +524,9 @@ $result_tree_text{'htmlxref_nodes'} = '*document_root C9
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -644,6 +651,7 @@ $result_tree_text{'htmlxref_nodes'} = '*document_root C9
  |is_target:{1}
  |menu_directions:D[next->E10|up->E6]
  |node_directions:D[next->E10|prev->E6|up->E6]
+ |node_number:{3}
  
|normalized:{_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e}
   *arguments_line C4
    *line_arg C1
@@ -702,6 +710,7 @@ $result_tree_text{'htmlxref_nodes'} = '*document_root C9
  |is_target:{1}
  |menu_directions:D[next->E11|prev->E9|up->E6]
  |node_directions:D[next->E11|prev->E9|up->E6]
+ |node_number:{4}
  
|normalized:{_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e}
   *arguments_line C4
    *line_arg C1
@@ -754,6 +763,7 @@ $result_tree_text{'htmlxref_nodes'} = '*document_root C9
  |is_target:{1}
  |menu_directions:D[prev->E10|up->E6]
  |node_directions:D[prev->E10|up->E6]
+ |node_number:{5}
  |normalized:{local-node}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/htmlxref/htmlxref_only_mono.pl 
b/tta/perl/t/results/htmlxref/htmlxref_only_mono.pl
index 12d9444d00..44c2f60a8c 100644
--- a/tta/perl/t/results/htmlxref/htmlxref_only_mono.pl
+++ b/tta/perl/t/results/htmlxref/htmlxref_only_mono.pl
@@ -20,6 +20,7 @@ $result_tree_text{'htmlxref_only_mono'} = '*document_root C9
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E6]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'htmlxref_only_mono'} = '*document_root C9
  |associated_node:[E0]
  |section_childs:EC[E7]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -84,6 +86,7 @@ $result_tree_text{'htmlxref_only_mono'} = '*document_root C9
    |{ }
   |EXTRA
   |global_command_number:{1}
+  |heading_number:{1}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -266,6 +269,7 @@ $result_tree_text{'htmlxref_only_mono'} = '*document_root C9
    |{ }
   |EXTRA
   |global_command_number:{2}
+  |heading_number:{2}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -320,6 +324,7 @@ $result_tree_text{'htmlxref_only_mono'} = '*document_root C9
    |{ }
   |EXTRA
   |global_command_number:{3}
+  |heading_number:{3}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -480,6 +485,7 @@ $result_tree_text{'htmlxref_only_mono'} = '*document_root C9
  |menu_directions:D[up->E0]
  |menus:EC[E8]
  |node_directions:D[next->E9|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{other-nodes}
   *arguments_line C4
    *line_arg C1
@@ -518,8 +524,9 @@ $result_tree_text{'htmlxref_only_mono'} = '*document_root C9
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -644,6 +651,7 @@ $result_tree_text{'htmlxref_only_mono'} = '*document_root C9
  |is_target:{1}
  |menu_directions:D[next->E10|up->E6]
  |node_directions:D[next->E10|prev->E6|up->E6]
+ |node_number:{3}
  
|normalized:{_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e}
   *arguments_line C4
    *line_arg C1
@@ -702,6 +710,7 @@ $result_tree_text{'htmlxref_only_mono'} = '*document_root C9
  |is_target:{1}
  |menu_directions:D[next->E11|prev->E9|up->E6]
  |node_directions:D[next->E11|prev->E9|up->E6]
+ |node_number:{4}
  
|normalized:{_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e}
   *arguments_line C4
    *line_arg C1
@@ -754,6 +763,7 @@ $result_tree_text{'htmlxref_only_mono'} = '*document_root C9
  |is_target:{1}
  |menu_directions:D[prev->E10|up->E6]
  |node_directions:D[prev->E10|up->E6]
+ |node_number:{5}
  |normalized:{local-node}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/htmlxref/htmlxref_only_mono_nodes.pl 
b/tta/perl/t/results/htmlxref/htmlxref_only_mono_nodes.pl
index 3899aac8b6..6af827bdca 100644
--- a/tta/perl/t/results/htmlxref/htmlxref_only_mono_nodes.pl
+++ b/tta/perl/t/results/htmlxref/htmlxref_only_mono_nodes.pl
@@ -20,6 +20,7 @@ $result_tree_text{'htmlxref_only_mono_nodes'} = 
'*document_root C9
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E6]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'htmlxref_only_mono_nodes'} = 
'*document_root C9
  |associated_node:[E0]
  |section_childs:EC[E7]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -84,6 +86,7 @@ $result_tree_text{'htmlxref_only_mono_nodes'} = 
'*document_root C9
    |{ }
   |EXTRA
   |global_command_number:{1}
+  |heading_number:{1}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -266,6 +269,7 @@ $result_tree_text{'htmlxref_only_mono_nodes'} = 
'*document_root C9
    |{ }
   |EXTRA
   |global_command_number:{2}
+  |heading_number:{2}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -320,6 +324,7 @@ $result_tree_text{'htmlxref_only_mono_nodes'} = 
'*document_root C9
    |{ }
   |EXTRA
   |global_command_number:{3}
+  |heading_number:{3}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -480,6 +485,7 @@ $result_tree_text{'htmlxref_only_mono_nodes'} = 
'*document_root C9
  |menu_directions:D[up->E0]
  |menus:EC[E8]
  |node_directions:D[next->E9|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{other-nodes}
   *arguments_line C4
    *line_arg C1
@@ -518,8 +524,9 @@ $result_tree_text{'htmlxref_only_mono_nodes'} = 
'*document_root C9
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -644,6 +651,7 @@ $result_tree_text{'htmlxref_only_mono_nodes'} = 
'*document_root C9
  |is_target:{1}
  |menu_directions:D[next->E10|up->E6]
  |node_directions:D[next->E10|prev->E6|up->E6]
+ |node_number:{3}
  
|normalized:{_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e}
   *arguments_line C4
    *line_arg C1
@@ -702,6 +710,7 @@ $result_tree_text{'htmlxref_only_mono_nodes'} = 
'*document_root C9
  |is_target:{1}
  |menu_directions:D[next->E11|prev->E9|up->E6]
  |node_directions:D[next->E11|prev->E9|up->E6]
+ |node_number:{4}
  
|normalized:{_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e}
   *arguments_line C4
    *line_arg C1
@@ -754,6 +763,7 @@ $result_tree_text{'htmlxref_only_mono_nodes'} = 
'*document_root C9
  |is_target:{1}
  |menu_directions:D[prev->E10|up->E6]
  |node_directions:D[prev->E10|up->E6]
+ |node_number:{5}
  |normalized:{local-node}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/htmlxref/htmlxref_only_split.pl 
b/tta/perl/t/results/htmlxref/htmlxref_only_split.pl
index 2c0827f341..85ddffa48d 100644
--- a/tta/perl/t/results/htmlxref/htmlxref_only_split.pl
+++ b/tta/perl/t/results/htmlxref/htmlxref_only_split.pl
@@ -20,6 +20,7 @@ $result_tree_text{'htmlxref_only_split'} = '*document_root C9
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E6]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'htmlxref_only_split'} = '*document_root C9
  |associated_node:[E0]
  |section_childs:EC[E7]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -84,6 +86,7 @@ $result_tree_text{'htmlxref_only_split'} = '*document_root C9
    |{ }
   |EXTRA
   |global_command_number:{1}
+  |heading_number:{1}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -266,6 +269,7 @@ $result_tree_text{'htmlxref_only_split'} = '*document_root 
C9
    |{ }
   |EXTRA
   |global_command_number:{2}
+  |heading_number:{2}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -320,6 +324,7 @@ $result_tree_text{'htmlxref_only_split'} = '*document_root 
C9
    |{ }
   |EXTRA
   |global_command_number:{3}
+  |heading_number:{3}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -480,6 +485,7 @@ $result_tree_text{'htmlxref_only_split'} = '*document_root 
C9
  |menu_directions:D[up->E0]
  |menus:EC[E8]
  |node_directions:D[next->E9|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{other-nodes}
   *arguments_line C4
    *line_arg C1
@@ -518,8 +524,9 @@ $result_tree_text{'htmlxref_only_split'} = '*document_root 
C9
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -644,6 +651,7 @@ $result_tree_text{'htmlxref_only_split'} = '*document_root 
C9
  |is_target:{1}
  |menu_directions:D[next->E10|up->E6]
  |node_directions:D[next->E10|prev->E6|up->E6]
+ |node_number:{3}
  
|normalized:{_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e}
   *arguments_line C4
    *line_arg C1
@@ -702,6 +710,7 @@ $result_tree_text{'htmlxref_only_split'} = '*document_root 
C9
  |is_target:{1}
  |menu_directions:D[next->E11|prev->E9|up->E6]
  |node_directions:D[next->E11|prev->E9|up->E6]
+ |node_number:{4}
  
|normalized:{_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e}
   *arguments_line C4
    *line_arg C1
@@ -754,6 +763,7 @@ $result_tree_text{'htmlxref_only_split'} = '*document_root 
C9
  |is_target:{1}
  |menu_directions:D[prev->E10|up->E6]
  |node_directions:D[prev->E10|up->E6]
+ |node_number:{5}
  |normalized:{local-node}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/htmlxref/htmlxref_only_split_nodes.pl 
b/tta/perl/t/results/htmlxref/htmlxref_only_split_nodes.pl
index 83dea23475..5efd7e2eb1 100644
--- a/tta/perl/t/results/htmlxref/htmlxref_only_split_nodes.pl
+++ b/tta/perl/t/results/htmlxref/htmlxref_only_split_nodes.pl
@@ -20,6 +20,7 @@ $result_tree_text{'htmlxref_only_split_nodes'} = 
'*document_root C9
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E6]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'htmlxref_only_split_nodes'} = 
'*document_root C9
  |associated_node:[E0]
  |section_childs:EC[E7]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -84,6 +86,7 @@ $result_tree_text{'htmlxref_only_split_nodes'} = 
'*document_root C9
    |{ }
   |EXTRA
   |global_command_number:{1}
+  |heading_number:{1}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -266,6 +269,7 @@ $result_tree_text{'htmlxref_only_split_nodes'} = 
'*document_root C9
    |{ }
   |EXTRA
   |global_command_number:{2}
+  |heading_number:{2}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -320,6 +324,7 @@ $result_tree_text{'htmlxref_only_split_nodes'} = 
'*document_root C9
    |{ }
   |EXTRA
   |global_command_number:{3}
+  |heading_number:{3}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -480,6 +485,7 @@ $result_tree_text{'htmlxref_only_split_nodes'} = 
'*document_root C9
  |menu_directions:D[up->E0]
  |menus:EC[E8]
  |node_directions:D[next->E9|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{other-nodes}
   *arguments_line C4
    *line_arg C1
@@ -518,8 +524,9 @@ $result_tree_text{'htmlxref_only_split_nodes'} = 
'*document_root C9
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -644,6 +651,7 @@ $result_tree_text{'htmlxref_only_split_nodes'} = 
'*document_root C9
  |is_target:{1}
  |menu_directions:D[next->E10|up->E6]
  |node_directions:D[next->E10|prev->E6|up->E6]
+ |node_number:{3}
  
|normalized:{_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e}
   *arguments_line C4
    *line_arg C1
@@ -702,6 +710,7 @@ $result_tree_text{'htmlxref_only_split_nodes'} = 
'*document_root C9
  |is_target:{1}
  |menu_directions:D[next->E11|prev->E9|up->E6]
  |node_directions:D[next->E11|prev->E9|up->E6]
+ |node_number:{4}
  
|normalized:{_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e}
   *arguments_line C4
    *line_arg C1
@@ -754,6 +763,7 @@ $result_tree_text{'htmlxref_only_split_nodes'} = 
'*document_root C9
  |is_target:{1}
  |menu_directions:D[prev->E10|up->E6]
  |node_directions:D[prev->E10|up->E6]
+ |node_number:{5}
  |normalized:{local-node}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/include/cpp_line_latin1.pl 
b/tta/perl/t/results/include/cpp_line_latin1.pl
index 71ff8fac06..6b2a865b9e 100644
--- a/tta/perl/t/results/include/cpp_line_latin1.pl
+++ b/tta/perl/t/results/include/cpp_line_latin1.pl
@@ -33,6 +33,7 @@ $result_tree_text{'cpp_line_latin1'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -45,6 +46,7 @@ $result_tree_text{'cpp_line_latin1'} = '*document_root C5
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -63,6 +65,7 @@ $result_tree_text{'cpp_line_latin1'} = '*document_root C5
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/include/cpp_lines.pl 
b/tta/perl/t/results/include/cpp_lines.pl
index 44d9217095..783c8abf5f 100644
--- a/tta/perl/t/results/include/cpp_lines.pl
+++ b/tta/perl/t/results/include/cpp_lines.pl
@@ -36,6 +36,7 @@ $result_tree_text{'cpp_lines'} = '*document_root C4
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -50,6 +51,7 @@ $result_tree_text{'cpp_lines'} = '*document_root C4
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/include/macro_and_commands_in_early_commands.pl 
b/tta/perl/t/results/include/macro_and_commands_in_early_commands.pl
index ef0029291b..1b65a636db 100644
--- a/tta/perl/t/results/include/macro_and_commands_in_early_commands.pl
+++ b/tta/perl/t/results/include/macro_and_commands_in_early_commands.pl
@@ -118,6 +118,7 @@ $result_tree_text{'macro_and_commands_in_early_commands'} = 
'*document_root C4
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -133,6 +134,7 @@ $result_tree_text{'macro_and_commands_in_early_commands'} = 
'*document_root C4
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -152,6 +154,7 @@ $result_tree_text{'macro_and_commands_in_early_commands'} = 
'*document_root C4
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/include/macro_in_early_commands.pl 
b/tta/perl/t/results/include/macro_in_early_commands.pl
index d6c64a2b33..7f4cb13704 100644
--- a/tta/perl/t/results/include/macro_in_early_commands.pl
+++ b/tta/perl/t/results/include/macro_in_early_commands.pl
@@ -165,6 +165,7 @@ $result_tree_text{'macro_in_early_commands'} = 
'*document_root C4
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -180,6 +181,7 @@ $result_tree_text{'macro_in_early_commands'} = 
'*document_root C4
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -199,6 +201,7 @@ $result_tree_text{'macro_in_early_commands'} = 
'*document_root C4
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/include/value_expansion_in_include.pl 
b/tta/perl/t/results/include/value_expansion_in_include.pl
index 927aacb7d8..f39eb582a6 100644
--- a/tta/perl/t/results/include/value_expansion_in_include.pl
+++ b/tta/perl/t/results/include/value_expansion_in_include.pl
@@ -36,6 +36,7 @@ $result_tree_text{'value_expansion_in_include'} = 
'*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -50,6 +51,7 @@ $result_tree_text{'value_expansion_in_include'} = 
'*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/indices/complex_recursive_synindex.pl 
b/tta/perl/t/results/indices/complex_recursive_synindex.pl
index 4f4b1924b5..7442446db5 100644
--- a/tta/perl/t/results/indices/complex_recursive_synindex.pl
+++ b/tta/perl/t/results/indices/complex_recursive_synindex.pl
@@ -13,6 +13,7 @@ $result_tree_text{'complex_recursive_synindex'} = 
'*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -28,6 +29,7 @@ $result_tree_text{'complex_recursive_synindex'} = 
'*document_root C3
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/indices/def_syn_indices.pl 
b/tta/perl/t/results/indices/def_syn_indices.pl
index b48cb1b616..3251983719 100644
--- a/tta/perl/t/results/indices/def_syn_indices.pl
+++ b/tta/perl/t/results/indices/def_syn_indices.pl
@@ -28,6 +28,7 @@ $result_tree_text{'def_syn_indices'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -44,6 +45,7 @@ $result_tree_text{'def_syn_indices'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -67,6 +69,7 @@ $result_tree_text{'def_syn_indices'} = '*document_root C5
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Chapter-index}
   *arguments_line C1
    *line_arg C1
@@ -82,8 +85,9 @@ $result_tree_text{'def_syn_indices'} = '*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl 
b/tta/perl/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
index e232baeb3d..d74a70cd53 100644
Binary files 
a/tta/perl/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl 
and 
b/tta/perl/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl 
differ
diff --git a/tta/perl/t/results/indices/double_index_entry.pl 
b/tta/perl/t/results/indices/double_index_entry.pl
index fb3afc46e9..e67a0ea913 100644
Binary files a/tta/perl/t/results/indices/double_index_entry.pl and 
b/tta/perl/t/results/indices/double_index_entry.pl differ
diff --git a/tta/perl/t/results/indices/double_seeentry_seealso.pl 
b/tta/perl/t/results/indices/double_seeentry_seealso.pl
index fffd783ca1..6f75313ae0 100644
Binary files a/tta/perl/t/results/indices/double_seeentry_seealso.pl and 
b/tta/perl/t/results/indices/double_seeentry_seealso.pl differ
diff --git a/tta/perl/t/results/indices/double_syncodeindex.pl 
b/tta/perl/t/results/indices/double_syncodeindex.pl
index 3e82169fca..b7b6786fc9 100644
Binary files a/tta/perl/t/results/indices/double_syncodeindex.pl and 
b/tta/perl/t/results/indices/double_syncodeindex.pl differ
diff --git a/tta/perl/t/results/indices/empty_added_index_entry.pl 
b/tta/perl/t/results/indices/empty_added_index_entry.pl
index 99aadbb34e..b2800da6bf 100644
--- a/tta/perl/t/results/indices/empty_added_index_entry.pl
+++ b/tta/perl/t/results/indices/empty_added_index_entry.pl
@@ -26,6 +26,7 @@ $result_tree_text{'empty_added_index_entry'} = 
'*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -40,6 +41,7 @@ $result_tree_text{'empty_added_index_entry'} = 
'*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/indices/empty_cindex_entry.pl 
b/tta/perl/t/results/indices/empty_cindex_entry.pl
index ce4cf9ba89..1953f1ae7b 100644
--- a/tta/perl/t/results/indices/empty_cindex_entry.pl
+++ b/tta/perl/t/results/indices/empty_cindex_entry.pl
@@ -14,6 +14,7 @@ $result_tree_text{'empty_cindex_entry'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -28,6 +29,7 @@ $result_tree_text{'empty_cindex_entry'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/indices/empty_index_entry.pl 
b/tta/perl/t/results/indices/empty_index_entry.pl
index 6c318663b3..9edb3f1860 100644
--- a/tta/perl/t/results/indices/empty_index_entry.pl
+++ b/tta/perl/t/results/indices/empty_index_entry.pl
@@ -14,6 +14,7 @@ $result_tree_text{'empty_index_entry'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -30,6 +31,7 @@ $result_tree_text{'empty_index_entry'} = '*document_root C3
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/indices/empty_string_index_entry.pl 
b/tta/perl/t/results/indices/empty_string_index_entry.pl
index e72d525fc2..c84f6f3864 100644
--- a/tta/perl/t/results/indices/empty_string_index_entry.pl
+++ b/tta/perl/t/results/indices/empty_string_index_entry.pl
@@ -14,6 +14,7 @@ $result_tree_text{'empty_string_index_entry'} = 
'*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -29,6 +30,7 @@ $result_tree_text{'empty_string_index_entry'} = 
'*document_root C3
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/indices/encoding_index_ascii.pl 
b/tta/perl/t/results/indices/encoding_index_ascii.pl
index c7ddea5b9a..dc3e550ab8 100644
--- a/tta/perl/t/results/indices/encoding_index_ascii.pl
+++ b/tta/perl/t/results/indices/encoding_index_ascii.pl
@@ -44,6 +44,7 @@ $result_tree_text{'encoding_index_ascii'} = '*document_root C4
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -59,6 +60,7 @@ $result_tree_text{'encoding_index_ascii'} = '*document_root C4
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -78,6 +80,7 @@ $result_tree_text{'encoding_index_ascii'} = '*document_root C4
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/indices/encoding_index_ascii_enable_encoding.pl 
b/tta/perl/t/results/indices/encoding_index_ascii_enable_encoding.pl
index 42363494a0..ad5a8d5950 100644
--- a/tta/perl/t/results/indices/encoding_index_ascii_enable_encoding.pl
+++ b/tta/perl/t/results/indices/encoding_index_ascii_enable_encoding.pl
@@ -44,6 +44,7 @@ $result_tree_text{'encoding_index_ascii_enable_encoding'} = 
'*document_root C4
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -59,6 +60,7 @@ $result_tree_text{'encoding_index_ascii_enable_encoding'} = 
'*document_root C4
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -78,6 +80,7 @@ $result_tree_text{'encoding_index_ascii_enable_encoding'} = 
'*document_root C4
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/indices/encoding_index_latin1.pl 
b/tta/perl/t/results/indices/encoding_index_latin1.pl
index eeea5975b7..784d9d81f2 100644
--- a/tta/perl/t/results/indices/encoding_index_latin1.pl
+++ b/tta/perl/t/results/indices/encoding_index_latin1.pl
@@ -32,6 +32,7 @@ $result_tree_text{'encoding_index_latin1'} = '*document_root 
C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -47,6 +48,7 @@ $result_tree_text{'encoding_index_latin1'} = '*document_root 
C5
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -67,6 +69,7 @@ $result_tree_text{'encoding_index_latin1'} = '*document_root 
C5
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/indices/encoding_index_latin1_enable_encoding.pl 
b/tta/perl/t/results/indices/encoding_index_latin1_enable_encoding.pl
index de4a4090da..9301310b58 100644
--- a/tta/perl/t/results/indices/encoding_index_latin1_enable_encoding.pl
+++ b/tta/perl/t/results/indices/encoding_index_latin1_enable_encoding.pl
@@ -32,6 +32,7 @@ $result_tree_text{'encoding_index_latin1_enable_encoding'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -47,6 +48,7 @@ $result_tree_text{'encoding_index_latin1_enable_encoding'} = 
'*document_root C5
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -67,6 +69,7 @@ $result_tree_text{'encoding_index_latin1_enable_encoding'} = 
'*document_root C5
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/indices/encoding_index_utf8.pl 
b/tta/perl/t/results/indices/encoding_index_utf8.pl
index 353668c207..6beaf721fe 100644
--- a/tta/perl/t/results/indices/encoding_index_utf8.pl
+++ b/tta/perl/t/results/indices/encoding_index_utf8.pl
@@ -32,6 +32,7 @@ $result_tree_text{'encoding_index_utf8'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -47,6 +48,7 @@ $result_tree_text{'encoding_index_utf8'} = '*document_root C5
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -67,6 +69,7 @@ $result_tree_text{'encoding_index_utf8'} = '*document_root C5
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/indices/encoding_index_utf8_enable_encoding.pl 
b/tta/perl/t/results/indices/encoding_index_utf8_enable_encoding.pl
index c0ae7eb341..55ae4d7f59 100644
--- a/tta/perl/t/results/indices/encoding_index_utf8_enable_encoding.pl
+++ b/tta/perl/t/results/indices/encoding_index_utf8_enable_encoding.pl
@@ -32,6 +32,7 @@ $result_tree_text{'encoding_index_utf8_enable_encoding'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -47,6 +48,7 @@ $result_tree_text{'encoding_index_utf8_enable_encoding'} = 
'*document_root C5
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -67,6 +69,7 @@ $result_tree_text{'encoding_index_utf8_enable_encoding'} = 
'*document_root C5
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/indices/encoding_index_utf8_no_use_unicode.pl 
b/tta/perl/t/results/indices/encoding_index_utf8_no_use_unicode.pl
index 15986b4b82..1c003ac3de 100644
--- a/tta/perl/t/results/indices/encoding_index_utf8_no_use_unicode.pl
+++ b/tta/perl/t/results/indices/encoding_index_utf8_no_use_unicode.pl
@@ -32,6 +32,7 @@ $result_tree_text{'encoding_index_utf8_no_use_unicode'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -47,6 +48,7 @@ $result_tree_text{'encoding_index_utf8_no_use_unicode'} = 
'*document_root C5
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -67,6 +69,7 @@ $result_tree_text{'encoding_index_utf8_no_use_unicode'} = 
'*document_root C5
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/indices/explicit_sort_key.pl 
b/tta/perl/t/results/indices/explicit_sort_key.pl
index 67a289d719..0e8178a8d4 100644
Binary files a/tta/perl/t/results/indices/explicit_sort_key.pl and 
b/tta/perl/t/results/indices/explicit_sort_key.pl differ
diff --git a/tta/perl/t/results/indices/ftable_vtable.pl 
b/tta/perl/t/results/indices/ftable_vtable.pl
index b5a0e0ecaa..0c3e73acc3 100644
Binary files a/tta/perl/t/results/indices/ftable_vtable.pl and 
b/tta/perl/t/results/indices/ftable_vtable.pl differ
diff --git a/tta/perl/t/results/indices/ignored_sort_char_empty_entries.pl 
b/tta/perl/t/results/indices/ignored_sort_char_empty_entries.pl
index 3b7e45feac..82d3f3502d 100644
Binary files a/tta/perl/t/results/indices/ignored_sort_char_empty_entries.pl 
and b/tta/perl/t/results/indices/ignored_sort_char_empty_entries.pl differ
diff --git a/tta/perl/t/results/indices/image_lines_count.pl 
b/tta/perl/t/results/indices/image_lines_count.pl
index a09ea475a2..a35f870d43 100644
Binary files a/tta/perl/t/results/indices/image_lines_count.pl and 
b/tta/perl/t/results/indices/image_lines_count.pl differ
diff --git a/tta/perl/t/results/indices/image_text_lines_count.pl 
b/tta/perl/t/results/indices/image_text_lines_count.pl
index ec87944adb..ceb942939c 100644
Binary files a/tta/perl/t/results/indices/image_text_lines_count.pl and 
b/tta/perl/t/results/indices/image_text_lines_count.pl differ
diff --git a/tta/perl/t/results/indices/index_and_node_same_name.pl 
b/tta/perl/t/results/indices/index_and_node_same_name.pl
index cbf51c3689..32d1c953f1 100644
Binary files a/tta/perl/t/results/indices/index_and_node_same_name.pl and 
b/tta/perl/t/results/indices/index_and_node_same_name.pl differ
diff --git a/tta/perl/t/results/indices/index_entries_before_nodes.pl 
b/tta/perl/t/results/indices/index_entries_before_nodes.pl
index 7bbc39314e..761e65dd02 100644
Binary files a/tta/perl/t/results/indices/index_entries_before_nodes.pl and 
b/tta/perl/t/results/indices/index_entries_before_nodes.pl differ
diff --git a/tta/perl/t/results/indices/index_entries_locations.pl 
b/tta/perl/t/results/indices/index_entries_locations.pl
index 2bb8d8ca60..f520ddf816 100644
Binary files a/tta/perl/t/results/indices/index_entries_locations.pl and 
b/tta/perl/t/results/indices/index_entries_locations.pl differ
diff --git a/tta/perl/t/results/indices/index_entry_before_first_node.pl 
b/tta/perl/t/results/indices/index_entry_before_first_node.pl
index 59451325af..9b21f2e090 100644
Binary files a/tta/perl/t/results/indices/index_entry_before_first_node.pl and 
b/tta/perl/t/results/indices/index_entry_before_first_node.pl differ
diff --git a/tta/perl/t/results/indices/index_entry_before_node.pl 
b/tta/perl/t/results/indices/index_entry_before_node.pl
index 6a0383aa82..cf76e089e2 100644
Binary files a/tta/perl/t/results/indices/index_entry_before_node.pl and 
b/tta/perl/t/results/indices/index_entry_before_node.pl differ
diff --git a/tta/perl/t/results/indices/index_entry_in_footnote.pl 
b/tta/perl/t/results/indices/index_entry_in_footnote.pl
index b7ef36032a..d014913c6a 100644
Binary files a/tta/perl/t/results/indices/index_entry_in_footnote.pl and 
b/tta/perl/t/results/indices/index_entry_in_footnote.pl differ
diff --git 
a/tta/perl/t/results/indices/index_entry_in_footnote_different_node_end.pl 
b/tta/perl/t/results/indices/index_entry_in_footnote_different_node_end.pl
index 1678812673..0e83f5bb70 100644
Binary files 
a/tta/perl/t/results/indices/index_entry_in_footnote_different_node_end.pl and 
b/tta/perl/t/results/indices/index_entry_in_footnote_different_node_end.pl 
differ
diff --git a/tta/perl/t/results/indices/index_entry_in_footnote_sections.pl 
b/tta/perl/t/results/indices/index_entry_in_footnote_sections.pl
index 48e4698e9e..3ef664a637 100644
Binary files a/tta/perl/t/results/indices/index_entry_in_footnote_sections.pl 
and b/tta/perl/t/results/indices/index_entry_in_footnote_sections.pl differ
diff --git 
a/tta/perl/t/results/indices/index_entry_in_footnote_sections_separate.pl 
b/tta/perl/t/results/indices/index_entry_in_footnote_sections_separate.pl
index 911a34a3e6..2d98954522 100644
Binary files 
a/tta/perl/t/results/indices/index_entry_in_footnote_sections_separate.pl and 
b/tta/perl/t/results/indices/index_entry_in_footnote_sections_separate.pl differ
diff --git a/tta/perl/t/results/indices/index_entry_in_footnote_separate.pl 
b/tta/perl/t/results/indices/index_entry_in_footnote_separate.pl
index f28850faa6..22bbda5969 100644
Binary files a/tta/perl/t/results/indices/index_entry_in_footnote_separate.pl 
and b/tta/perl/t/results/indices/index_entry_in_footnote_separate.pl differ
diff --git a/tta/perl/t/results/indices/index_no_node.pl 
b/tta/perl/t/results/indices/index_no_node.pl
index 7a814a794b..7f7a2c309d 100644
--- a/tta/perl/t/results/indices/index_no_node.pl
+++ b/tta/perl/t/results/indices/index_no_node.pl
@@ -58,6 +58,7 @@ $result_tree_text{'index_no_node'} = '*document_root C7
  |EXTRA
  |section_directions:D[next->E1]
  |section_level:{1}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -130,6 +131,7 @@ $result_tree_text{'index_no_node'} = '*document_root C7
  |section_childs:EC[E2]
  |section_directions:D[next->E3|prev->E0]
  |section_level:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E3|prev->E0]
   *arguments_line C1
    *line_arg C1
@@ -247,6 +249,7 @@ $result_tree_text{'index_no_node'} = '*document_root C7
  |EXTRA
  |section_directions:D[up->E1]
  |section_level:{2}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -311,8 +314,9 @@ $result_tree_text{'index_no_node'} = '*document_root C7
   |{ }
  |EXTRA
  |section_directions:D[next->E4|prev->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{4}
  |toplevel_directions:D[next->E4|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -366,8 +370,9 @@ $result_tree_text{'index_no_node'} = '*document_root C7
   |{ }
  |EXTRA
  |section_directions:D[prev->E3]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{5}
  |toplevel_directions:D[prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/indices/index_no_node_no_top.pl 
b/tta/perl/t/results/indices/index_no_node_no_top.pl
index 08af7e329c..c3317ea68c 100644
--- a/tta/perl/t/results/indices/index_no_node_no_top.pl
+++ b/tta/perl/t/results/indices/index_no_node_no_top.pl
@@ -45,6 +45,7 @@ $result_tree_text{'index_no_node_no_top'} = '*document_root C7
  |EXTRA
  |section_directions:D[next->E1]
  |section_level:{1}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -117,6 +118,7 @@ $result_tree_text{'index_no_node_no_top'} = '*document_root 
C7
  |section_childs:EC[E2]
  |section_directions:D[next->E3|prev->E0]
  |section_level:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E3|prev->E0]
   *arguments_line C1
    *line_arg C1
@@ -234,6 +236,7 @@ $result_tree_text{'index_no_node_no_top'} = '*document_root 
C7
  |EXTRA
  |section_directions:D[up->E1]
  |section_level:{2}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -298,8 +301,9 @@ $result_tree_text{'index_no_node_no_top'} = '*document_root 
C7
   |{ }
  |EXTRA
  |section_directions:D[next->E4|prev->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{4}
  |toplevel_directions:D[next->E4|prev->E1]
   *arguments_line C1
    *line_arg C1
@@ -353,8 +357,9 @@ $result_tree_text{'index_no_node_no_top'} = '*document_root 
C7
   |{ }
  |EXTRA
  |section_directions:D[prev->E3]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{5}
  |toplevel_directions:D[prev->E3]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/indices/index_no_node_no_top_no_node.pl 
b/tta/perl/t/results/indices/index_no_node_no_top_no_node.pl
index 147be64d19..4488e517a0 100644
--- a/tta/perl/t/results/indices/index_no_node_no_top_no_node.pl
+++ b/tta/perl/t/results/indices/index_no_node_no_top_no_node.pl
@@ -45,6 +45,7 @@ $result_tree_text{'index_no_node_no_top_no_node'} = 
'*document_root C7
  |EXTRA
  |section_directions:D[next->E1]
  |section_level:{1}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -117,6 +118,7 @@ $result_tree_text{'index_no_node_no_top_no_node'} = 
'*document_root C7
  |section_childs:EC[E2]
  |section_directions:D[next->E3|prev->E0]
  |section_level:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E3|prev->E0]
   *arguments_line C1
    *line_arg C1
@@ -234,6 +236,7 @@ $result_tree_text{'index_no_node_no_top_no_node'} = 
'*document_root C7
  |EXTRA
  |section_directions:D[up->E1]
  |section_level:{2}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -298,8 +301,9 @@ $result_tree_text{'index_no_node_no_top_no_node'} = 
'*document_root C7
   |{ }
  |EXTRA
  |section_directions:D[next->E4|prev->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{4}
  |toplevel_directions:D[next->E4|prev->E1]
   *arguments_line C1
    *line_arg C1
@@ -353,8 +357,9 @@ $result_tree_text{'index_no_node_no_top_no_node'} = 
'*document_root C7
   |{ }
  |EXTRA
  |section_directions:D[prev->E3]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{5}
  |toplevel_directions:D[prev->E3]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/indices/index_nodes.pl 
b/tta/perl/t/results/indices/index_nodes.pl
index 0e40819216..2461d7d136 100644
--- a/tta/perl/t/results/indices/index_nodes.pl
+++ b/tta/perl/t/results/indices/index_nodes.pl
@@ -19,6 +19,7 @@ $result_tree_text{'index_nodes'} = '*document_root C7
  |isindex:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -121,6 +122,7 @@ $result_tree_text{'index_nodes'} = '*document_root C7
  |menu_directions:D[up->E0]
  |menus:EC[E3]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap-first}
   *arguments_line C4
    *line_arg C1
@@ -248,6 +250,7 @@ $result_tree_text{'index_nodes'} = '*document_root C7
  |menu_directions:D[up->E2]
  |menus:EC[E5]
  |node_directions:D[up->E2]
+ |node_number:{3}
  |normalized:{second}
   *arguments_line C4
    *line_arg C1
@@ -323,6 +326,7 @@ $result_tree_text{'index_nodes'} = '*document_root C7
  |is_target:{1}
  |menu_directions:D[prev->E7|up->E4]
  |node_directions:D[prev->E7|up->E4]
+ |node_number:{4}
  |normalized:{another}
   *arguments_line C4
    *line_arg C1
@@ -399,6 +403,7 @@ $result_tree_text{'index_nodes'} = '*document_root C7
  |isindex:{1}
  |menu_directions:D[next->E6|up->E4]
  |node_directions:D[next->E6|up->E4]
+ |node_number:{5}
  |normalized:{a-node}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/indices/index_nodes_no_split_no_use_nodes.pl 
b/tta/perl/t/results/indices/index_nodes_no_split_no_use_nodes.pl
index 206673889e..55aab41d37 100644
--- a/tta/perl/t/results/indices/index_nodes_no_split_no_use_nodes.pl
+++ b/tta/perl/t/results/indices/index_nodes_no_split_no_use_nodes.pl
@@ -19,6 +19,7 @@ $result_tree_text{'index_nodes_no_split_no_use_nodes'} = 
'*document_root C7
  |isindex:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -121,6 +122,7 @@ $result_tree_text{'index_nodes_no_split_no_use_nodes'} = 
'*document_root C7
  |menu_directions:D[up->E0]
  |menus:EC[E3]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap-first}
   *arguments_line C4
    *line_arg C1
@@ -248,6 +250,7 @@ $result_tree_text{'index_nodes_no_split_no_use_nodes'} = 
'*document_root C7
  |menu_directions:D[up->E2]
  |menus:EC[E5]
  |node_directions:D[up->E2]
+ |node_number:{3}
  |normalized:{second}
   *arguments_line C4
    *line_arg C1
@@ -323,6 +326,7 @@ $result_tree_text{'index_nodes_no_split_no_use_nodes'} = 
'*document_root C7
  |is_target:{1}
  |menu_directions:D[prev->E7|up->E4]
  |node_directions:D[prev->E7|up->E4]
+ |node_number:{4}
  |normalized:{another}
   *arguments_line C4
    *line_arg C1
@@ -399,6 +403,7 @@ $result_tree_text{'index_nodes_no_split_no_use_nodes'} = 
'*document_root C7
  |isindex:{1}
  |menu_directions:D[next->E6|up->E4]
  |node_directions:D[next->E6|up->E4]
+ |node_number:{5}
  |normalized:{a-node}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/indices/index_special_region.pl 
b/tta/perl/t/results/indices/index_special_region.pl
index 642c80a356..dcd2b99242 100644
--- a/tta/perl/t/results/indices/index_special_region.pl
+++ b/tta/perl/t/results/indices/index_special_region.pl
@@ -189,6 +189,7 @@ $result_tree_text{'index_special_region'} = '*document_root 
C7
  |is_target:{1}
  |menus:EC[E7]
  |node_directions:D[next->E8]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -205,6 +206,7 @@ $result_tree_text{'index_special_region'} = '*document_root 
C7
  |associated_node:[E4]
  |section_childs:EC[E6|E9]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -223,8 +225,9 @@ $result_tree_text{'index_special_region'} = '*document_root 
C7
   |{ }
  |EXTRA
  |section_directions:D[next->E9|up->E5]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E9|prev->E5|up->E5]
   *arguments_line C1
    *line_arg C1
@@ -403,6 +406,7 @@ $result_tree_text{'index_special_region'} = '*document_root 
C7
  |isindex:{1}
  |menu_directions:D[up->E4]
  |node_directions:D[prev->E4|up->E4]
+ |node_number:{2}
  |normalized:{Copying-and-indices}
   *arguments_line C1
    *line_arg C1
@@ -418,8 +422,9 @@ $result_tree_text{'index_special_region'} = '*document_root 
C7
  |associated_anchor_command:[E8]
  |associated_node:[E8]
  |section_directions:D[prev->E6|up->E5]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{3}
  |toplevel_directions:D[prev->E6|up->E5]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/indices/index_special_region_no_insertcopying.pl 
b/tta/perl/t/results/indices/index_special_region_no_insertcopying.pl
index 5e0a4dc02f..d9210b4757 100644
--- a/tta/perl/t/results/indices/index_special_region_no_insertcopying.pl
+++ b/tta/perl/t/results/indices/index_special_region_no_insertcopying.pl
@@ -214,6 +214,7 @@ $result_tree_text{'index_special_region_no_insertcopying'} 
= '*document_root C7
  |is_target:{1}
  |menus:EC[E7]
  |node_directions:D[next->E8]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -230,6 +231,7 @@ $result_tree_text{'index_special_region_no_insertcopying'} 
= '*document_root C7
  |associated_node:[E4]
  |section_childs:EC[E6|E9]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -248,8 +250,9 @@ $result_tree_text{'index_special_region_no_insertcopying'} 
= '*document_root C7
   |{ }
  |EXTRA
  |section_directions:D[next->E9|up->E5]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E9|prev->E5|up->E5]
   *arguments_line C1
    *line_arg C1
@@ -425,6 +428,7 @@ $result_tree_text{'index_special_region_no_insertcopying'} 
= '*document_root C7
  |is_target:{1}
  |menu_directions:D[up->E4]
  |node_directions:D[prev->E4|up->E4]
+ |node_number:{2}
  |normalized:{Copying-and-indices}
   *arguments_line C1
    *line_arg C1
@@ -440,8 +444,9 @@ $result_tree_text{'index_special_region_no_insertcopying'} 
= '*document_root C7
  |associated_anchor_command:[E8]
  |associated_node:[E8]
  |section_directions:D[prev->E6|up->E5]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{3}
  |toplevel_directions:D[prev->E6|up->E5]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
 
b/tta/perl/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
index 044aa17f8b..8d124d92c0 100644
--- 
a/tta/perl/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
+++ 
b/tta/perl/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
@@ -214,6 +214,7 @@ 
$result_tree_text{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}
  |is_target:{1}
  |menus:EC[E7]
  |node_directions:D[next->E8]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -230,6 +231,7 @@ 
$result_tree_text{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}
  |associated_node:[E4]
  |section_childs:EC[E6|E9]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -248,8 +250,9 @@ 
$result_tree_text{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}
   |{ }
  |EXTRA
  |section_directions:D[next->E9|up->E5]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E9|prev->E5|up->E5]
   *arguments_line C1
    *line_arg C1
@@ -425,6 +428,7 @@ 
$result_tree_text{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}
  |is_target:{1}
  |menu_directions:D[up->E4]
  |node_directions:D[prev->E4|up->E4]
+ |node_number:{2}
  |normalized:{Copying-and-indices}
   *arguments_line C1
    *line_arg C1
@@ -440,8 +444,9 @@ 
$result_tree_text{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}
  |associated_anchor_command:[E8]
  |associated_node:[E8]
  |section_directions:D[prev->E6|up->E5]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{3}
  |toplevel_directions:D[prev->E6|up->E5]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
 
b/tta/perl/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
index b9851c18f5..395631e2d0 100644
--- 
a/tta/perl/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
+++ 
b/tta/perl/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
@@ -214,6 +214,7 @@ 
$result_tree_text{'index_special_region_no_insertcopying_titlepage_no_nodes'} =
  |is_target:{1}
  |menus:EC[E7]
  |node_directions:D[next->E8]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -230,6 +231,7 @@ 
$result_tree_text{'index_special_region_no_insertcopying_titlepage_no_nodes'} =
  |associated_node:[E4]
  |section_childs:EC[E6|E9]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -248,8 +250,9 @@ 
$result_tree_text{'index_special_region_no_insertcopying_titlepage_no_nodes'} =
   |{ }
  |EXTRA
  |section_directions:D[next->E9|up->E5]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E9|prev->E5|up->E5]
   *arguments_line C1
    *line_arg C1
@@ -425,6 +428,7 @@ 
$result_tree_text{'index_special_region_no_insertcopying_titlepage_no_nodes'} =
  |is_target:{1}
  |menu_directions:D[up->E4]
  |node_directions:D[prev->E4|up->E4]
+ |node_number:{2}
  |normalized:{Copying-and-indices}
   *arguments_line C1
    *line_arg C1
@@ -440,8 +444,9 @@ 
$result_tree_text{'index_special_region_no_insertcopying_titlepage_no_nodes'} =
  |associated_anchor_command:[E8]
  |associated_node:[E8]
  |section_directions:D[prev->E6|up->E5]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{3}
  |toplevel_directions:D[prev->E6|up->E5]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
 
b/tta/perl/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
index f3287e63a6..98779210d6 100644
--- 
a/tta/perl/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
+++ 
b/tta/perl/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
@@ -214,6 +214,7 @@ 
$result_tree_text{'index_special_region_no_insertcopying_titlepage_no_nodes_foot
  |is_target:{1}
  |menus:EC[E7]
  |node_directions:D[next->E8]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -230,6 +231,7 @@ 
$result_tree_text{'index_special_region_no_insertcopying_titlepage_no_nodes_foot
  |associated_node:[E4]
  |section_childs:EC[E6|E9]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -248,8 +250,9 @@ 
$result_tree_text{'index_special_region_no_insertcopying_titlepage_no_nodes_foot
   |{ }
  |EXTRA
  |section_directions:D[next->E9|up->E5]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E9|prev->E5|up->E5]
   *arguments_line C1
    *line_arg C1
@@ -425,6 +428,7 @@ 
$result_tree_text{'index_special_region_no_insertcopying_titlepage_no_nodes_foot
  |is_target:{1}
  |menu_directions:D[up->E4]
  |node_directions:D[prev->E4|up->E4]
+ |node_number:{2}
  |normalized:{Copying-and-indices}
   *arguments_line C1
    *line_arg C1
@@ -440,8 +444,9 @@ 
$result_tree_text{'index_special_region_no_insertcopying_titlepage_no_nodes_foot
  |associated_anchor_command:[E8]
  |associated_node:[E8]
  |section_directions:D[prev->E6|up->E5]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{3}
  |toplevel_directions:D[prev->E6|up->E5]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/indices/index_special_region_no_titlepage_no_nodes.pl 
b/tta/perl/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
index 9e578296a3..04fe8ecfe1 100644
--- a/tta/perl/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
+++ b/tta/perl/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
@@ -189,6 +189,7 @@ 
$result_tree_text{'index_special_region_no_titlepage_no_nodes'} = '*document_roo
  |is_target:{1}
  |menus:EC[E7]
  |node_directions:D[next->E8]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -205,6 +206,7 @@ 
$result_tree_text{'index_special_region_no_titlepage_no_nodes'} = '*document_roo
  |associated_node:[E4]
  |section_childs:EC[E6|E9]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -223,8 +225,9 @@ 
$result_tree_text{'index_special_region_no_titlepage_no_nodes'} = '*document_roo
   |{ }
  |EXTRA
  |section_directions:D[next->E9|up->E5]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E9|prev->E5|up->E5]
   *arguments_line C1
    *line_arg C1
@@ -403,6 +406,7 @@ 
$result_tree_text{'index_special_region_no_titlepage_no_nodes'} = '*document_roo
  |isindex:{1}
  |menu_directions:D[up->E4]
  |node_directions:D[prev->E4|up->E4]
+ |node_number:{2}
  |normalized:{Copying-and-indices}
   *arguments_line C1
    *line_arg C1
@@ -418,8 +422,9 @@ 
$result_tree_text{'index_special_region_no_titlepage_no_nodes'} = '*document_roo
  |associated_anchor_command:[E8]
  |associated_node:[E8]
  |section_directions:D[prev->E6|up->E5]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{3}
  |toplevel_directions:D[prev->E6|up->E5]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/indices/index_special_region_titlepage_no_nodes.pl 
b/tta/perl/t/results/indices/index_special_region_titlepage_no_nodes.pl
index 395d12fb96..7fc1ae1c03 100644
--- a/tta/perl/t/results/indices/index_special_region_titlepage_no_nodes.pl
+++ b/tta/perl/t/results/indices/index_special_region_titlepage_no_nodes.pl
@@ -189,6 +189,7 @@ 
$result_tree_text{'index_special_region_titlepage_no_nodes'} = '*document_root C
  |is_target:{1}
  |menus:EC[E7]
  |node_directions:D[next->E8]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -205,6 +206,7 @@ 
$result_tree_text{'index_special_region_titlepage_no_nodes'} = '*document_root C
  |associated_node:[E4]
  |section_childs:EC[E6|E9]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -223,8 +225,9 @@ 
$result_tree_text{'index_special_region_titlepage_no_nodes'} = '*document_root C
   |{ }
  |EXTRA
  |section_directions:D[next->E9|up->E5]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E9|prev->E5|up->E5]
   *arguments_line C1
    *line_arg C1
@@ -403,6 +406,7 @@ 
$result_tree_text{'index_special_region_titlepage_no_nodes'} = '*document_root C
  |isindex:{1}
  |menu_directions:D[up->E4]
  |node_directions:D[prev->E4|up->E4]
+ |node_number:{2}
  |normalized:{Copying-and-indices}
   *arguments_line C1
    *line_arg C1
@@ -418,8 +422,9 @@ 
$result_tree_text{'index_special_region_titlepage_no_nodes'} = '*document_root C
  |associated_anchor_command:[E8]
  |associated_node:[E8]
  |section_directions:D[prev->E6|up->E5]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{3}
  |toplevel_directions:D[prev->E6|up->E5]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
 
b/tta/perl/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
index 720f252983..be197ce953 100644
--- 
a/tta/perl/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
+++ 
b/tta/perl/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
@@ -189,6 +189,7 @@ 
$result_tree_text{'index_special_region_titlepage_no_nodes_footnotes_default'} =
  |is_target:{1}
  |menus:EC[E7]
  |node_directions:D[next->E8]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -205,6 +206,7 @@ 
$result_tree_text{'index_special_region_titlepage_no_nodes_footnotes_default'} =
  |associated_node:[E4]
  |section_childs:EC[E6|E9]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -223,8 +225,9 @@ 
$result_tree_text{'index_special_region_titlepage_no_nodes_footnotes_default'} =
   |{ }
  |EXTRA
  |section_directions:D[next->E9|up->E5]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E9|prev->E5|up->E5]
   *arguments_line C1
    *line_arg C1
@@ -403,6 +406,7 @@ 
$result_tree_text{'index_special_region_titlepage_no_nodes_footnotes_default'} =
  |isindex:{1}
  |menu_directions:D[up->E4]
  |node_directions:D[prev->E4|up->E4]
+ |node_number:{2}
  |normalized:{Copying-and-indices}
   *arguments_line C1
    *line_arg C1
@@ -418,8 +422,9 @@ 
$result_tree_text{'index_special_region_titlepage_no_nodes_footnotes_default'} =
  |associated_anchor_command:[E8]
  |associated_node:[E8]
  |section_directions:D[prev->E6|up->E5]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{3}
  |toplevel_directions:D[prev->E6|up->E5]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/indices/index_split.pl 
b/tta/perl/t/results/indices/index_split.pl
index 96e3415169..307e0c1ace 100644
--- a/tta/perl/t/results/indices/index_split.pl
+++ b/tta/perl/t/results/indices/index_split.pl
@@ -22,6 +22,7 @@ $result_tree_text{'index_split'} = '*document_root C21
  |menu_directions:D[next->E3|up->E0]
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -38,6 +39,7 @@ $result_tree_text{'index_split'} = '*document_root C21
  |associated_node:[E0]
  |section_childs:EC[E4|E21]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -169,6 +171,7 @@ $result_tree_text{'index_split'} = '*document_root C21
  |menu_directions:D[next->E20|prev->E0|up->E0]
  |menus:EC[E5]
  |node_directions:D[next->E20|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
@@ -281,8 +284,9 @@ $result_tree_text{'index_split'} = '*document_root C21
  |associated_node:[E3]
  |section_childs:EC[E7|E14|E16]
  |section_directions:D[next->E21|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E21|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -426,6 +430,7 @@ $result_tree_text{'index_split'} = '*document_root C21
  |menu_directions:D[next->E13|up->E3]
  |menus:EC[E8]
  |node_directions:D[next->E13|up->E3]
+ |node_number:{3}
  |normalized:{section-1}
   *arguments_line C1
    *line_arg C1
@@ -442,8 +447,9 @@ $result_tree_text{'index_split'} = '*document_root C21
  |associated_node:[E6]
  |section_childs:EC[E10|E12]
  |section_directions:D[next->E14|up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -544,6 +550,7 @@ $result_tree_text{'index_split'} = '*document_root C21
  |is_target:{1}
  |menu_directions:D[next->E11|up->E6]
  |node_directions:D[next->E11|up->E6]
+ |node_number:{4}
  |normalized:{subsection-1}
   *arguments_line C1
    *line_arg C1
@@ -559,8 +566,9 @@ $result_tree_text{'index_split'} = '*document_root C21
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[next->E12|up->E7]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -582,6 +590,7 @@ $result_tree_text{'index_split'} = '*document_root C21
  |isindex:{1}
  |menu_directions:D[prev->E9|up->E6]
  |node_directions:D[prev->E9|up->E6]
+ |node_number:{5}
  |normalized:{subsection-2}
   *arguments_line C1
    *line_arg C1
@@ -597,8 +606,9 @@ $result_tree_text{'index_split'} = '*document_root C21
  |associated_anchor_command:[E11]
  |associated_node:[E11]
  |section_directions:D[prev->E10|up->E7]
+ |section_heading_number:{1.1.2}
  |section_level:{3}
- |section_number:{1.1.2}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -660,6 +670,7 @@ $result_tree_text{'index_split'} = '*document_root C21
  |is_target:{1}
  |menu_directions:D[next->E15|prev->E6|up->E3]
  |node_directions:D[next->E15|prev->E6|up->E3]
+ |node_number:{6}
  |normalized:{section-2}
   *arguments_line C1
    *line_arg C1
@@ -675,8 +686,9 @@ $result_tree_text{'index_split'} = '*document_root C21
  |associated_anchor_command:[E13]
  |associated_node:[E13]
  |section_directions:D[next->E16|prev->E7|up->E4]
+ |section_heading_number:{1.2}
  |section_level:{2}
- |section_number:{1.2}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -698,6 +710,7 @@ $result_tree_text{'index_split'} = '*document_root C21
  |isindex:{1}
  |menu_directions:D[next->E17|prev->E13|up->E3]
  |node_directions:D[next->E17|prev->E13|up->E3]
+ |node_number:{7}
  |normalized:{section-3}
   *arguments_line C1
    *line_arg C1
@@ -713,8 +726,9 @@ $result_tree_text{'index_split'} = '*document_root C21
  |associated_anchor_command:[E15]
  |associated_node:[E15]
  |section_directions:D[prev->E14|up->E4]
+ |section_heading_number:{1.3}
  |section_level:{2}
- |section_number:{1.3}
+ |section_number:{7}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -757,6 +771,7 @@ $result_tree_text{'index_split'} = '*document_root C21
  |is_target:{1}
  |menu_directions:D[next->E18|prev->E15|up->E3]
  |node_directions:D[prev->E15|up->E3]
+ |node_number:{8}
  |normalized:{node-in-section-3}
   *arguments_line C4
    *line_arg C1
@@ -801,6 +816,7 @@ $result_tree_text{'index_split'} = '*document_root C21
  |isindex:{1}
  |menu_directions:D[next->E19|prev->E17|up->E3]
  |node_directions:D[up->E3]
+ |node_number:{9}
  |normalized:{node-2-in-section-3}
   *arguments_line C4
    *line_arg C1
@@ -894,6 +910,7 @@ $result_tree_text{'index_split'} = '*document_root C21
  |is_target:{1}
  |menu_directions:D[prev->E18|up->E3]
  |node_directions:D[up->E3]
+ |node_number:{10}
  |normalized:{node-3-in-section-3}
   *arguments_line C4
    *line_arg C1
@@ -933,6 +950,7 @@ $result_tree_text{'index_split'} = '*document_root C21
  |is_target:{1}
  |menu_directions:D[prev->E3|up->E0]
  |node_directions:D[prev->E3|up->E0]
+ |node_number:{11}
  |normalized:{second-chapter}
   *arguments_line C1
    *line_arg C1
@@ -948,8 +966,9 @@ $result_tree_text{'index_split'} = '*document_root C21
  |associated_anchor_command:[E20]
  |associated_node:[E20]
  |section_directions:D[prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{8}
  |toplevel_directions:D[prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/indices/index_split_split_chapter_no_nodes.pl 
b/tta/perl/t/results/indices/index_split_split_chapter_no_nodes.pl
index 9f31738c0c..3f8676af7a 100644
--- a/tta/perl/t/results/indices/index_split_split_chapter_no_nodes.pl
+++ b/tta/perl/t/results/indices/index_split_split_chapter_no_nodes.pl
@@ -22,6 +22,7 @@ $result_tree_text{'index_split_split_chapter_no_nodes'} = 
'*document_root C21
  |menu_directions:D[next->E3|up->E0]
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -38,6 +39,7 @@ $result_tree_text{'index_split_split_chapter_no_nodes'} = 
'*document_root C21
  |associated_node:[E0]
  |section_childs:EC[E4|E21]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -169,6 +171,7 @@ $result_tree_text{'index_split_split_chapter_no_nodes'} = 
'*document_root C21
  |menu_directions:D[next->E20|prev->E0|up->E0]
  |menus:EC[E5]
  |node_directions:D[next->E20|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
@@ -281,8 +284,9 @@ $result_tree_text{'index_split_split_chapter_no_nodes'} = 
'*document_root C21
  |associated_node:[E3]
  |section_childs:EC[E7|E14|E16]
  |section_directions:D[next->E21|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E21|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -426,6 +430,7 @@ $result_tree_text{'index_split_split_chapter_no_nodes'} = 
'*document_root C21
  |menu_directions:D[next->E13|up->E3]
  |menus:EC[E8]
  |node_directions:D[next->E13|up->E3]
+ |node_number:{3}
  |normalized:{section-1}
   *arguments_line C1
    *line_arg C1
@@ -442,8 +447,9 @@ $result_tree_text{'index_split_split_chapter_no_nodes'} = 
'*document_root C21
  |associated_node:[E6]
  |section_childs:EC[E10|E12]
  |section_directions:D[next->E14|up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -544,6 +550,7 @@ $result_tree_text{'index_split_split_chapter_no_nodes'} = 
'*document_root C21
  |is_target:{1}
  |menu_directions:D[next->E11|up->E6]
  |node_directions:D[next->E11|up->E6]
+ |node_number:{4}
  |normalized:{subsection-1}
   *arguments_line C1
    *line_arg C1
@@ -559,8 +566,9 @@ $result_tree_text{'index_split_split_chapter_no_nodes'} = 
'*document_root C21
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[next->E12|up->E7]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -582,6 +590,7 @@ $result_tree_text{'index_split_split_chapter_no_nodes'} = 
'*document_root C21
  |isindex:{1}
  |menu_directions:D[prev->E9|up->E6]
  |node_directions:D[prev->E9|up->E6]
+ |node_number:{5}
  |normalized:{subsection-2}
   *arguments_line C1
    *line_arg C1
@@ -597,8 +606,9 @@ $result_tree_text{'index_split_split_chapter_no_nodes'} = 
'*document_root C21
  |associated_anchor_command:[E11]
  |associated_node:[E11]
  |section_directions:D[prev->E10|up->E7]
+ |section_heading_number:{1.1.2}
  |section_level:{3}
- |section_number:{1.1.2}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -660,6 +670,7 @@ $result_tree_text{'index_split_split_chapter_no_nodes'} = 
'*document_root C21
  |is_target:{1}
  |menu_directions:D[next->E15|prev->E6|up->E3]
  |node_directions:D[next->E15|prev->E6|up->E3]
+ |node_number:{6}
  |normalized:{section-2}
   *arguments_line C1
    *line_arg C1
@@ -675,8 +686,9 @@ $result_tree_text{'index_split_split_chapter_no_nodes'} = 
'*document_root C21
  |associated_anchor_command:[E13]
  |associated_node:[E13]
  |section_directions:D[next->E16|prev->E7|up->E4]
+ |section_heading_number:{1.2}
  |section_level:{2}
- |section_number:{1.2}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -698,6 +710,7 @@ $result_tree_text{'index_split_split_chapter_no_nodes'} = 
'*document_root C21
  |isindex:{1}
  |menu_directions:D[next->E17|prev->E13|up->E3]
  |node_directions:D[next->E17|prev->E13|up->E3]
+ |node_number:{7}
  |normalized:{section-3}
   *arguments_line C1
    *line_arg C1
@@ -713,8 +726,9 @@ $result_tree_text{'index_split_split_chapter_no_nodes'} = 
'*document_root C21
  |associated_anchor_command:[E15]
  |associated_node:[E15]
  |section_directions:D[prev->E14|up->E4]
+ |section_heading_number:{1.3}
  |section_level:{2}
- |section_number:{1.3}
+ |section_number:{7}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -757,6 +771,7 @@ $result_tree_text{'index_split_split_chapter_no_nodes'} = 
'*document_root C21
  |is_target:{1}
  |menu_directions:D[next->E18|prev->E15|up->E3]
  |node_directions:D[prev->E15|up->E3]
+ |node_number:{8}
  |normalized:{node-in-section-3}
   *arguments_line C4
    *line_arg C1
@@ -801,6 +816,7 @@ $result_tree_text{'index_split_split_chapter_no_nodes'} = 
'*document_root C21
  |isindex:{1}
  |menu_directions:D[next->E19|prev->E17|up->E3]
  |node_directions:D[up->E3]
+ |node_number:{9}
  |normalized:{node-2-in-section-3}
   *arguments_line C4
    *line_arg C1
@@ -894,6 +910,7 @@ $result_tree_text{'index_split_split_chapter_no_nodes'} = 
'*document_root C21
  |is_target:{1}
  |menu_directions:D[prev->E18|up->E3]
  |node_directions:D[up->E3]
+ |node_number:{10}
  |normalized:{node-3-in-section-3}
   *arguments_line C4
    *line_arg C1
@@ -933,6 +950,7 @@ $result_tree_text{'index_split_split_chapter_no_nodes'} = 
'*document_root C21
  |is_target:{1}
  |menu_directions:D[prev->E3|up->E0]
  |node_directions:D[prev->E3|up->E0]
+ |node_number:{11}
  |normalized:{second-chapter}
   *arguments_line C1
    *line_arg C1
@@ -948,8 +966,9 @@ $result_tree_text{'index_split_split_chapter_no_nodes'} = 
'*document_root C21
  |associated_anchor_command:[E20]
  |associated_node:[E20]
  |section_directions:D[prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{8}
  |toplevel_directions:D[prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/indices/index_table.pl 
b/tta/perl/t/results/indices/index_table.pl
index 7fad7c6598..48bc6fbf38 100644
--- a/tta/perl/t/results/indices/index_table.pl
+++ b/tta/perl/t/results/indices/index_table.pl
@@ -20,6 +20,7 @@ $result_tree_text{'index_table'} = '*document_root C12
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'index_table'} = '*document_root C12
  |associated_node:[E0]
  |section_childs:EC[E4|E6|E8]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -109,6 +111,7 @@ $result_tree_text{'index_table'} = '*document_root C12
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node-with-ftable-and-vtable}
   *arguments_line C1
    *line_arg C1
@@ -124,8 +127,9 @@ $result_tree_text{'index_table'} = '*document_root C12
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -298,6 +302,7 @@ $result_tree_text{'index_table'} = '*document_root C12
  |isindex:{1}
  |menu_directions:D[next->E7|prev->E3|up->E0]
  |node_directions:D[next->E7|prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{node-with-printindex}
   *arguments_line C1
    *line_arg C1
@@ -313,8 +318,9 @@ $result_tree_text{'index_table'} = '*document_root C12
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[next->E8|prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E8|prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -372,6 +378,7 @@ $result_tree_text{'index_table'} = '*document_root C12
  |menu_directions:D[prev->E5|up->E0]
  |menus:EC[E9]
  |node_directions:D[prev->E5|up->E0]
+ |node_number:{4}
  |normalized:{indices-refs}
   *arguments_line C1
    *line_arg C1
@@ -388,8 +395,9 @@ $result_tree_text{'index_table'} = '*document_root C12
  |associated_node:[E7]
  |section_childs:EC[E11]
  |section_directions:D[prev->E6|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{4}
  |toplevel_directions:D[prev->E6|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -2116,6 +2124,7 @@ $result_tree_text{'index_table'} = '*document_root C12
  |associated_title_command:[E11]
  |is_target:{1}
  |menu_directions:D[up->E7]
+ |node_number:{5}
  |normalized:{node}
   *arguments_line C4
    *line_arg C1
@@ -2134,8 +2143,9 @@ $result_tree_text{'index_table'} = '*document_root C12
  |associated_anchor_command:[E10]
  |associated_node:[E10]
  |section_directions:D[up->E8]
+ |section_heading_number:{3.1}
  |section_level:{2}
- |section_number:{3.1}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/indices/index_table_chapter_no_node.pl 
b/tta/perl/t/results/indices/index_table_chapter_no_node.pl
index dd3476e7b7..8aa4db563f 100644
--- a/tta/perl/t/results/indices/index_table_chapter_no_node.pl
+++ b/tta/perl/t/results/indices/index_table_chapter_no_node.pl
@@ -20,6 +20,7 @@ $result_tree_text{'index_table_chapter_no_node'} = 
'*document_root C12
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'index_table_chapter_no_node'} = 
'*document_root C12
  |associated_node:[E0]
  |section_childs:EC[E4|E6|E8]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -109,6 +111,7 @@ $result_tree_text{'index_table_chapter_no_node'} = 
'*document_root C12
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node-with-ftable-and-vtable}
   *arguments_line C1
    *line_arg C1
@@ -124,8 +127,9 @@ $result_tree_text{'index_table_chapter_no_node'} = 
'*document_root C12
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -298,6 +302,7 @@ $result_tree_text{'index_table_chapter_no_node'} = 
'*document_root C12
  |isindex:{1}
  |menu_directions:D[next->E7|prev->E3|up->E0]
  |node_directions:D[next->E7|prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{node-with-printindex}
   *arguments_line C1
    *line_arg C1
@@ -313,8 +318,9 @@ $result_tree_text{'index_table_chapter_no_node'} = 
'*document_root C12
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[next->E8|prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E8|prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -372,6 +378,7 @@ $result_tree_text{'index_table_chapter_no_node'} = 
'*document_root C12
  |menu_directions:D[prev->E5|up->E0]
  |menus:EC[E9]
  |node_directions:D[prev->E5|up->E0]
+ |node_number:{4}
  |normalized:{indices-refs}
   *arguments_line C1
    *line_arg C1
@@ -388,8 +395,9 @@ $result_tree_text{'index_table_chapter_no_node'} = 
'*document_root C12
  |associated_node:[E7]
  |section_childs:EC[E11]
  |section_directions:D[prev->E6|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{4}
  |toplevel_directions:D[prev->E6|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -2116,6 +2124,7 @@ $result_tree_text{'index_table_chapter_no_node'} = 
'*document_root C12
  |associated_title_command:[E11]
  |is_target:{1}
  |menu_directions:D[up->E7]
+ |node_number:{5}
  |normalized:{node}
   *arguments_line C4
    *line_arg C1
@@ -2134,8 +2143,9 @@ $result_tree_text{'index_table_chapter_no_node'} = 
'*document_root C12
  |associated_anchor_command:[E10]
  |associated_node:[E10]
  |section_directions:D[up->E8]
+ |section_heading_number:{3.1}
  |section_level:{2}
- |section_number:{3.1}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git 
a/tta/perl/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl 
b/tta/perl/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
index cc86ed1f37..3279497ec1 100644
Binary files 
a/tta/perl/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl and 
b/tta/perl/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl 
differ
diff --git a/tta/perl/t/results/indices/nodes_before_top.pl 
b/tta/perl/t/results/indices/nodes_before_top.pl
index 8c8a503786..3f5f22d3d6 100644
--- a/tta/perl/t/results/indices/nodes_before_top.pl
+++ b/tta/perl/t/results/indices/nodes_before_top.pl
@@ -23,6 +23,7 @@ $result_tree_text{'nodes_before_top'} = '*document_root C9
  |isindex:{1}
  |menus:EC[E1]
  |node_directions:D[next->E3|up->MISSING: (line_arg)[C3]]
+ |node_number:{1}
  |normalized:{first-before-top}
   *arguments_line C4
    *line_arg C1
@@ -113,6 +114,7 @@ $result_tree_text{'nodes_before_top'} = '*document_root C9
  |isindex:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[up->E0]
+ |node_number:{2}
  |normalized:{node-in-menu-before-top}
   *arguments_line C4
    *line_arg C1
@@ -180,6 +182,7 @@ $result_tree_text{'nodes_before_top'} = '*document_root C9
  |isindex:{1}
  |menus:EC[E4]
  |node_directions:D[prev->E0]
+ |node_number:{3}
  |normalized:{Top}
   *arguments_line C3
    *line_arg C1
@@ -291,6 +294,7 @@ $result_tree_text{'nodes_before_top'} = '*document_root C9
  |menu_directions:D[up->E3]
  |menus:EC[E6]
  |node_directions:D[prev->E3|up->E3]
+ |node_number:{4}
  |normalized:{chap-first}
   *arguments_line C4
    *line_arg C1
@@ -405,6 +409,7 @@ $result_tree_text{'nodes_before_top'} = '*document_root C9
  |menu_directions:D[up->E5]
  |menus:EC[E8]
  |node_directions:D[up->E5]
+ |node_number:{5}
  |normalized:{second}
   *arguments_line C4
    *line_arg C1
@@ -480,6 +485,7 @@ $result_tree_text{'nodes_before_top'} = '*document_root C9
  |is_target:{1}
  |menu_directions:D[prev->E10|up->E7]
  |node_directions:D[prev->E10|up->E7]
+ |node_number:{6}
  |normalized:{another}
   *arguments_line C4
    *line_arg C1
@@ -556,6 +562,7 @@ $result_tree_text{'nodes_before_top'} = '*document_root C9
  |isindex:{1}
  |menu_directions:D[next->E9|up->E7]
  |node_directions:D[next->E9|up->E7]
+ |node_number:{7}
  |normalized:{a-node}
   *arguments_line C4
    *line_arg C1
diff --git 
a/tta/perl/t/results/indices/nodes_before_top_and_sections_chapter.pl 
b/tta/perl/t/results/indices/nodes_before_top_and_sections_chapter.pl
index a8cadc2a1f..eb597c9e09 100644
--- a/tta/perl/t/results/indices/nodes_before_top_and_sections_chapter.pl
+++ b/tta/perl/t/results/indices/nodes_before_top_and_sections_chapter.pl
@@ -19,6 +19,7 @@ $result_tree_text{'nodes_before_top_and_sections_chapter'} = 
'*document_root C13
  |isindex:{1}
  |menus:EC[E1]
  |node_directions:D[next->E3|up->MISSING: (line_arg)[C3]]
+ |node_number:{1}
  |normalized:{first-before-top}
   *arguments_line C4
    *line_arg C1
@@ -126,6 +127,7 @@ $result_tree_text{'nodes_before_top_and_sections_chapter'} 
= '*document_root C13
  |isindex:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[up->E0]
+ |node_number:{2}
  |normalized:{node-in-menu-before-top}
   *arguments_line C4
    *line_arg C1
@@ -197,6 +199,7 @@ $result_tree_text{'nodes_before_top_and_sections_chapter'} 
= '*document_root C13
  |isindex:{1}
  |menus:EC[E5]
  |node_directions:D[prev->E0]
+ |node_number:{3}
  |normalized:{Top}
   *arguments_line C3
    *line_arg C1
@@ -279,6 +282,7 @@ $result_tree_text{'nodes_before_top_and_sections_chapter'} 
= '*document_root C13
  |associated_node:[E3]
  |section_childs:EC[E13]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -369,6 +373,7 @@ $result_tree_text{'nodes_before_top_and_sections_chapter'} 
= '*document_root C13
  |menu_directions:D[next->E12|up->E3]
  |menus:EC[E7]
  |node_directions:D[prev->E3|up->E3]
+ |node_number:{4}
  |normalized:{first}
   *arguments_line C4
    *line_arg C1
@@ -483,6 +488,7 @@ $result_tree_text{'nodes_before_top_and_sections_chapter'} 
= '*document_root C13
  |menu_directions:D[up->E6]
  |menus:EC[E9]
  |node_directions:D[up->E6]
+ |node_number:{5}
  |normalized:{second}
   *arguments_line C4
    *line_arg C1
@@ -558,6 +564,7 @@ $result_tree_text{'nodes_before_top_and_sections_chapter'} 
= '*document_root C13
  |is_target:{1}
  |menu_directions:D[prev->E11|up->E8]
  |node_directions:D[prev->E11|up->E8]
+ |node_number:{6}
  |normalized:{another}
   *arguments_line C4
    *line_arg C1
@@ -634,6 +641,7 @@ $result_tree_text{'nodes_before_top_and_sections_chapter'} 
= '*document_root C13
  |isindex:{1}
  |menu_directions:D[next->E10|up->E8]
  |node_directions:D[next->E10|up->E8]
+ |node_number:{7}
  |normalized:{a-node}
   *arguments_line C4
    *line_arg C1
@@ -736,6 +744,7 @@ $result_tree_text{'nodes_before_top_and_sections_chapter'} 
= '*document_root C13
  |isindex:{1}
  |menu_directions:D[next->E14|prev->E6|up->E3]
  |node_directions:D[next->E14|up->E3]
+ |node_number:{8}
  |normalized:{chapter}
   *arguments_line C4
    *line_arg C1
@@ -762,8 +771,9 @@ $result_tree_text{'nodes_before_top_and_sections_chapter'} 
= '*document_root C13
  |associated_anchor_command:[E12]
  |associated_node:[E12]
  |section_directions:D[up->E4]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E4|up->E4]
   *arguments_line C1
    *line_arg C1
@@ -793,6 +803,7 @@ $result_tree_text{'nodes_before_top_and_sections_chapter'} 
= '*document_root C13
  |is_target:{1}
  |menu_directions:D[prev->E12|up->E3]
  |node_directions:D[prev->E12|up->E3]
+ |node_number:{9}
  |normalized:{node-in-chapter}
   *arguments_line C4
    *line_arg C1
diff --git 
a/tta/perl/t/results/indices/nodes_before_top_and_sections_chapter_no_node.pl 
b/tta/perl/t/results/indices/nodes_before_top_and_sections_chapter_no_node.pl
index 3838ecd76d..65fa7d4e97 100644
--- 
a/tta/perl/t/results/indices/nodes_before_top_and_sections_chapter_no_node.pl
+++ 
b/tta/perl/t/results/indices/nodes_before_top_and_sections_chapter_no_node.pl
@@ -19,6 +19,7 @@ 
$result_tree_text{'nodes_before_top_and_sections_chapter_no_node'} = '*document_
  |isindex:{1}
  |menus:EC[E1]
  |node_directions:D[next->E3|up->MISSING: (line_arg)[C3]]
+ |node_number:{1}
  |normalized:{first-before-top}
   *arguments_line C4
    *line_arg C1
@@ -126,6 +127,7 @@ 
$result_tree_text{'nodes_before_top_and_sections_chapter_no_node'} = '*document_
  |isindex:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[up->E0]
+ |node_number:{2}
  |normalized:{node-in-menu-before-top}
   *arguments_line C4
    *line_arg C1
@@ -197,6 +199,7 @@ 
$result_tree_text{'nodes_before_top_and_sections_chapter_no_node'} = '*document_
  |isindex:{1}
  |menus:EC[E5]
  |node_directions:D[prev->E0]
+ |node_number:{3}
  |normalized:{Top}
   *arguments_line C3
    *line_arg C1
@@ -279,6 +282,7 @@ 
$result_tree_text{'nodes_before_top_and_sections_chapter_no_node'} = '*document_
  |associated_node:[E3]
  |section_childs:EC[E13]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -369,6 +373,7 @@ 
$result_tree_text{'nodes_before_top_and_sections_chapter_no_node'} = '*document_
  |menu_directions:D[next->E12|up->E3]
  |menus:EC[E7]
  |node_directions:D[prev->E3|up->E3]
+ |node_number:{4}
  |normalized:{first}
   *arguments_line C4
    *line_arg C1
@@ -483,6 +488,7 @@ 
$result_tree_text{'nodes_before_top_and_sections_chapter_no_node'} = '*document_
  |menu_directions:D[up->E6]
  |menus:EC[E9]
  |node_directions:D[up->E6]
+ |node_number:{5}
  |normalized:{second}
   *arguments_line C4
    *line_arg C1
@@ -558,6 +564,7 @@ 
$result_tree_text{'nodes_before_top_and_sections_chapter_no_node'} = '*document_
  |is_target:{1}
  |menu_directions:D[prev->E11|up->E8]
  |node_directions:D[prev->E11|up->E8]
+ |node_number:{6}
  |normalized:{another}
   *arguments_line C4
    *line_arg C1
@@ -634,6 +641,7 @@ 
$result_tree_text{'nodes_before_top_and_sections_chapter_no_node'} = '*document_
  |isindex:{1}
  |menu_directions:D[next->E10|up->E8]
  |node_directions:D[next->E10|up->E8]
+ |node_number:{7}
  |normalized:{a-node}
   *arguments_line C4
    *line_arg C1
@@ -736,6 +744,7 @@ 
$result_tree_text{'nodes_before_top_and_sections_chapter_no_node'} = '*document_
  |isindex:{1}
  |menu_directions:D[next->E14|prev->E6|up->E3]
  |node_directions:D[next->E14|up->E3]
+ |node_number:{8}
  |normalized:{chapter}
   *arguments_line C4
    *line_arg C1
@@ -762,8 +771,9 @@ 
$result_tree_text{'nodes_before_top_and_sections_chapter_no_node'} = '*document_
  |associated_anchor_command:[E12]
  |associated_node:[E12]
  |section_directions:D[up->E4]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E4|up->E4]
   *arguments_line C1
    *line_arg C1
@@ -793,6 +803,7 @@ 
$result_tree_text{'nodes_before_top_and_sections_chapter_no_node'} = '*document_
  |is_target:{1}
  |menu_directions:D[prev->E12|up->E3]
  |node_directions:D[prev->E12|up->E3]
+ |node_number:{9}
  |normalized:{node-in-chapter}
   *arguments_line C4
    *line_arg C1
diff --git 
a/tta/perl/t/results/indices/nodes_before_top_and_sections_unsplit_no_nodes.pl 
b/tta/perl/t/results/indices/nodes_before_top_and_sections_unsplit_no_nodes.pl
index ad1d0fd099..1f8a80ce2b 100644
--- 
a/tta/perl/t/results/indices/nodes_before_top_and_sections_unsplit_no_nodes.pl
+++ 
b/tta/perl/t/results/indices/nodes_before_top_and_sections_unsplit_no_nodes.pl
@@ -19,6 +19,7 @@ 
$result_tree_text{'nodes_before_top_and_sections_unsplit_no_nodes'} = '*document
  |isindex:{1}
  |menus:EC[E1]
  |node_directions:D[next->E3|up->MISSING: (line_arg)[C3]]
+ |node_number:{1}
  |normalized:{first-before-top}
   *arguments_line C4
    *line_arg C1
@@ -126,6 +127,7 @@ 
$result_tree_text{'nodes_before_top_and_sections_unsplit_no_nodes'} = '*document
  |isindex:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[up->E0]
+ |node_number:{2}
  |normalized:{node-in-menu-before-top}
   *arguments_line C4
    *line_arg C1
@@ -197,6 +199,7 @@ 
$result_tree_text{'nodes_before_top_and_sections_unsplit_no_nodes'} = '*document
  |isindex:{1}
  |menus:EC[E5]
  |node_directions:D[prev->E0]
+ |node_number:{3}
  |normalized:{Top}
   *arguments_line C3
    *line_arg C1
@@ -279,6 +282,7 @@ 
$result_tree_text{'nodes_before_top_and_sections_unsplit_no_nodes'} = '*document
  |associated_node:[E3]
  |section_childs:EC[E13]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -369,6 +373,7 @@ 
$result_tree_text{'nodes_before_top_and_sections_unsplit_no_nodes'} = '*document
  |menu_directions:D[next->E12|up->E3]
  |menus:EC[E7]
  |node_directions:D[prev->E3|up->E3]
+ |node_number:{4}
  |normalized:{first}
   *arguments_line C4
    *line_arg C1
@@ -483,6 +488,7 @@ 
$result_tree_text{'nodes_before_top_and_sections_unsplit_no_nodes'} = '*document
  |menu_directions:D[up->E6]
  |menus:EC[E9]
  |node_directions:D[up->E6]
+ |node_number:{5}
  |normalized:{second}
   *arguments_line C4
    *line_arg C1
@@ -558,6 +564,7 @@ 
$result_tree_text{'nodes_before_top_and_sections_unsplit_no_nodes'} = '*document
  |is_target:{1}
  |menu_directions:D[prev->E11|up->E8]
  |node_directions:D[prev->E11|up->E8]
+ |node_number:{6}
  |normalized:{another}
   *arguments_line C4
    *line_arg C1
@@ -634,6 +641,7 @@ 
$result_tree_text{'nodes_before_top_and_sections_unsplit_no_nodes'} = '*document
  |isindex:{1}
  |menu_directions:D[next->E10|up->E8]
  |node_directions:D[next->E10|up->E8]
+ |node_number:{7}
  |normalized:{a-node}
   *arguments_line C4
    *line_arg C1
@@ -736,6 +744,7 @@ 
$result_tree_text{'nodes_before_top_and_sections_unsplit_no_nodes'} = '*document
  |isindex:{1}
  |menu_directions:D[next->E14|prev->E6|up->E3]
  |node_directions:D[next->E14|up->E3]
+ |node_number:{8}
  |normalized:{chapter}
   *arguments_line C4
    *line_arg C1
@@ -762,8 +771,9 @@ 
$result_tree_text{'nodes_before_top_and_sections_unsplit_no_nodes'} = '*document
  |associated_anchor_command:[E12]
  |associated_node:[E12]
  |section_directions:D[up->E4]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E4|up->E4]
   *arguments_line C1
    *line_arg C1
@@ -793,6 +803,7 @@ 
$result_tree_text{'nodes_before_top_and_sections_unsplit_no_nodes'} = '*document
  |is_target:{1}
  |menu_directions:D[prev->E12|up->E3]
  |node_directions:D[prev->E12|up->E3]
+ |node_number:{9}
  |normalized:{node-in-chapter}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/indices/nodes_before_top_split_chapter.pl 
b/tta/perl/t/results/indices/nodes_before_top_split_chapter.pl
index e5f9184ed5..79f588770d 100644
--- a/tta/perl/t/results/indices/nodes_before_top_split_chapter.pl
+++ b/tta/perl/t/results/indices/nodes_before_top_split_chapter.pl
@@ -23,6 +23,7 @@ $result_tree_text{'nodes_before_top_split_chapter'} = 
'*document_root C9
  |isindex:{1}
  |menus:EC[E1]
  |node_directions:D[next->E3|up->MISSING: (line_arg)[C3]]
+ |node_number:{1}
  |normalized:{first-before-top}
   *arguments_line C4
    *line_arg C1
@@ -113,6 +114,7 @@ $result_tree_text{'nodes_before_top_split_chapter'} = 
'*document_root C9
  |isindex:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[up->E0]
+ |node_number:{2}
  |normalized:{node-in-menu-before-top}
   *arguments_line C4
    *line_arg C1
@@ -180,6 +182,7 @@ $result_tree_text{'nodes_before_top_split_chapter'} = 
'*document_root C9
  |isindex:{1}
  |menus:EC[E4]
  |node_directions:D[prev->E0]
+ |node_number:{3}
  |normalized:{Top}
   *arguments_line C3
    *line_arg C1
@@ -291,6 +294,7 @@ $result_tree_text{'nodes_before_top_split_chapter'} = 
'*document_root C9
  |menu_directions:D[up->E3]
  |menus:EC[E6]
  |node_directions:D[prev->E3|up->E3]
+ |node_number:{4}
  |normalized:{chap-first}
   *arguments_line C4
    *line_arg C1
@@ -405,6 +409,7 @@ $result_tree_text{'nodes_before_top_split_chapter'} = 
'*document_root C9
  |menu_directions:D[up->E5]
  |menus:EC[E8]
  |node_directions:D[up->E5]
+ |node_number:{5}
  |normalized:{second}
   *arguments_line C4
    *line_arg C1
@@ -480,6 +485,7 @@ $result_tree_text{'nodes_before_top_split_chapter'} = 
'*document_root C9
  |is_target:{1}
  |menu_directions:D[prev->E10|up->E7]
  |node_directions:D[prev->E10|up->E7]
+ |node_number:{6}
  |normalized:{another}
   *arguments_line C4
    *line_arg C1
@@ -556,6 +562,7 @@ $result_tree_text{'nodes_before_top_split_chapter'} = 
'*document_root C9
  |isindex:{1}
  |menu_directions:D[next->E9|up->E7]
  |node_directions:D[next->E9|up->E7]
+ |node_number:{7}
  |normalized:{a-node}
   *arguments_line C4
    *line_arg C1
diff --git 
a/tta/perl/t/results/indices/nodes_before_top_split_chapter_no_nodes.pl 
b/tta/perl/t/results/indices/nodes_before_top_split_chapter_no_nodes.pl
index 9b3f5457ec..ee1317a028 100644
--- a/tta/perl/t/results/indices/nodes_before_top_split_chapter_no_nodes.pl
+++ b/tta/perl/t/results/indices/nodes_before_top_split_chapter_no_nodes.pl
@@ -23,6 +23,7 @@ $result_tree_text{'nodes_before_top_split_chapter_no_nodes'} 
= '*document_root C
  |isindex:{1}
  |menus:EC[E1]
  |node_directions:D[next->E3|up->MISSING: (line_arg)[C3]]
+ |node_number:{1}
  |normalized:{first-before-top}
   *arguments_line C4
    *line_arg C1
@@ -113,6 +114,7 @@ 
$result_tree_text{'nodes_before_top_split_chapter_no_nodes'} = '*document_root C
  |isindex:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[up->E0]
+ |node_number:{2}
  |normalized:{node-in-menu-before-top}
   *arguments_line C4
    *line_arg C1
@@ -180,6 +182,7 @@ 
$result_tree_text{'nodes_before_top_split_chapter_no_nodes'} = '*document_root C
  |isindex:{1}
  |menus:EC[E4]
  |node_directions:D[prev->E0]
+ |node_number:{3}
  |normalized:{Top}
   *arguments_line C3
    *line_arg C1
@@ -291,6 +294,7 @@ 
$result_tree_text{'nodes_before_top_split_chapter_no_nodes'} = '*document_root C
  |menu_directions:D[up->E3]
  |menus:EC[E6]
  |node_directions:D[prev->E3|up->E3]
+ |node_number:{4}
  |normalized:{chap-first}
   *arguments_line C4
    *line_arg C1
@@ -405,6 +409,7 @@ 
$result_tree_text{'nodes_before_top_split_chapter_no_nodes'} = '*document_root C
  |menu_directions:D[up->E5]
  |menus:EC[E8]
  |node_directions:D[up->E5]
+ |node_number:{5}
  |normalized:{second}
   *arguments_line C4
    *line_arg C1
@@ -480,6 +485,7 @@ 
$result_tree_text{'nodes_before_top_split_chapter_no_nodes'} = '*document_root C
  |is_target:{1}
  |menu_directions:D[prev->E10|up->E7]
  |node_directions:D[prev->E10|up->E7]
+ |node_number:{6}
  |normalized:{another}
   *arguments_line C4
    *line_arg C1
@@ -556,6 +562,7 @@ 
$result_tree_text{'nodes_before_top_split_chapter_no_nodes'} = '*document_root C
  |isindex:{1}
  |menu_directions:D[next->E9|up->E7]
  |node_directions:D[next->E9|up->E7]
+ |node_number:{7}
  |normalized:{a-node}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/indices/print_merged_index.pl 
b/tta/perl/t/results/indices/print_merged_index.pl
index dc25a6fa05..b97c04641d 100644
--- a/tta/perl/t/results/indices/print_merged_index.pl
+++ b/tta/perl/t/results/indices/print_merged_index.pl
@@ -24,6 +24,7 @@ $result_tree_text{'print_merged_index'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -39,6 +40,7 @@ $result_tree_text{'print_merged_index'} = '*document_root C3
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/indices/printindex_between_node_section.pl 
b/tta/perl/t/results/indices/printindex_between_node_section.pl
index 6836e579d4..42eefeebf0 100644
Binary files a/tta/perl/t/results/indices/printindex_between_node_section.pl 
and b/tta/perl/t/results/indices/printindex_between_node_section.pl differ
diff --git a/tta/perl/t/results/indices/printindex_between_part_chapter.pl 
b/tta/perl/t/results/indices/printindex_between_part_chapter.pl
index 75469f1527..8057c2599a 100644
Binary files a/tta/perl/t/results/indices/printindex_between_part_chapter.pl 
and b/tta/perl/t/results/indices/printindex_between_part_chapter.pl differ
diff --git a/tta/perl/t/results/indices/printindex_index_entry_in_copying.pl 
b/tta/perl/t/results/indices/printindex_index_entry_in_copying.pl
index b4e9c943fc..e89dca8ae3 100644
Binary files a/tta/perl/t/results/indices/printindex_index_entry_in_copying.pl 
and b/tta/perl/t/results/indices/printindex_index_entry_in_copying.pl differ
diff --git 
a/tta/perl/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl 
b/tta/perl/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
index 475ed3262e..e97146224f 100644
Binary files 
a/tta/perl/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl 
and 
b/tta/perl/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl 
differ
diff --git 
a/tta/perl/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
 
b/tta/perl/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
index 0f588106f8..5801c4464c 100644
--- 
a/tta/perl/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
+++ 
b/tta/perl/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
@@ -187,6 +187,7 @@ 
$result_tree_text{'printindex_index_entry_in_copying_no_insertcopying'} = '*docu
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -203,6 +204,7 @@ 
$result_tree_text{'printindex_index_entry_in_copying_no_insertcopying'} = '*docu
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -258,6 +260,7 @@ 
$result_tree_text{'printindex_index_entry_in_copying_no_insertcopying'} = '*docu
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -273,8 +276,9 @@ 
$result_tree_text{'printindex_index_entry_in_copying_no_insertcopying'} = '*docu
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/indices/printindex_with_space_before.pl 
b/tta/perl/t/results/indices/printindex_with_space_before.pl
index 12dc9132b8..60bdb7b995 100644
Binary files a/tta/perl/t/results/indices/printindex_with_space_before.pl and 
b/tta/perl/t/results/indices/printindex_with_space_before.pl differ
diff --git a/tta/perl/t/results/indices/same_index_entry_merged_indices.pl 
b/tta/perl/t/results/indices/same_index_entry_merged_indices.pl
index c2cfe87d07..ba7bb8becf 100644
Binary files a/tta/perl/t/results/indices/same_index_entry_merged_indices.pl 
and b/tta/perl/t/results/indices/same_index_entry_merged_indices.pl differ
diff --git a/tta/perl/t/results/indices/same_only_seealso_seeentry.pl 
b/tta/perl/t/results/indices/same_only_seealso_seeentry.pl
index a7c1dbd6e4..6abb0b908d 100644
Binary files a/tta/perl/t/results/indices/same_only_seealso_seeentry.pl and 
b/tta/perl/t/results/indices/same_only_seealso_seeentry.pl differ
diff --git a/tta/perl/t/results/indices/same_seealso_seeentry.pl 
b/tta/perl/t/results/indices/same_seealso_seeentry.pl
index 9e30b11319..874149b1a9 100644
Binary files a/tta/perl/t/results/indices/same_seealso_seeentry.pl and 
b/tta/perl/t/results/indices/same_seealso_seeentry.pl differ
diff --git a/tta/perl/t/results/indices/seealso_duplicate.pl 
b/tta/perl/t/results/indices/seealso_duplicate.pl
index ff38fb7a29..73dfa31df3 100644
Binary files a/tta/perl/t/results/indices/seealso_duplicate.pl and 
b/tta/perl/t/results/indices/seealso_duplicate.pl differ
diff --git a/tta/perl/t/results/indices/seeentry.pl 
b/tta/perl/t/results/indices/seeentry.pl
index 5c819fce66..124041623d 100644
Binary files a/tta/perl/t/results/indices/seeentry.pl and 
b/tta/perl/t/results/indices/seeentry.pl differ
diff --git a/tta/perl/t/results/indices/sorted_subentries.pl 
b/tta/perl/t/results/indices/sorted_subentries.pl
index 21391f07c1..4c8648123f 100644
--- a/tta/perl/t/results/indices/sorted_subentries.pl
+++ b/tta/perl/t/results/indices/sorted_subentries.pl
@@ -16,6 +16,7 @@ $result_tree_text{'sorted_subentries'} = '*document_root C7
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -29,6 +30,7 @@ $result_tree_text{'sorted_subentries'} = '*document_root C7
  |associated_node:[E0]
  |section_childs:EC[E3|E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -50,6 +52,7 @@ $result_tree_text{'sorted_subentries'} = '*document_root C7
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter-one}
   *arguments_line C1
    *line_arg C1
@@ -65,8 +68,9 @@ $result_tree_text{'sorted_subentries'} = '*document_root C7
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -310,6 +314,7 @@ $result_tree_text{'sorted_subentries'} = '*document_root C7
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{chapter-second}
   *arguments_line C1
    *line_arg C1
@@ -325,8 +330,9 @@ $result_tree_text{'sorted_subentries'} = '*document_root C7
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/indices/split_chapter_index.pl 
b/tta/perl/t/results/indices/split_chapter_index.pl
index 2de403c193..8c0de1c6d9 100644
--- a/tta/perl/t/results/indices/split_chapter_index.pl
+++ b/tta/perl/t/results/indices/split_chapter_index.pl
@@ -33,6 +33,7 @@ $result_tree_text{'split_chapter_index'} = '*document_root C10
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -49,6 +50,7 @@ $result_tree_text{'split_chapter_index'} = '*document_root C10
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -120,6 +122,7 @@ $result_tree_text{'split_chapter_index'} = '*document_root 
C10
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
@@ -136,8 +139,9 @@ $result_tree_text{'split_chapter_index'} = '*document_root 
C10
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -308,6 +312,7 @@ $result_tree_text{'split_chapter_index'} = '*document_root 
C10
  |menu_directions:D[up->E3]
  |menus:EC[E8]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section-1}
   *arguments_line C1
    *line_arg C1
@@ -324,8 +329,9 @@ $result_tree_text{'split_chapter_index'} = '*document_root 
C10
  |associated_node:[E6]
  |section_childs:EC[E10]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -400,6 +406,7 @@ $result_tree_text{'split_chapter_index'} = '*document_root 
C10
  |is_target:{1}
  |menu_directions:D[up->E6]
  |node_directions:D[up->E6]
+ |node_number:{4}
  |normalized:{subsection-1}
   *arguments_line C1
    *line_arg C1
@@ -415,8 +422,9 @@ $result_tree_text{'split_chapter_index'} = '*document_root 
C10
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[up->E7]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/indices/subentries.pl 
b/tta/perl/t/results/indices/subentries.pl
index 6e8f9d1493..3063ef4a77 100644
--- a/tta/perl/t/results/indices/subentries.pl
+++ b/tta/perl/t/results/indices/subentries.pl
@@ -16,6 +16,7 @@ $result_tree_text{'subentries'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -29,6 +30,7 @@ $result_tree_text{'subentries'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -51,6 +53,7 @@ $result_tree_text{'subentries'} = '*document_root C5
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter-index}
   *arguments_line C1
    *line_arg C1
@@ -66,8 +69,9 @@ $result_tree_text{'subentries'} = '*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/indices/subentries_and_comments.pl 
b/tta/perl/t/results/indices/subentries_and_comments.pl
index d3f53c3d1b..2db25792e6 100644
Binary files a/tta/perl/t/results/indices/subentries_and_comments.pl and 
b/tta/perl/t/results/indices/subentries_and_comments.pl differ
diff --git a/tta/perl/t/results/indices/subentry_and_sortas.pl 
b/tta/perl/t/results/indices/subentry_and_sortas.pl
index 390b505417..fc1f58d749 100644
Binary files a/tta/perl/t/results/indices/subentry_and_sortas.pl and 
b/tta/perl/t/results/indices/subentry_and_sortas.pl differ
diff --git a/tta/perl/t/results/indices/subentry_and_sortas_spaces.pl 
b/tta/perl/t/results/indices/subentry_and_sortas_spaces.pl
index 77e2e8728e..6df29d5c04 100644
Binary files a/tta/perl/t/results/indices/subentry_and_sortas_spaces.pl and 
b/tta/perl/t/results/indices/subentry_and_sortas_spaces.pl differ
diff --git a/tta/perl/t/results/indices/syncode_index_print_both.pl 
b/tta/perl/t/results/indices/syncode_index_print_both.pl
index 104e451f45..d5e3b2e5c4 100644
Binary files a/tta/perl/t/results/indices/syncode_index_print_both.pl and 
b/tta/perl/t/results/indices/syncode_index_print_both.pl differ
diff --git a/tta/perl/t/results/indices/syncodeindex_to_plain.pl 
b/tta/perl/t/results/indices/syncodeindex_to_plain.pl
index 311530653f..b558724eba 100644
Binary files a/tta/perl/t/results/indices/syncodeindex_to_plain.pl and 
b/tta/perl/t/results/indices/syncodeindex_to_plain.pl differ
diff --git a/tta/perl/t/results/indices/transparent_sort_chars.pl 
b/tta/perl/t/results/indices/transparent_sort_chars.pl
index 074b738463..c275a6dfea 100644
Binary files a/tta/perl/t/results/indices/transparent_sort_chars.pl and 
b/tta/perl/t/results/indices/transparent_sort_chars.pl differ
diff --git a/tta/perl/t/results/indices/w_lines_count.pl 
b/tta/perl/t/results/indices/w_lines_count.pl
index 1da186bc18..455485dfb1 100644
Binary files a/tta/perl/t/results/indices/w_lines_count.pl and 
b/tta/perl/t/results/indices/w_lines_count.pl differ
diff --git a/tta/perl/t/results/info_tests/anchor_and_spaces.pl 
b/tta/perl/t/results/info_tests/anchor_and_spaces.pl
index b2c8b3de91..3e27df8c72 100644
--- a/tta/perl/t/results/info_tests/anchor_and_spaces.pl
+++ b/tta/perl/t/results/info_tests/anchor_and_spaces.pl
@@ -14,6 +14,7 @@ $result_tree_text{'anchor_and_spaces'} = '*document_root C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -29,6 +30,7 @@ $result_tree_text{'anchor_and_spaces'} = '*document_root C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/info_tests/anchor_in_command.pl 
b/tta/perl/t/results/info_tests/anchor_in_command.pl
index 08ed8d4e09..36c0c4106e 100644
--- a/tta/perl/t/results/info_tests/anchor_in_command.pl
+++ b/tta/perl/t/results/info_tests/anchor_in_command.pl
@@ -12,6 +12,7 @@ $result_tree_text{'anchor_in_command'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/before_node_and_section.pl 
b/tta/perl/t/results/info_tests/before_node_and_section.pl
index 0d5a85fd0d..6591201429 100644
Binary files a/tta/perl/t/results/info_tests/before_node_and_section.pl and 
b/tta/perl/t/results/info_tests/before_node_and_section.pl differ
diff --git a/tta/perl/t/results/info_tests/chinese_mixed_with_en_EUC_CN.pl 
b/tta/perl/t/results/info_tests/chinese_mixed_with_en_EUC_CN.pl
index f27d37ce0e..9e857e1597 100644
--- a/tta/perl/t/results/info_tests/chinese_mixed_with_en_EUC_CN.pl
+++ b/tta/perl/t/results/info_tests/chinese_mixed_with_en_EUC_CN.pl
@@ -41,6 +41,7 @@ $result_tree_text{'chinese_mixed_with_en_EUC_CN'} = 
'*document_root C6
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -57,6 +58,7 @@ $result_tree_text{'chinese_mixed_with_en_EUC_CN'} = 
'*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -82,6 +84,7 @@ $result_tree_text{'chinese_mixed_with_en_EUC_CN'} = 
'*document_root C6
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Mixed-english-and-chinese}
   *arguments_line C1
    *line_arg C1
@@ -97,8 +100,9 @@ $result_tree_text{'chinese_mixed_with_en_EUC_CN'} = 
'*document_root C6
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/colon_in_index_entry.pl 
b/tta/perl/t/results/info_tests/colon_in_index_entry.pl
index 13bce96624..5a426c7f8c 100644
Binary files a/tta/perl/t/results/info_tests/colon_in_index_entry.pl and 
b/tta/perl/t/results/info_tests/colon_in_index_entry.pl differ
diff --git a/tta/perl/t/results/info_tests/colons_in_index_entries_and_node.pl 
b/tta/perl/t/results/info_tests/colons_in_index_entries_and_node.pl
index 2cafc0936d..50bcc383b7 100644
--- a/tta/perl/t/results/info_tests/colons_in_index_entries_and_node.pl
+++ b/tta/perl/t/results/info_tests/colons_in_index_entries_and_node.pl
@@ -15,6 +15,7 @@ $result_tree_text{'colons_in_index_entries_and_node'} = 
'*document_root C4
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -78,6 +79,7 @@ $result_tree_text{'colons_in_index_entries_and_node'} = 
'*document_root C4
  |is_target:{1}
  |menu_directions:D[next->E3|up->E0]
  |node_directions:D[next->E3|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{One_003a_003anode_002c-with-entries_002e}
   *arguments_line C1
    *line_arg C5
@@ -205,6 +207,7 @@ $result_tree_text{'colons_in_index_entries_and_node'} = 
'*document_root C4
  |isindex:{1}
  |menu_directions:D[prev->E2|up->E0]
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{Concept-Index}
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/info_tests/colons_in_index_entries_and_node_no_quoting.pl 
b/tta/perl/t/results/info_tests/colons_in_index_entries_and_node_no_quoting.pl
index 05d603ae96..5279ea4bbc 100644
--- 
a/tta/perl/t/results/info_tests/colons_in_index_entries_and_node_no_quoting.pl
+++ 
b/tta/perl/t/results/info_tests/colons_in_index_entries_and_node_no_quoting.pl
@@ -15,6 +15,7 @@ 
$result_tree_text{'colons_in_index_entries_and_node_no_quoting'} = '*document_ro
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -78,6 +79,7 @@ 
$result_tree_text{'colons_in_index_entries_and_node_no_quoting'} = '*document_ro
  |is_target:{1}
  |menu_directions:D[next->E3|up->E0]
  |node_directions:D[next->E3|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{One_003a_003anode_002c-with-entries_002e}
   *arguments_line C1
    *line_arg C5
@@ -205,6 +207,7 @@ 
$result_tree_text{'colons_in_index_entries_and_node_no_quoting'} = '*document_ro
  |isindex:{1}
  |menu_directions:D[prev->E2|up->E0]
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{Concept-Index}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/def_in_copying.pl 
b/tta/perl/t/results/info_tests/def_in_copying.pl
index 0be4c79623..d8d55ba05a 100644
Binary files a/tta/perl/t/results/info_tests/def_in_copying.pl and 
b/tta/perl/t/results/info_tests/def_in_copying.pl differ
diff --git a/tta/perl/t/results/info_tests/direntry_dircategory.pl 
b/tta/perl/t/results/info_tests/direntry_dircategory.pl
index 987d1ca7c3..26adaf5ded 100644
--- a/tta/perl/t/results/info_tests/direntry_dircategory.pl
+++ b/tta/perl/t/results/info_tests/direntry_dircategory.pl
@@ -128,6 +128,7 @@ $result_tree_text{'direntry_dircategory'} = '*document_root 
C6
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -144,6 +145,7 @@ $result_tree_text{'direntry_dircategory'} = '*document_root 
C6
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -240,6 +242,7 @@ $result_tree_text{'direntry_dircategory'} = '*document_root 
C6
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -255,8 +258,9 @@ $result_tree_text{'direntry_dircategory'} = '*document_root 
C6
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/direntry_dircategory_and_commands.pl 
b/tta/perl/t/results/info_tests/direntry_dircategory_and_commands.pl
index e3ffd80272..96d3dd51ab 100644
--- a/tta/perl/t/results/info_tests/direntry_dircategory_and_commands.pl
+++ b/tta/perl/t/results/info_tests/direntry_dircategory_and_commands.pl
@@ -109,6 +109,7 @@ $result_tree_text{'direntry_dircategory_and_commands'} = 
'*document_root C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -124,6 +125,7 @@ $result_tree_text{'direntry_dircategory_and_commands'} = 
'*document_root C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/info_tests/empty_caption.pl 
b/tta/perl/t/results/info_tests/empty_caption.pl
index e2f4e9099c..7d84629f54 100644
--- a/tta/perl/t/results/info_tests/empty_caption.pl
+++ b/tta/perl/t/results/info_tests/empty_caption.pl
@@ -13,6 +13,7 @@ $result_tree_text{'empty_caption'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/encoding_us_ascii.pl 
b/tta/perl/t/results/info_tests/encoding_us_ascii.pl
index 3ba9087460..c554c2ad02 100644
--- a/tta/perl/t/results/info_tests/encoding_us_ascii.pl
+++ b/tta/perl/t/results/info_tests/encoding_us_ascii.pl
@@ -27,6 +27,7 @@ $result_tree_text{'encoding_us_ascii'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/end_of_line_command_in_node_lines.pl 
b/tta/perl/t/results/info_tests/end_of_line_command_in_node_lines.pl
index ea4ff4d31c..d988cc7ac2 100644
--- a/tta/perl/t/results/info_tests/end_of_line_command_in_node_lines.pl
+++ b/tta/perl/t/results/info_tests/end_of_line_command_in_node_lines.pl
@@ -17,6 +17,7 @@ $result_tree_text{'end_of_line_command_in_node_lines'} = 
'*document_root C7
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -33,6 +34,7 @@ $result_tree_text{'end_of_line_command_in_node_lines'} = 
'*document_root C7
  |associated_node:[E0]
  |section_childs:EC[E4|E7]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -101,6 +103,7 @@ $result_tree_text{'end_of_line_command_in_node_lines'} = 
'*document_root C7
  |isindex:{1}
  |menu_directions:D[next->E6|up->E0]
  |node_directions:D[next->E6|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap-f-nl-Something_003f-After-punct}
   *arguments_line C1
    *line_arg C5
@@ -120,8 +123,9 @@ $result_tree_text{'end_of_line_command_in_node_lines'} = 
'*document_root C7
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E7|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E7|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -188,6 +192,7 @@ $result_tree_text{'end_of_line_command_in_node_lines'} = 
'*document_root C7
  |menu_directions:D[prev->E3|up->E0]
  |menus:EC[E8]
  |node_directions:D[prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{new-n}
   *arguments_line C1
    *line_arg C1
@@ -203,8 +208,9 @@ $result_tree_text{'end_of_line_command_in_node_lines'} = 
'*document_root C7
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/error_in_footnote.pl 
b/tta/perl/t/results/info_tests/error_in_footnote.pl
index c630208166..2c9d27c3df 100644
--- a/tta/perl/t/results/info_tests/error_in_footnote.pl
+++ b/tta/perl/t/results/info_tests/error_in_footnote.pl
@@ -13,6 +13,7 @@ $result_tree_text{'error_in_footnote'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/file_only_png.pl 
b/tta/perl/t/results/info_tests/file_only_png.pl
index 57cfca59af..9ca7db6719 100644
Binary files a/tta/perl/t/results/info_tests/file_only_png.pl and 
b/tta/perl/t/results/info_tests/file_only_png.pl differ
diff --git a/tta/perl/t/results/info_tests/float_long_captions.pl 
b/tta/perl/t/results/info_tests/float_long_captions.pl
index 8fe156a894..baf398cc64 100644
--- a/tta/perl/t/results/info_tests/float_long_captions.pl
+++ b/tta/perl/t/results/info_tests/float_long_captions.pl
@@ -12,6 +12,7 @@ $result_tree_text{'float_long_captions'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/float_without_type.pl 
b/tta/perl/t/results/info_tests/float_without_type.pl
index 7fc2918cbd..1bbca7fa92 100644
--- a/tta/perl/t/results/info_tests/float_without_type.pl
+++ b/tta/perl/t/results/info_tests/float_without_type.pl
@@ -13,6 +13,7 @@ $result_tree_text{'float_without_type'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/image_and_punctuation.pl 
b/tta/perl/t/results/info_tests/image_and_punctuation.pl
index 07adc1023d..3074edc41e 100644
Binary files a/tta/perl/t/results/info_tests/image_and_punctuation.pl and 
b/tta/perl/t/results/info_tests/image_and_punctuation.pl differ
diff --git a/tta/perl/t/results/info_tests/image_and_spaces_formatting.pl 
b/tta/perl/t/results/info_tests/image_and_spaces_formatting.pl
index a84c8d3162..0da5bb7de2 100644
--- a/tta/perl/t/results/info_tests/image_and_spaces_formatting.pl
+++ b/tta/perl/t/results/info_tests/image_and_spaces_formatting.pl
@@ -12,6 +12,7 @@ $result_tree_text{'image_and_spaces_formatting'} = 
'*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/image_extension.pl 
b/tta/perl/t/results/info_tests/image_extension.pl
index b33f782e17..5457f16422 100644
Binary files a/tta/perl/t/results/info_tests/image_extension.pl and 
b/tta/perl/t/results/info_tests/image_extension.pl differ
diff --git a/tta/perl/t/results/info_tests/image_in_paragraph.pl 
b/tta/perl/t/results/info_tests/image_in_paragraph.pl
index d628a39876..db0baf65a8 100644
Binary files a/tta/perl/t/results/info_tests/image_in_paragraph.pl and 
b/tta/perl/t/results/info_tests/image_in_paragraph.pl differ
diff --git a/tta/perl/t/results/info_tests/image_not_found.pl 
b/tta/perl/t/results/info_tests/image_not_found.pl
index fbb297ebe5..b378f92670 100644
--- a/tta/perl/t/results/info_tests/image_not_found.pl
+++ b/tta/perl/t/results/info_tests/image_not_found.pl
@@ -12,6 +12,7 @@ $result_tree_text{'image_not_found'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/image_quotes.pl 
b/tta/perl/t/results/info_tests/image_quotes.pl
index fc51356eaf..fe2ee8f750 100644
Binary files a/tta/perl/t/results/info_tests/image_quotes.pl and 
b/tta/perl/t/results/info_tests/image_quotes.pl differ
diff --git a/tta/perl/t/results/info_tests/image_text_file_only_and_alt.pl 
b/tta/perl/t/results/info_tests/image_text_file_only_and_alt.pl
index 5d6b6d6c4f..3e5eeeda00 100644
Binary files a/tta/perl/t/results/info_tests/image_text_file_only_and_alt.pl 
and b/tta/perl/t/results/info_tests/image_text_file_only_and_alt.pl differ
diff --git a/tta/perl/t/results/info_tests/index_entry_at_end_node.pl 
b/tta/perl/t/results/info_tests/index_entry_at_end_node.pl
index 3233a83d95..d96eaac803 100644
Binary files a/tta/perl/t/results/info_tests/index_entry_at_end_node.pl and 
b/tta/perl/t/results/info_tests/index_entry_at_end_node.pl differ
diff --git a/tta/perl/t/results/info_tests/invalid_node_name_no_warning.pl 
b/tta/perl/t/results/info_tests/invalid_node_name_no_warning.pl
index 8b3071b4d9..447d66fea5 100644
--- a/tta/perl/t/results/info_tests/invalid_node_name_no_warning.pl
+++ b/tta/perl/t/results/info_tests/invalid_node_name_no_warning.pl
@@ -15,6 +15,7 @@ $result_tree_text{'invalid_node_name_no_warning'} = 
'*document_root C5
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -94,6 +95,7 @@ $result_tree_text{'invalid_node_name_no_warning'} = 
'*document_root C5
  |is_target:{1}
  |menu_directions:D[next->E3|up->E0]
  |node_directions:D[next->E3|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{nodename_002e-a}
   *arguments_line C1
    *line_arg C1
@@ -112,6 +114,7 @@ $result_tree_text{'invalid_node_name_no_warning'} = 
'*document_root C5
  |is_target:{1}
  |menu_directions:D[next->E4|prev->E2|up->E0]
  |node_directions:D[next->E4|prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{node_002ccomma}
   *arguments_line C1
    *line_arg C3
@@ -131,6 +134,7 @@ $result_tree_text{'invalid_node_name_no_warning'} = 
'*document_root C5
  |is_target:{1}
  |menu_directions:D[prev->E3|up->E0]
  |node_directions:D[prev->E3|up->E0]
+ |node_number:{4}
  |normalized:{bidule_003a}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/invalid_node_name_warning.pl 
b/tta/perl/t/results/info_tests/invalid_node_name_warning.pl
index 2b60df008e..fee42aa9bb 100644
--- a/tta/perl/t/results/info_tests/invalid_node_name_warning.pl
+++ b/tta/perl/t/results/info_tests/invalid_node_name_warning.pl
@@ -15,6 +15,7 @@ $result_tree_text{'invalid_node_name_warning'} = 
'*document_root C5
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -94,6 +95,7 @@ $result_tree_text{'invalid_node_name_warning'} = 
'*document_root C5
  |is_target:{1}
  |menu_directions:D[next->E3|up->E0]
  |node_directions:D[next->E3|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{nodename_002e-a}
   *arguments_line C1
    *line_arg C1
@@ -112,6 +114,7 @@ $result_tree_text{'invalid_node_name_warning'} = 
'*document_root C5
  |is_target:{1}
  |menu_directions:D[next->E4|prev->E2|up->E0]
  |node_directions:D[next->E4|prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{node_002ccomma}
   *arguments_line C1
    *line_arg C3
@@ -131,6 +134,7 @@ $result_tree_text{'invalid_node_name_warning'} = 
'*document_root C5
  |is_target:{1}
  |menu_directions:D[prev->E3|up->E0]
  |node_directions:D[prev->E3|up->E0]
+ |node_number:{4}
  |normalized:{bidule_003a}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/known_encoding.pl 
b/tta/perl/t/results/info_tests/known_encoding.pl
index e42445a45a..22dc0882b3 100644
--- a/tta/perl/t/results/info_tests/known_encoding.pl
+++ b/tta/perl/t/results/info_tests/known_encoding.pl
@@ -27,6 +27,7 @@ $result_tree_text{'known_encoding'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/multitable_anchor_and_index_entry.pl 
b/tta/perl/t/results/info_tests/multitable_anchor_and_index_entry.pl
index f82caa6e86..eec219ee17 100644
Binary files 
a/tta/perl/t/results/info_tests/multitable_anchor_and_index_entry.pl and 
b/tta/perl/t/results/info_tests/multitable_anchor_and_index_entry.pl differ
diff --git a/tta/perl/t/results/info_tests/nested_footnotes_separate.pl 
b/tta/perl/t/results/info_tests/nested_footnotes_separate.pl
index 201dc9d031..d238ba6a7d 100644
--- a/tta/perl/t/results/info_tests/nested_footnotes_separate.pl
+++ b/tta/perl/t/results/info_tests/nested_footnotes_separate.pl
@@ -23,6 +23,7 @@ $result_tree_text{'nested_footnotes_separate'} = 
'*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/nested_multitable_anchor_index.pl 
b/tta/perl/t/results/info_tests/nested_multitable_anchor_index.pl
index 7426e17241..b4185e03c0 100644
Binary files a/tta/perl/t/results/info_tests/nested_multitable_anchor_index.pl 
and b/tta/perl/t/results/info_tests/nested_multitable_anchor_index.pl differ
diff --git a/tta/perl/t/results/info_tests/no_node_but_top.pl 
b/tta/perl/t/results/info_tests/no_node_but_top.pl
index 4bb517b3c5..c508b3c05b 100644
--- a/tta/perl/t/results/info_tests/no_node_but_top.pl
+++ b/tta/perl/t/results/info_tests/no_node_but_top.pl
@@ -12,6 +12,7 @@ $result_tree_text{'no_node_but_top'} = '*document_root C2
   |{ }
  |EXTRA
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/info_tests/no_top_node.pl 
b/tta/perl/t/results/info_tests/no_top_node.pl
index f2352d6a03..e7cc2330cc 100644
--- a/tta/perl/t/results/info_tests/no_top_node.pl
+++ b/tta/perl/t/results/info_tests/no_top_node.pl
@@ -12,6 +12,7 @@ $result_tree_text{'no_top_node'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{node-Top-not-Top-node}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/note_in_strong.pl 
b/tta/perl/t/results/info_tests/note_in_strong.pl
index 21c488cadd..8656362c14 100644
--- a/tta/perl/t/results/info_tests/note_in_strong.pl
+++ b/tta/perl/t/results/info_tests/note_in_strong.pl
@@ -12,6 +12,7 @@ $result_tree_text{'note_in_strong'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/note_in_strong_end_of_line.pl 
b/tta/perl/t/results/info_tests/note_in_strong_end_of_line.pl
index 19c749a730..c510b3e522 100644
--- a/tta/perl/t/results/info_tests/note_in_strong_end_of_line.pl
+++ b/tta/perl/t/results/info_tests/note_in_strong_end_of_line.pl
@@ -12,6 +12,7 @@ $result_tree_text{'note_in_strong_end_of_line'} = 
'*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/novalidate_empty_refs.pl 
b/tta/perl/t/results/info_tests/novalidate_empty_refs.pl
index a342a4ffa5..ede52d3e44 100644
--- a/tta/perl/t/results/info_tests/novalidate_empty_refs.pl
+++ b/tta/perl/t/results/info_tests/novalidate_empty_refs.pl
@@ -16,6 +16,7 @@ $result_tree_text{'novalidate_empty_refs'} = '*document_root 
C5
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/one_node_counted_elements.pl 
b/tta/perl/t/results/info_tests/one_node_counted_elements.pl
index e23e9b0b0e..f747a03b54 100644
Binary files a/tta/perl/t/results/info_tests/one_node_counted_elements.pl and 
b/tta/perl/t/results/info_tests/one_node_counted_elements.pl differ
diff --git a/tta/perl/t/results/info_tests/paragraphindent_and_preamble.pl 
b/tta/perl/t/results/info_tests/paragraphindent_and_preamble.pl
index 9fa331bac1..7f56d0f333 100644
--- a/tta/perl/t/results/info_tests/paragraphindent_and_preamble.pl
+++ b/tta/perl/t/results/info_tests/paragraphindent_and_preamble.pl
@@ -54,6 +54,7 @@ $result_tree_text{'paragraphindent_and_preamble'} = 
'*document_root C5
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -69,6 +70,7 @@ $result_tree_text{'paragraphindent_and_preamble'} = 
'*document_root C5
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git 
a/tta/perl/t/results/info_tests/paragraphindent_in_preamble_and_in_document.pl 
b/tta/perl/t/results/info_tests/paragraphindent_in_preamble_and_in_document.pl
index 2deae4460a..bc33e8824f 100644
--- 
a/tta/perl/t/results/info_tests/paragraphindent_in_preamble_and_in_document.pl
+++ 
b/tta/perl/t/results/info_tests/paragraphindent_in_preamble_and_in_document.pl
@@ -54,6 +54,7 @@ 
$result_tree_text{'paragraphindent_in_preamble_and_in_document'} = '*document_ro
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -69,6 +70,7 @@ 
$result_tree_text{'paragraphindent_in_preamble_and_in_document'} = '*document_ro
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/info_tests/paragraphindent_not_in_preamble.pl 
b/tta/perl/t/results/info_tests/paragraphindent_not_in_preamble.pl
index 9f9b211691..987207c588 100644
--- a/tta/perl/t/results/info_tests/paragraphindent_not_in_preamble.pl
+++ b/tta/perl/t/results/info_tests/paragraphindent_not_in_preamble.pl
@@ -38,6 +38,7 @@ $result_tree_text{'paragraphindent_not_in_preamble'} = 
'*document_root C5
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -53,6 +54,7 @@ $result_tree_text{'paragraphindent_not_in_preamble'} = 
'*document_root C5
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/info_tests/pxref_test.pl 
b/tta/perl/t/results/info_tests/pxref_test.pl
index 8694577f6a..01b9601f0a 100644
--- a/tta/perl/t/results/info_tests/pxref_test.pl
+++ b/tta/perl/t/results/info_tests/pxref_test.pl
@@ -12,6 +12,7 @@ $result_tree_text{'pxref_test'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/quote_node_names_info.pl 
b/tta/perl/t/results/info_tests/quote_node_names_info.pl
index a88f76872c..33b7d97230 100644
--- a/tta/perl/t/results/info_tests/quote_node_names_info.pl
+++ b/tta/perl/t/results/info_tests/quote_node_names_info.pl
@@ -17,6 +17,7 @@ $result_tree_text{'quote_node_names_info'} = '*document_root 
C12
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -30,6 +31,7 @@ $result_tree_text{'quote_node_names_info'} = '*document_root 
C12
  |associated_node:[E0]
  |section_childs:EC[E4|E6|E8|E10]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -399,6 +401,7 @@ $result_tree_text{'quote_node_names_info'} = 
'*document_root C12
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{blah_003ablah}
   *arguments_line C1
    *line_arg C1
@@ -414,8 +417,9 @@ $result_tree_text{'quote_node_names_info'} = 
'*document_root C12
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -437,6 +441,7 @@ $result_tree_text{'quote_node_names_info'} = 
'*document_root C12
  |is_target:{1}
  |menu_directions:D[next->E7|prev->E3|up->E0]
  |node_directions:D[next->E7|prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{blumpty_002efump}
   *arguments_line C1
    *line_arg C1
@@ -452,8 +457,9 @@ $result_tree_text{'quote_node_names_info'} = 
'*document_root C12
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[next->E8|prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E8|prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -472,6 +478,7 @@ $result_tree_text{'quote_node_names_info'} = 
'*document_root C12
  |is_target:{1}
  |menu_directions:D[next->E9|prev->E5|up->E0]
  |node_directions:D[next->MISSING: (line_arg)[C6]|prev->MISSING: 
(line_arg)[C6]|up->MISSING: (line_arg)[C4]]
+ |node_number:{4}
  |normalized:{normal-node}
   *arguments_line C4
    *line_arg C1
@@ -528,8 +535,9 @@ $result_tree_text{'quote_node_names_info'} = 
'*document_root C12
  |associated_anchor_command:[E7]
  |associated_node:[E7]
  |section_directions:D[next->E10|prev->E6|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{4}
  |toplevel_directions:D[next->E10|prev->E6|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -548,6 +556,7 @@ $result_tree_text{'quote_node_names_info'} = 
'*document_root C12
  |is_target:{1}
  |menu_directions:D[prev->E7|up->E0]
  |node_directions:D[prev->E7|up->E0]
+ |node_number:{5}
  |normalized:{secret_002cnode}
   *arguments_line C1
    *line_arg C1
@@ -565,8 +574,9 @@ $result_tree_text{'quote_node_names_info'} = 
'*document_root C12
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[prev->E8|up->E1]
+ |section_heading_number:{4}
  |section_level:{1}
- |section_number:{4}
+ |section_number:{5}
  |toplevel_directions:D[prev->E8|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -583,6 +593,7 @@ $result_tree_text{'quote_node_names_info'} = 
'*document_root C12
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{6}
  |normalized:{top-secret-node}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/recursive_down_menu.pl 
b/tta/perl/t/results/info_tests/recursive_down_menu.pl
index fdd1201a51..3ab3fc2ec4 100644
--- a/tta/perl/t/results/info_tests/recursive_down_menu.pl
+++ b/tta/perl/t/results/info_tests/recursive_down_menu.pl
@@ -15,6 +15,7 @@ $result_tree_text{'recursive_down_menu'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'recursive_down_menu'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -55,6 +57,7 @@ $result_tree_text{'recursive_down_menu'} = '*document_root C5
  |menu_directions:D[up->E2]
  |menus:EC[E4]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapN}
   *arguments_line C1
    *line_arg C1
@@ -70,8 +73,9 @@ $result_tree_text{'recursive_down_menu'} = '*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/ref_tests.pl 
b/tta/perl/t/results/info_tests/ref_tests.pl
index 77896690f7..2f2329a5fe 100644
--- a/tta/perl/t/results/info_tests/ref_tests.pl
+++ b/tta/perl/t/results/info_tests/ref_tests.pl
@@ -13,6 +13,7 @@ $result_tree_text{'ref_tests'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/info_tests/similar_external_and_internal_node.pl 
b/tta/perl/t/results/info_tests/similar_external_and_internal_node.pl
index c86b2cd2f5..60183dca95 100644
--- a/tta/perl/t/results/info_tests/similar_external_and_internal_node.pl
+++ b/tta/perl/t/results/info_tests/similar_external_and_internal_node.pl
@@ -13,6 +13,7 @@ $result_tree_text{'similar_external_and_internal_node'} = 
'*document_root C2
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->MISSING: (line_arg)[C4]]
+ |node_number:{1}
  |normalized:{aa}
   *arguments_line C2
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/space_at_menu_end.pl 
b/tta/perl/t/results/info_tests/space_at_menu_end.pl
index c3c4efb3d7..2fc37a13e0 100644
--- a/tta/perl/t/results/info_tests/space_at_menu_end.pl
+++ b/tta/perl/t/results/info_tests/space_at_menu_end.pl
@@ -14,6 +14,7 @@ $result_tree_text{'space_at_menu_end'} = '*document_root C2
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->MISSING: (menu_entry_node)[C3]]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/space_in_menu.pl 
b/tta/perl/t/results/info_tests/space_in_menu.pl
index a79c361e52..487df3fd9b 100644
--- a/tta/perl/t/results/info_tests/space_in_menu.pl
+++ b/tta/perl/t/results/info_tests/space_in_menu.pl
@@ -16,6 +16,7 @@ $result_tree_text{'space_in_menu'} = '*document_root C5
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'space_in_menu'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -87,6 +89,7 @@ $result_tree_text{'space_in_menu'} = '*document_root C5
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node}
   *arguments_line C1
    *line_arg C1
@@ -102,8 +105,9 @@ $result_tree_text{'space_in_menu'} = '*document_root C5
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/space_in_setfilename.pl 
b/tta/perl/t/results/info_tests/space_in_setfilename.pl
index 8cfeab9fec..d059774164 100644
--- a/tta/perl/t/results/info_tests/space_in_setfilename.pl
+++ b/tta/perl/t/results/info_tests/space_in_setfilename.pl
@@ -28,6 +28,7 @@ $result_tree_text{'space_in_setfilename'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/split_no_copying.pl 
b/tta/perl/t/results/info_tests/split_no_copying.pl
index 2c5bc119e4..488c958126 100644
--- a/tta/perl/t/results/info_tests/split_no_copying.pl
+++ b/tta/perl/t/results/info_tests/split_no_copying.pl
@@ -30,6 +30,7 @@ $result_tree_text{'split_no_copying'} = '*document_root C7
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -46,6 +47,7 @@ $result_tree_text{'split_no_copying'} = '*document_root C7
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -101,6 +103,7 @@ $result_tree_text{'split_no_copying'} = '*document_root C7
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Ch1}
   *arguments_line C1
    *line_arg C1
@@ -116,8 +119,9 @@ $result_tree_text{'split_no_copying'} = '*document_root C7
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/split_nocopying.pl 
b/tta/perl/t/results/info_tests/split_nocopying.pl
index 024e21fe3f..923852723f 100644
--- a/tta/perl/t/results/info_tests/split_nocopying.pl
+++ b/tta/perl/t/results/info_tests/split_nocopying.pl
@@ -20,6 +20,7 @@ $result_tree_text{'split_nocopying'} = '*document_root C6
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'split_nocopying'} = '*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -93,6 +95,7 @@ $result_tree_text{'split_nocopying'} = '*document_root C6
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Ch1}
   *arguments_line C1
    *line_arg C1
@@ -108,8 +111,9 @@ $result_tree_text{'split_nocopying'} = '*document_root C6
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/split_nocopying_split.pl 
b/tta/perl/t/results/info_tests/split_nocopying_split.pl
index a07d5ff917..3b37c82568 100644
--- a/tta/perl/t/results/info_tests/split_nocopying_split.pl
+++ b/tta/perl/t/results/info_tests/split_nocopying_split.pl
@@ -20,6 +20,7 @@ $result_tree_text{'split_nocopying_split'} = '*document_root 
C6
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'split_nocopying_split'} = '*document_root 
C6
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -93,6 +95,7 @@ $result_tree_text{'split_nocopying_split'} = '*document_root 
C6
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Ch1}
   *arguments_line C1
    *line_arg C1
@@ -108,8 +111,9 @@ $result_tree_text{'split_nocopying_split'} = 
'*document_root C6
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/split_test_before_first_node.pl 
b/tta/perl/t/results/info_tests/split_test_before_first_node.pl
index 4e892d1734..1a0463fd10 100644
--- a/tta/perl/t/results/info_tests/split_test_before_first_node.pl
+++ b/tta/perl/t/results/info_tests/split_test_before_first_node.pl
@@ -32,6 +32,7 @@ $result_tree_text{'split_test_before_first_node'} = 
'*document_root C5
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -48,6 +49,7 @@ $result_tree_text{'split_test_before_first_node'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -103,6 +105,7 @@ $result_tree_text{'split_test_before_first_node'} = 
'*document_root C5
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap1}
   *arguments_line C1
    *line_arg C1
@@ -118,8 +121,9 @@ $result_tree_text{'split_test_before_first_node'} = 
'*document_root C5
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/info_tests/split_test_before_first_node_no_empty_line.pl 
b/tta/perl/t/results/info_tests/split_test_before_first_node_no_empty_line.pl
index 192fac0985..fdc2904224 100644
--- 
a/tta/perl/t/results/info_tests/split_test_before_first_node_no_empty_line.pl
+++ 
b/tta/perl/t/results/info_tests/split_test_before_first_node_no_empty_line.pl
@@ -31,6 +31,7 @@ 
$result_tree_text{'split_test_before_first_node_no_empty_line'} = '*document_roo
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -47,6 +48,7 @@ 
$result_tree_text{'split_test_before_first_node_no_empty_line'} = '*document_roo
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -102,6 +104,7 @@ 
$result_tree_text{'split_test_before_first_node_no_empty_line'} = '*document_roo
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap1}
   *arguments_line C1
    *line_arg C1
@@ -117,8 +120,9 @@ 
$result_tree_text{'split_test_before_first_node_no_empty_line'} = '*document_roo
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/test_index.pl 
b/tta/perl/t/results/info_tests/test_index.pl
index 527c3e00f0..d7fa16cecf 100644
--- a/tta/perl/t/results/info_tests/test_index.pl
+++ b/tta/perl/t/results/info_tests/test_index.pl
@@ -16,6 +16,7 @@ $result_tree_text{'test_index'} = '*document_root C13
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'test_index'} = '*document_root C13
  |associated_node:[E0]
  |section_childs:EC[E4|E6|E11|E12]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -311,6 +313,7 @@ $result_tree_text{'test_index'} = '*document_root C13
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{name}
   *arguments_line C1
    *line_arg C1
@@ -326,8 +329,9 @@ $result_tree_text{'test_index'} = '*document_root C13
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -659,6 +663,7 @@ $result_tree_text{'test_index'} = '*document_root C13
  |isindex:{1}
  |menu_directions:D[prev->E3|up->E0]
  |node_directions:D[prev->E3|up->E0]
+ |node_number:{3}
  
|normalized:{name1-looooooooooooooooooooooooooooooooooooooooooooooooooooooooong}
   *arguments_line C1
    *line_arg C1
@@ -675,8 +680,9 @@ $result_tree_text{'test_index'} = '*document_root C13
  |associated_node:[E5]
  |section_childs:EC[E7]
  |section_directions:D[next->E11|prev->E4|up->E1]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{3}
  |toplevel_directions:D[next->E11|prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -752,8 +758,9 @@ $result_tree_text{'test_index'} = '*document_root C13
  |EXTRA
  |section_childs:EC[E8]
  |section_directions:D[up->E6]
+ |section_heading_number:{A.1}
  |section_level:{2}
- |section_number:{A.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -768,8 +775,9 @@ $result_tree_text{'test_index'} = '*document_root C13
  |EXTRA
  |section_childs:EC[E9]
  |section_directions:D[up->E7]
+ |section_heading_number:{A.1.1}
  |section_level:{3}
- |section_number:{A.1.1}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -783,8 +791,9 @@ $result_tree_text{'test_index'} = '*document_root C13
   |{ }
  |EXTRA
  |section_directions:D[up->E8]
+ |section_heading_number:{A.1.1.1}
  |section_level:{4}
- |section_number:{A.1.1.1}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -798,6 +807,7 @@ $result_tree_text{'test_index'} = '*document_root C13
    |{ }
   |EXTRA
   |global_command_number:{1}
+  |heading_number:{1}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -811,6 +821,7 @@ $result_tree_text{'test_index'} = '*document_root C13
  |EXTRA
  |section_directions:D[next->E12|prev->E6|up->E1]
  |section_level:{1}
+ |section_number:{7}
  |toplevel_directions:D[next->E12|prev->E6|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -825,8 +836,9 @@ $result_tree_text{'test_index'} = '*document_root C13
   |{ }
  |EXTRA
  |section_directions:D[prev->E11|up->E1]
+ |section_heading_number:{B}
  |section_level:{1}
- |section_number:{B}
+ |section_number:{8}
  |toplevel_directions:D[prev->E11|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/text_before_node.pl 
b/tta/perl/t/results/info_tests/text_before_node.pl
index 560ae6d425..2e0bc34b81 100644
--- a/tta/perl/t/results/info_tests/text_before_node.pl
+++ b/tta/perl/t/results/info_tests/text_before_node.pl
@@ -16,6 +16,7 @@ $result_tree_text{'text_before_node'} = '*document_root C5
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'text_before_node'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -86,6 +88,7 @@ $result_tree_text{'text_before_node'} = '*document_root C5
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter-node}
   *arguments_line C1
    *line_arg C1
@@ -101,8 +104,9 @@ $result_tree_text{'text_before_node'} = '*document_root C5
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/top_node_normalization.pl 
b/tta/perl/t/results/info_tests/top_node_normalization.pl
index a2fb390052..458c849841 100644
--- a/tta/perl/t/results/info_tests/top_node_normalization.pl
+++ b/tta/perl/t/results/info_tests/top_node_normalization.pl
@@ -15,6 +15,7 @@ $result_tree_text{'top_node_normalization'} = '*document_root 
C2
  |menu_directions:D[up->E0]
  |menus:EC[E1]
  |node_directions:D[next->E0]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/two_paragraphindent_in_preamble.pl 
b/tta/perl/t/results/info_tests/two_paragraphindent_in_preamble.pl
index dbe2db1a8d..ef1ab96e96 100644
--- a/tta/perl/t/results/info_tests/two_paragraphindent_in_preamble.pl
+++ b/tta/perl/t/results/info_tests/two_paragraphindent_in_preamble.pl
@@ -67,6 +67,7 @@ $result_tree_text{'two_paragraphindent_in_preamble'} = 
'*document_root C5
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -82,6 +83,7 @@ $result_tree_text{'two_paragraphindent_in_preamble'} = 
'*document_root C5
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git 
a/tta/perl/t/results/info_tests/two_paragraphindent_in_preamble_and_in_document.pl
 
b/tta/perl/t/results/info_tests/two_paragraphindent_in_preamble_and_in_document.pl
index a24af8825d..82d9e944ad 100644
--- 
a/tta/perl/t/results/info_tests/two_paragraphindent_in_preamble_and_in_document.pl
+++ 
b/tta/perl/t/results/info_tests/two_paragraphindent_in_preamble_and_in_document.pl
@@ -67,6 +67,7 @@ 
$result_tree_text{'two_paragraphindent_in_preamble_and_in_document'} = '*documen
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -82,6 +83,7 @@ 
$result_tree_text{'two_paragraphindent_in_preamble_and_in_document'} = '*documen
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/info_tests/unknown_encoding.pl 
b/tta/perl/t/results/info_tests/unknown_encoding.pl
index 0ea1508467..52fe0dd850 100644
--- a/tta/perl/t/results/info_tests/unknown_encoding.pl
+++ b/tta/perl/t/results/info_tests/unknown_encoding.pl
@@ -26,6 +26,7 @@ $result_tree_text{'unknown_encoding'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/info_tests/xref_test.pl 
b/tta/perl/t/results/info_tests/xref_test.pl
index d08514dc97..63f9b2b130 100644
--- a/tta/perl/t/results/info_tests/xref_test.pl
+++ b/tta/perl/t/results/info_tests/xref_test.pl
@@ -13,6 +13,7 @@ $result_tree_text{'xref_test'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/init_files_tests/access_document_name_in_handler.pl 
b/tta/perl/t/results/init_files_tests/access_document_name_in_handler.pl
index 9eec5a447f..067f2816a3 100644
--- a/tta/perl/t/results/init_files_tests/access_document_name_in_handler.pl
+++ b/tta/perl/t/results/init_files_tests/access_document_name_in_handler.pl
@@ -16,6 +16,7 @@ $result_tree_text{'access_document_name_in_handler'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'access_document_name_in_handler'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'access_document_name_in_handler'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'access_document_name_in_handler'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/init_files_tests/access_global_direction_unit_in_handler.pl
 
b/tta/perl/t/results/init_files_tests/access_global_direction_unit_in_handler.pl
index a99ea73c69..6d5b08b551 100644
--- 
a/tta/perl/t/results/init_files_tests/access_global_direction_unit_in_handler.pl
+++ 
b/tta/perl/t/results/init_files_tests/access_global_direction_unit_in_handler.pl
@@ -16,6 +16,7 @@ $result_tree_text{'access_global_direction_unit_in_handler'} 
= '*document_root C
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'access_global_direction_unit_in_handler'} 
= '*document_root C
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'access_global_direction_unit_in_handler'} 
= '*document_root C
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'access_global_direction_unit_in_handler'} 
= '*document_root C
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/init_files_tests/access_output_unit_in_handler.pl 
b/tta/perl/t/results/init_files_tests/access_output_unit_in_handler.pl
index f0c181ba4e..240d32a3c7 100644
--- a/tta/perl/t/results/init_files_tests/access_output_unit_in_handler.pl
+++ b/tta/perl/t/results/init_files_tests/access_output_unit_in_handler.pl
@@ -16,6 +16,7 @@ $result_tree_text{'access_output_unit_in_handler'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'access_output_unit_in_handler'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'access_output_unit_in_handler'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'access_output_unit_in_handler'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/init_files_tests/access_tree_output_unit_in_handler.pl 
b/tta/perl/t/results/init_files_tests/access_tree_output_unit_in_handler.pl
index 87b36f72fa..78a5b0ce33 100644
--- a/tta/perl/t/results/init_files_tests/access_tree_output_unit_in_handler.pl
+++ b/tta/perl/t/results/init_files_tests/access_tree_output_unit_in_handler.pl
@@ -16,6 +16,7 @@ $result_tree_text{'access_tree_output_unit_in_handler'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'access_tree_output_unit_in_handler'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'access_tree_output_unit_in_handler'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'access_tree_output_unit_in_handler'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/init_files_tests/button_replacement_and_direction_customization.pl
 
b/tta/perl/t/results/init_files_tests/button_replacement_and_direction_customization.pl
index c9df1045b1..ad1c6891f3 100644
--- 
a/tta/perl/t/results/init_files_tests/button_replacement_and_direction_customization.pl
+++ 
b/tta/perl/t/results/init_files_tests/button_replacement_and_direction_customization.pl
@@ -21,6 +21,7 @@ 
$result_tree_text{'button_replacement_and_direction_customization'} = '*document
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -37,6 +38,7 @@ 
$result_tree_text{'button_replacement_and_direction_customization'} = '*document
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -59,6 +61,7 @@ 
$result_tree_text{'button_replacement_and_direction_customization'} = '*document
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -74,8 +77,9 @@ 
$result_tree_text{'button_replacement_and_direction_customization'} = '*document
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/init_files_tests/button_replacement_direction_strings_customization.pl
 
b/tta/perl/t/results/init_files_tests/button_replacement_direction_strings_customization.pl
index 41abaf6536..20ddd033f3 100644
--- 
a/tta/perl/t/results/init_files_tests/button_replacement_direction_strings_customization.pl
+++ 
b/tta/perl/t/results/init_files_tests/button_replacement_direction_strings_customization.pl
@@ -21,6 +21,7 @@ 
$result_tree_text{'button_replacement_direction_strings_customization'} = '*docu
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -37,6 +38,7 @@ 
$result_tree_text{'button_replacement_direction_strings_customization'} = '*docu
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -59,6 +61,7 @@ 
$result_tree_text{'button_replacement_direction_strings_customization'} = '*docu
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -74,8 +77,9 @@ 
$result_tree_text{'button_replacement_direction_strings_customization'} = '*docu
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/init_files_tests/button_replacement_for_special_unit_direction.pl
 
b/tta/perl/t/results/init_files_tests/button_replacement_for_special_unit_direction.pl
index d2d7807afe..0a1991014c 100644
--- 
a/tta/perl/t/results/init_files_tests/button_replacement_for_special_unit_direction.pl
+++ 
b/tta/perl/t/results/init_files_tests/button_replacement_for_special_unit_direction.pl
@@ -21,6 +21,7 @@ 
$result_tree_text{'button_replacement_for_special_unit_direction'} = '*document_
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -37,6 +38,7 @@ 
$result_tree_text{'button_replacement_for_special_unit_direction'} = '*document_
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -59,6 +61,7 @@ 
$result_tree_text{'button_replacement_for_special_unit_direction'} = '*document_
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -74,8 +77,9 @@ 
$result_tree_text{'button_replacement_for_special_unit_direction'} = '*document_
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/init_files_tests/customize_special_element.pl 
b/tta/perl/t/results/init_files_tests/customize_special_element.pl
index 1eda8632d1..c21aea562e 100644
--- a/tta/perl/t/results/init_files_tests/customize_special_element.pl
+++ b/tta/perl/t/results/init_files_tests/customize_special_element.pl
@@ -27,6 +27,7 @@ $result_tree_text{'customize_special_element'} = 
'*document_root C7
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -43,6 +44,7 @@ $result_tree_text{'customize_special_element'} = 
'*document_root C7
  |associated_node:[E0]
  |section_childs:EC[E3|E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -65,6 +67,7 @@ $result_tree_text{'customize_special_element'} = 
'*document_root C7
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Chapter}
   *arguments_line C1
    *line_arg C1
@@ -80,8 +83,9 @@ $result_tree_text{'customize_special_element'} = 
'*document_root C7
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -111,6 +115,7 @@ $result_tree_text{'customize_special_element'} = 
'*document_root C7
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{Chapter-fr}
   *arguments_line C1
    *line_arg C1
@@ -126,8 +131,9 @@ $result_tree_text{'customize_special_element'} = 
'*document_root C7
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/init_files_tests/customize_translations.pl 
b/tta/perl/t/results/init_files_tests/customize_translations.pl
index 02c609ed8f..d3f240f9b9 100644
--- a/tta/perl/t/results/init_files_tests/customize_translations.pl
+++ b/tta/perl/t/results/init_files_tests/customize_translations.pl
@@ -23,6 +23,7 @@ $result_tree_text{'customize_translations'} = '*document_root 
C13
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -39,6 +40,7 @@ $result_tree_text{'customize_translations'} = '*document_root 
C13
  |associated_node:[E0]
  |section_childs:EC[E3|E5|E9|E11]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -61,6 +63,7 @@ $result_tree_text{'customize_translations'} = '*document_root 
C13
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Chapter}
   *arguments_line C1
    *line_arg C1
@@ -76,8 +79,9 @@ $result_tree_text{'customize_translations'} = '*document_root 
C13
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -112,6 +116,7 @@ $result_tree_text{'customize_translations'} = 
'*document_root C13
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[next->E8|prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{Chapter-fr}
   *arguments_line C1
    *line_arg C1
@@ -128,8 +133,9 @@ $result_tree_text{'customize_translations'} = 
'*document_root C13
  |associated_node:[E4]
  |section_childs:EC[E7]
  |section_directions:D[next->E9|prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E9|prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -152,6 +158,7 @@ $result_tree_text{'customize_translations'} = 
'*document_root C13
  |associated_title_command:[E7]
  |is_target:{1}
  |node_directions:D[up->E4]
+ |node_number:{4}
  |normalized:{section-fr}
   *arguments_line C1
    *line_arg C1
@@ -167,8 +174,9 @@ $result_tree_text{'customize_translations'} = 
'*document_root C13
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E5]
+ |section_heading_number:{2.1}
  |section_level:{2}
- |section_number:{2.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -197,6 +205,7 @@ $result_tree_text{'customize_translations'} = 
'*document_root C13
  |associated_title_command:[E9]
  |is_target:{1}
  |node_directions:D[next->E10|prev->E4|up->E0]
+ |node_number:{5}
  |normalized:{Chapter-de}
   *arguments_line C1
    *line_arg C1
@@ -212,8 +221,9 @@ $result_tree_text{'customize_translations'} = 
'*document_root C13
  |associated_anchor_command:[E8]
  |associated_node:[E8]
  |section_directions:D[next->E11|prev->E5|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{5}
  |toplevel_directions:D[next->E11|prev->E5|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -236,6 +246,7 @@ $result_tree_text{'customize_translations'} = 
'*document_root C13
  |associated_title_command:[E11]
  |is_target:{1}
  |node_directions:D[prev->E8|up->E0]
+ |node_number:{6}
  |normalized:{Last-chapter}
   *arguments_line C1
    *line_arg C1
@@ -251,8 +262,9 @@ $result_tree_text{'customize_translations'} = 
'*document_root C13
  |associated_anchor_command:[E10]
  |associated_node:[E10]
  |section_directions:D[prev->E9|up->E1]
+ |section_heading_number:{4}
  |section_level:{1}
- |section_number:{4}
+ |section_number:{6}
  |toplevel_directions:D[prev->E9|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/init_files_tests/directions_buttons.pl 
b/tta/perl/t/results/init_files_tests/directions_buttons.pl
index f685c61f61..f2048592c7 100644
--- a/tta/perl/t/results/init_files_tests/directions_buttons.pl
+++ b/tta/perl/t/results/init_files_tests/directions_buttons.pl
@@ -21,6 +21,7 @@ $result_tree_text{'directions_buttons'} = '*document_root C7
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -37,6 +38,7 @@ $result_tree_text{'directions_buttons'} = '*document_root C7
  |associated_node:[E0]
  |section_childs:EC[E3|E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -60,6 +62,7 @@ $result_tree_text{'directions_buttons'} = '*document_root C7
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[next->E4|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -75,8 +78,9 @@ $result_tree_text{'directions_buttons'} = '*document_root C7
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -107,6 +111,7 @@ $result_tree_text{'directions_buttons'} = '*document_root C7
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{appendix}
   *arguments_line C1
    *line_arg C2
@@ -125,8 +130,9 @@ $result_tree_text{'directions_buttons'} = '*document_root C7
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[prev->E3|up->E1]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{3}
  |toplevel_directions:D[prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/init_files_tests/directions_buttons_buttons.pl 
b/tta/perl/t/results/init_files_tests/directions_buttons_buttons.pl
index 671ec3be17..fa138a8924 100644
--- a/tta/perl/t/results/init_files_tests/directions_buttons_buttons.pl
+++ b/tta/perl/t/results/init_files_tests/directions_buttons_buttons.pl
@@ -21,6 +21,7 @@ $result_tree_text{'directions_buttons_buttons'} = 
'*document_root C7
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -37,6 +38,7 @@ $result_tree_text{'directions_buttons_buttons'} = 
'*document_root C7
  |associated_node:[E0]
  |section_childs:EC[E3|E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -60,6 +62,7 @@ $result_tree_text{'directions_buttons_buttons'} = 
'*document_root C7
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[next->E4|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -75,8 +78,9 @@ $result_tree_text{'directions_buttons_buttons'} = 
'*document_root C7
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -107,6 +111,7 @@ $result_tree_text{'directions_buttons_buttons'} = 
'*document_root C7
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{appendix}
   *arguments_line C1
    *line_arg C2
@@ -125,8 +130,9 @@ $result_tree_text{'directions_buttons_buttons'} = 
'*document_root C7
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[prev->E3|up->E1]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{3}
  |toplevel_directions:D[prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/init_files_tests/directions_string_base.pl 
b/tta/perl/t/results/init_files_tests/directions_string_base.pl
index e1c72ba4eb..7b4a43cfcf 100644
--- a/tta/perl/t/results/init_files_tests/directions_string_base.pl
+++ b/tta/perl/t/results/init_files_tests/directions_string_base.pl
@@ -16,6 +16,7 @@ $result_tree_text{'directions_string_base'} = '*document_root 
C13
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'directions_string_base'} = '*document_root 
C13
  |associated_node:[E0]
  |section_childs:EC[E3|E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'directions_string_base'} = '*document_root 
C13
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'directions_string_base'} = '*document_root 
C13
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -88,6 +92,7 @@ $result_tree_text{'directions_string_base'} = '*document_root 
C13
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{chap2}
   *arguments_line C1
    *line_arg C1
@@ -104,8 +109,9 @@ $result_tree_text{'directions_string_base'} = 
'*document_root C13
  |associated_node:[E4]
  |section_childs:EC[E7|E9|E11]
  |section_directions:D[prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -123,6 +129,7 @@ $result_tree_text{'directions_string_base'} = 
'*document_root C13
  |associated_title_command:[E7]
  |is_target:{1}
  |node_directions:D[next->E8|up->E4]
+ |node_number:{4}
  |normalized:{sec1}
   *arguments_line C1
    *line_arg C1
@@ -138,8 +145,9 @@ $result_tree_text{'directions_string_base'} = 
'*document_root C13
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[next->E9|up->E5]
+ |section_heading_number:{2.1}
  |section_level:{2}
- |section_number:{2.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -156,6 +164,7 @@ $result_tree_text{'directions_string_base'} = 
'*document_root C13
  |associated_title_command:[E9]
  |is_target:{1}
  |node_directions:D[next->E10|prev->E6|up->E4]
+ |node_number:{5}
  |normalized:{sec2}
   *arguments_line C1
    *line_arg C1
@@ -171,8 +180,9 @@ $result_tree_text{'directions_string_base'} = 
'*document_root C13
  |associated_anchor_command:[E8]
  |associated_node:[E8]
  |section_directions:D[next->E11|prev->E7|up->E5]
+ |section_heading_number:{2.2}
  |section_level:{2}
- |section_number:{2.2}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -189,6 +199,7 @@ $result_tree_text{'directions_string_base'} = 
'*document_root C13
  |associated_title_command:[E11]
  |is_target:{1}
  |node_directions:D[prev->E8|up->E4]
+ |node_number:{6}
  |normalized:{sec3}
   *arguments_line C1
    *line_arg C1
@@ -204,8 +215,9 @@ $result_tree_text{'directions_string_base'} = 
'*document_root C13
  |associated_anchor_command:[E10]
  |associated_node:[E10]
  |section_directions:D[prev->E9|up->E5]
+ |section_heading_number:{2.3}
  |section_level:{2}
- |section_number:{2.3}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/init_files_tests/directions_string_undef.pl 
b/tta/perl/t/results/init_files_tests/directions_string_undef.pl
index eb6f051222..f984cb1e1a 100644
--- a/tta/perl/t/results/init_files_tests/directions_string_undef.pl
+++ b/tta/perl/t/results/init_files_tests/directions_string_undef.pl
@@ -16,6 +16,7 @@ $result_tree_text{'directions_string_undef'} = 
'*document_root C13
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'directions_string_undef'} = 
'*document_root C13
  |associated_node:[E0]
  |section_childs:EC[E3|E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'directions_string_undef'} = 
'*document_root C13
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'directions_string_undef'} = 
'*document_root C13
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -88,6 +92,7 @@ $result_tree_text{'directions_string_undef'} = 
'*document_root C13
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{chap2}
   *arguments_line C1
    *line_arg C1
@@ -104,8 +109,9 @@ $result_tree_text{'directions_string_undef'} = 
'*document_root C13
  |associated_node:[E4]
  |section_childs:EC[E7|E9|E11]
  |section_directions:D[prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -123,6 +129,7 @@ $result_tree_text{'directions_string_undef'} = 
'*document_root C13
  |associated_title_command:[E7]
  |is_target:{1}
  |node_directions:D[next->E8|up->E4]
+ |node_number:{4}
  |normalized:{sec1}
   *arguments_line C1
    *line_arg C1
@@ -138,8 +145,9 @@ $result_tree_text{'directions_string_undef'} = 
'*document_root C13
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[next->E9|up->E5]
+ |section_heading_number:{2.1}
  |section_level:{2}
- |section_number:{2.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -156,6 +164,7 @@ $result_tree_text{'directions_string_undef'} = 
'*document_root C13
  |associated_title_command:[E9]
  |is_target:{1}
  |node_directions:D[next->E10|prev->E6|up->E4]
+ |node_number:{5}
  |normalized:{sec2}
   *arguments_line C1
    *line_arg C1
@@ -171,8 +180,9 @@ $result_tree_text{'directions_string_undef'} = 
'*document_root C13
  |associated_anchor_command:[E8]
  |associated_node:[E8]
  |section_directions:D[next->E11|prev->E7|up->E5]
+ |section_heading_number:{2.2}
  |section_level:{2}
- |section_number:{2.2}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -189,6 +199,7 @@ $result_tree_text{'directions_string_undef'} = 
'*document_root C13
  |associated_title_command:[E11]
  |is_target:{1}
  |node_directions:D[prev->E8|up->E4]
+ |node_number:{6}
  |normalized:{sec3}
   *arguments_line C1
    *line_arg C1
@@ -204,8 +215,9 @@ $result_tree_text{'directions_string_undef'} = 
'*document_root C13
  |associated_anchor_command:[E10]
  |associated_node:[E10]
  |section_directions:D[prev->E9|up->E5]
+ |section_heading_number:{2.3}
  |section_level:{2}
- |section_number:{2.3}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git 
a/tta/perl/t/results/init_files_tests/directions_string_undef_texi2html.pl 
b/tta/perl/t/results/init_files_tests/directions_string_undef_texi2html.pl
index 089b5633ed..58bc183789 100644
--- a/tta/perl/t/results/init_files_tests/directions_string_undef_texi2html.pl
+++ b/tta/perl/t/results/init_files_tests/directions_string_undef_texi2html.pl
@@ -16,6 +16,7 @@ $result_tree_text{'directions_string_undef_texi2html'} = 
'*document_root C13
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'directions_string_undef_texi2html'} = 
'*document_root C13
  |associated_node:[E0]
  |section_childs:EC[E3|E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'directions_string_undef_texi2html'} = 
'*document_root C13
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'directions_string_undef_texi2html'} = 
'*document_root C13
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -88,6 +92,7 @@ $result_tree_text{'directions_string_undef_texi2html'} = 
'*document_root C13
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{chap2}
   *arguments_line C1
    *line_arg C1
@@ -104,8 +109,9 @@ $result_tree_text{'directions_string_undef_texi2html'} = 
'*document_root C13
  |associated_node:[E4]
  |section_childs:EC[E7|E9|E11]
  |section_directions:D[prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -123,6 +129,7 @@ $result_tree_text{'directions_string_undef_texi2html'} = 
'*document_root C13
  |associated_title_command:[E7]
  |is_target:{1}
  |node_directions:D[next->E8|up->E4]
+ |node_number:{4}
  |normalized:{sec1}
   *arguments_line C1
    *line_arg C1
@@ -138,8 +145,9 @@ $result_tree_text{'directions_string_undef_texi2html'} = 
'*document_root C13
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[next->E9|up->E5]
+ |section_heading_number:{2.1}
  |section_level:{2}
- |section_number:{2.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -156,6 +164,7 @@ $result_tree_text{'directions_string_undef_texi2html'} = 
'*document_root C13
  |associated_title_command:[E9]
  |is_target:{1}
  |node_directions:D[next->E10|prev->E6|up->E4]
+ |node_number:{5}
  |normalized:{sec2}
   *arguments_line C1
    *line_arg C1
@@ -171,8 +180,9 @@ $result_tree_text{'directions_string_undef_texi2html'} = 
'*document_root C13
  |associated_anchor_command:[E8]
  |associated_node:[E8]
  |section_directions:D[next->E11|prev->E7|up->E5]
+ |section_heading_number:{2.2}
  |section_level:{2}
- |section_number:{2.2}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -189,6 +199,7 @@ $result_tree_text{'directions_string_undef_texi2html'} = 
'*document_root C13
  |associated_title_command:[E11]
  |is_target:{1}
  |node_directions:D[prev->E8|up->E4]
+ |node_number:{6}
  |normalized:{sec3}
   *arguments_line C1
    *line_arg C1
@@ -204,8 +215,9 @@ $result_tree_text{'directions_string_undef_texi2html'} = 
'*document_root C13
  |associated_anchor_command:[E10]
  |associated_node:[E10]
  |section_directions:D[prev->E9|up->E5]
+ |section_heading_number:{2.3}
  |section_level:{2}
- |section_number:{2.3}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/init_files_tests/documentation_examples.pl 
b/tta/perl/t/results/init_files_tests/documentation_examples.pl
index 832bfa9e4e..e0e0eec181 100644
--- a/tta/perl/t/results/init_files_tests/documentation_examples.pl
+++ b/tta/perl/t/results/init_files_tests/documentation_examples.pl
@@ -52,6 +52,7 @@ $result_tree_text{'documentation_examples'} = '*document_root 
C11
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -68,6 +69,7 @@ $result_tree_text{'documentation_examples'} = '*document_root 
C11
  |associated_node:[E0]
  |section_childs:EC[E3|E5|E7|E9]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -90,6 +92,7 @@ $result_tree_text{'documentation_examples'} = '*document_root 
C11
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -105,8 +108,9 @@ $result_tree_text{'documentation_examples'} = 
'*document_root C11
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -370,6 +374,7 @@ $result_tree_text{'documentation_examples'} = 
'*document_root C11
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[next->E6|prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{my-node}
   *arguments_line C1
    *line_arg C1
@@ -385,8 +390,9 @@ $result_tree_text{'documentation_examples'} = 
'*document_root C11
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[next->E7|prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E7|prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -428,6 +434,7 @@ $result_tree_text{'documentation_examples'} = 
'*document_root C11
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[next->E8|prev->E4|up->E0]
+ |node_number:{4}
  |normalized:{Index}
   *arguments_line C1
    *line_arg C1
@@ -443,8 +450,9 @@ $result_tree_text{'documentation_examples'} = 
'*document_root C11
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[next->E9|prev->E5|up->E1]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{4}
  |toplevel_directions:D[next->E9|prev->E5|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -475,6 +483,7 @@ $result_tree_text{'documentation_examples'} = 
'*document_root C11
  |associated_title_command:[E9]
  |is_target:{1}
  |node_directions:D[prev->E6|up->E0]
+ |node_number:{5}
  |normalized:{Second-appendix}
   *arguments_line C1
    *line_arg C1
@@ -490,8 +499,9 @@ $result_tree_text{'documentation_examples'} = 
'*document_root C11
  |associated_anchor_command:[E8]
  |associated_node:[E8]
  |section_directions:D[prev->E7|up->E1]
+ |section_heading_number:{B}
  |section_level:{1}
- |section_number:{B}
+ |section_number:{5}
  |toplevel_directions:D[prev->E7|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/init_files_tests/documentation_examples_texi2html.pl 
b/tta/perl/t/results/init_files_tests/documentation_examples_texi2html.pl
index cdfd9a2384..e4c58ab09d 100644
--- a/tta/perl/t/results/init_files_tests/documentation_examples_texi2html.pl
+++ b/tta/perl/t/results/init_files_tests/documentation_examples_texi2html.pl
@@ -52,6 +52,7 @@ $result_tree_text{'documentation_examples_texi2html'} = 
'*document_root C11
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -68,6 +69,7 @@ $result_tree_text{'documentation_examples_texi2html'} = 
'*document_root C11
  |associated_node:[E0]
  |section_childs:EC[E3|E5|E7|E9]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -90,6 +92,7 @@ $result_tree_text{'documentation_examples_texi2html'} = 
'*document_root C11
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -105,8 +108,9 @@ $result_tree_text{'documentation_examples_texi2html'} = 
'*document_root C11
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -370,6 +374,7 @@ $result_tree_text{'documentation_examples_texi2html'} = 
'*document_root C11
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[next->E6|prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{my-node}
   *arguments_line C1
    *line_arg C1
@@ -385,8 +390,9 @@ $result_tree_text{'documentation_examples_texi2html'} = 
'*document_root C11
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[next->E7|prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E7|prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -428,6 +434,7 @@ $result_tree_text{'documentation_examples_texi2html'} = 
'*document_root C11
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[next->E8|prev->E4|up->E0]
+ |node_number:{4}
  |normalized:{Index}
   *arguments_line C1
    *line_arg C1
@@ -443,8 +450,9 @@ $result_tree_text{'documentation_examples_texi2html'} = 
'*document_root C11
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[next->E9|prev->E5|up->E1]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{4}
  |toplevel_directions:D[next->E9|prev->E5|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -475,6 +483,7 @@ $result_tree_text{'documentation_examples_texi2html'} = 
'*document_root C11
  |associated_title_command:[E9]
  |is_target:{1}
  |node_directions:D[prev->E6|up->E0]
+ |node_number:{5}
  |normalized:{Second-appendix}
   *arguments_line C1
    *line_arg C1
@@ -490,8 +499,9 @@ $result_tree_text{'documentation_examples_texi2html'} = 
'*document_root C11
  |associated_anchor_command:[E8]
  |associated_node:[E8]
  |section_directions:D[prev->E7|up->E1]
+ |section_heading_number:{B}
  |section_level:{1}
- |section_number:{B}
+ |section_number:{5}
  |toplevel_directions:D[prev->E7|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/init_files_tests/printindex_set_direction.pl 
b/tta/perl/t/results/init_files_tests/printindex_set_direction.pl
index 1ff6c33e8e..1e356d8a1d 100644
--- a/tta/perl/t/results/init_files_tests/printindex_set_direction.pl
+++ b/tta/perl/t/results/init_files_tests/printindex_set_direction.pl
@@ -16,6 +16,7 @@ $result_tree_text{'printindex_set_direction'} = 
'*document_root C11
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'printindex_set_direction'} = 
'*document_root C11
  |associated_node:[E0]
  |section_childs:EC[E3|E5|E7|E9]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'printindex_set_direction'} = 
'*document_root C11
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Chapter}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'printindex_set_direction'} = 
'*document_root C11
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -129,6 +133,7 @@ $result_tree_text{'printindex_set_direction'} = 
'*document_root C11
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[next->E6|prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{Vindex}
   *arguments_line C1
    *line_arg C1
@@ -144,8 +149,9 @@ $result_tree_text{'printindex_set_direction'} = 
'*document_root C11
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[next->E7|prev->E3|up->E1]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{3}
  |toplevel_directions:D[next->E7|prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -177,6 +183,7 @@ $result_tree_text{'printindex_set_direction'} = 
'*document_root C11
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[next->E8|prev->E4|up->E0]
+ |node_number:{4}
  |normalized:{Cindex}
   *arguments_line C1
    *line_arg C1
@@ -192,8 +199,9 @@ $result_tree_text{'printindex_set_direction'} = 
'*document_root C11
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[next->E9|prev->E5|up->E1]
+ |section_heading_number:{B}
  |section_level:{1}
- |section_number:{B}
+ |section_number:{4}
  |toplevel_directions:D[next->E9|prev->E5|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -225,6 +233,7 @@ $result_tree_text{'printindex_set_direction'} = 
'*document_root C11
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E6|up->E0]
+ |node_number:{5}
  |normalized:{Findex}
   *arguments_line C1
    *line_arg C1
@@ -240,8 +249,9 @@ $result_tree_text{'printindex_set_direction'} = 
'*document_root C11
  |associated_anchor_command:[E8]
  |associated_node:[E8]
  |section_directions:D[prev->E7|up->E1]
+ |section_heading_number:{C}
  |section_level:{1}
- |section_number:{C}
+ |section_number:{5}
  |toplevel_directions:D[prev->E7|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/init_files_tests/redefined_buttons_functions.pl 
b/tta/perl/t/results/init_files_tests/redefined_buttons_functions.pl
index 0c6f50aa1b..0c8d439edf 100644
--- a/tta/perl/t/results/init_files_tests/redefined_buttons_functions.pl
+++ b/tta/perl/t/results/init_files_tests/redefined_buttons_functions.pl
@@ -16,6 +16,7 @@ $result_tree_text{'redefined_buttons_functions'} = 
'*document_root C13
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'redefined_buttons_functions'} = 
'*document_root C13
  |associated_node:[E0]
  |section_childs:EC[E3|E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'redefined_buttons_functions'} = 
'*document_root C13
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'redefined_buttons_functions'} = 
'*document_root C13
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -88,6 +92,7 @@ $result_tree_text{'redefined_buttons_functions'} = 
'*document_root C13
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{chap2}
   *arguments_line C1
    *line_arg C1
@@ -104,8 +109,9 @@ $result_tree_text{'redefined_buttons_functions'} = 
'*document_root C13
  |associated_node:[E4]
  |section_childs:EC[E7|E9|E11]
  |section_directions:D[prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -123,6 +129,7 @@ $result_tree_text{'redefined_buttons_functions'} = 
'*document_root C13
  |associated_title_command:[E7]
  |is_target:{1}
  |node_directions:D[next->E8|up->E4]
+ |node_number:{4}
  |normalized:{sec1}
   *arguments_line C1
    *line_arg C1
@@ -138,8 +145,9 @@ $result_tree_text{'redefined_buttons_functions'} = 
'*document_root C13
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[next->E9|up->E5]
+ |section_heading_number:{2.1}
  |section_level:{2}
- |section_number:{2.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -156,6 +164,7 @@ $result_tree_text{'redefined_buttons_functions'} = 
'*document_root C13
  |associated_title_command:[E9]
  |is_target:{1}
  |node_directions:D[next->E10|prev->E6|up->E4]
+ |node_number:{5}
  |normalized:{sec2}
   *arguments_line C1
    *line_arg C1
@@ -171,8 +180,9 @@ $result_tree_text{'redefined_buttons_functions'} = 
'*document_root C13
  |associated_anchor_command:[E8]
  |associated_node:[E8]
  |section_directions:D[next->E11|prev->E7|up->E5]
+ |section_heading_number:{2.2}
  |section_level:{2}
- |section_number:{2.2}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -189,6 +199,7 @@ $result_tree_text{'redefined_buttons_functions'} = 
'*document_root C13
  |associated_title_command:[E11]
  |is_target:{1}
  |node_directions:D[prev->E8|up->E4]
+ |node_number:{6}
  |normalized:{sec3}
   *arguments_line C1
    *line_arg C1
@@ -204,8 +215,9 @@ $result_tree_text{'redefined_buttons_functions'} = 
'*document_root C13
  |associated_anchor_command:[E10]
  |associated_node:[E10]
  |section_directions:D[prev->E9|up->E5]
+ |section_heading_number:{2.3}
  |section_level:{2}
- |section_number:{2.3}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git 
a/tta/perl/t/results/init_files_tests/ref_for_special_unit_direction.pl 
b/tta/perl/t/results/init_files_tests/ref_for_special_unit_direction.pl
index 25c9a20db4..edb4479f53 100644
--- a/tta/perl/t/results/init_files_tests/ref_for_special_unit_direction.pl
+++ b/tta/perl/t/results/init_files_tests/ref_for_special_unit_direction.pl
@@ -21,6 +21,7 @@ $result_tree_text{'ref_for_special_unit_direction'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -37,6 +38,7 @@ $result_tree_text{'ref_for_special_unit_direction'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -59,6 +61,7 @@ $result_tree_text{'ref_for_special_unit_direction'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -74,8 +77,9 @@ $result_tree_text{'ref_for_special_unit_direction'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/init_files_tests/special_unit_direction_customization.pl 
b/tta/perl/t/results/init_files_tests/special_unit_direction_customization.pl
index baba03386e..e17dddf433 100644
--- 
a/tta/perl/t/results/init_files_tests/special_unit_direction_customization.pl
+++ 
b/tta/perl/t/results/init_files_tests/special_unit_direction_customization.pl
@@ -21,6 +21,7 @@ $result_tree_text{'special_unit_direction_customization'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -37,6 +38,7 @@ $result_tree_text{'special_unit_direction_customization'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -59,6 +61,7 @@ $result_tree_text{'special_unit_direction_customization'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -74,8 +77,9 @@ $result_tree_text{'special_unit_direction_customization'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/init_files_tests/test_format_single_footnote_in_inline_content.pl
 
b/tta/perl/t/results/init_files_tests/test_format_single_footnote_in_inline_content.pl
index 7f30fd1679..d581e1f700 100644
--- 
a/tta/perl/t/results/init_files_tests/test_format_single_footnote_in_inline_content.pl
+++ 
b/tta/perl/t/results/init_files_tests/test_format_single_footnote_in_inline_content.pl
@@ -16,6 +16,7 @@ 
$result_tree_text{'test_format_single_footnote_in_inline_content'} = '*document_
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ 
$result_tree_text{'test_format_single_footnote_in_inline_content'} = '*document_
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ 
$result_tree_text{'test_format_single_footnote_in_inline_content'} = '*document_
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ 
$result_tree_text{'test_format_single_footnote_in_inline_content'} = '*document_
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/init_files_tests/translation_in_parser_in_translation.pl 
b/tta/perl/t/results/init_files_tests/translation_in_parser_in_translation.pl
index 955b953424..fcb046866b 100644
--- 
a/tta/perl/t/results/init_files_tests/translation_in_parser_in_translation.pl
+++ 
b/tta/perl/t/results/init_files_tests/translation_in_parser_in_translation.pl
@@ -29,6 +29,7 @@ $result_tree_text{'translation_in_parser_in_translation'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -45,6 +46,7 @@ $result_tree_text{'translation_in_parser_in_translation'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -67,6 +69,7 @@ $result_tree_text{'translation_in_parser_in_translation'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -82,8 +85,9 @@ $result_tree_text{'translation_in_parser_in_translation'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/init_files_tests/undefined_node_filename.pl 
b/tta/perl/t/results/init_files_tests/undefined_node_filename.pl
index 7fea9ef24f..058883d7e9 100644
--- a/tta/perl/t/results/init_files_tests/undefined_node_filename.pl
+++ b/tta/perl/t/results/init_files_tests/undefined_node_filename.pl
@@ -14,6 +14,7 @@ $result_tree_text{'undefined_node_filename'} = 
'*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -29,6 +30,7 @@ $result_tree_text{'undefined_node_filename'} = 
'*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap-Other}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/init_files_tests/unknown_custom_variable.pl 
b/tta/perl/t/results/init_files_tests/unknown_custom_variable.pl
index 6ffaa511b8..ae3d578a7a 100644
--- a/tta/perl/t/results/init_files_tests/unknown_custom_variable.pl
+++ b/tta/perl/t/results/init_files_tests/unknown_custom_variable.pl
@@ -15,6 +15,7 @@ $result_tree_text{'unknown_custom_variable'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'unknown_custom_variable'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -53,6 +55,7 @@ $result_tree_text{'unknown_custom_variable'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Chap}
   *arguments_line C1
    *line_arg C1
@@ -68,8 +71,9 @@ $result_tree_text{'unknown_custom_variable'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/invalid_nestings/footnote_in_ref.pl 
b/tta/perl/t/results/invalid_nestings/footnote_in_ref.pl
index ef98c7fcef..023720994b 100644
--- a/tta/perl/t/results/invalid_nestings/footnote_in_ref.pl
+++ b/tta/perl/t/results/invalid_nestings/footnote_in_ref.pl
@@ -12,6 +12,7 @@ $result_tree_text{'footnote_in_ref'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/invalid_nestings/ignore_in_xref.pl 
b/tta/perl/t/results/invalid_nestings/ignore_in_xref.pl
index dcdbe0b33e..8379a9a83b 100644
--- a/tta/perl/t/results/invalid_nestings/ignore_in_xref.pl
+++ b/tta/perl/t/results/invalid_nestings/ignore_in_xref.pl
@@ -12,6 +12,7 @@ $result_tree_text{'ignore_in_xref'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/invalid_nestings/ignored_text.pl 
b/tta/perl/t/results/invalid_nestings/ignored_text.pl
index 4c53b7b8ff..713cbdcd1a 100644
--- a/tta/perl/t/results/invalid_nestings/ignored_text.pl
+++ b/tta/perl/t/results/invalid_nestings/ignored_text.pl
@@ -12,6 +12,7 @@ $result_tree_text{'ignored_text'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{before-ignore}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/invalid_nestings/in_table.pl 
b/tta/perl/t/results/invalid_nestings/in_table.pl
index 0a541a716b..bd56002db2 100644
--- a/tta/perl/t/results/invalid_nestings/in_table.pl
+++ b/tta/perl/t/results/invalid_nestings/in_table.pl
@@ -14,6 +14,7 @@ $result_tree_text{'in_table'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -29,6 +30,7 @@ $result_tree_text{'in_table'} = '*document_root C3
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/invalid_nestings/menu_in_style_command.pl 
b/tta/perl/t/results/invalid_nestings/menu_in_style_command.pl
index 1c22159ad2..8a9a8e9924 100644
--- a/tta/perl/t/results/invalid_nestings/menu_in_style_command.pl
+++ b/tta/perl/t/results/invalid_nestings/menu_in_style_command.pl
@@ -13,6 +13,7 @@ $result_tree_text{'menu_in_style_command'} = '*document_root 
C2
  |EXTRA
  |is_target:{1}
  |menus:EC[E1]
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/invalid_nestings/node_in_copying.pl 
b/tta/perl/t/results/invalid_nestings/node_in_copying.pl
index bb87355c14..40dc02e9ab 100644
--- a/tta/perl/t/results/invalid_nestings/node_in_copying.pl
+++ b/tta/perl/t/results/invalid_nestings/node_in_copying.pl
@@ -18,6 +18,7 @@ $result_tree_text{'node_in_copying'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{node}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/invalid_nestings/node_in_copying_not_closed.pl 
b/tta/perl/t/results/invalid_nestings/node_in_copying_not_closed.pl
index 97fd46f656..888d70ecea 100644
--- a/tta/perl/t/results/invalid_nestings/node_in_copying_not_closed.pl
+++ b/tta/perl/t/results/invalid_nestings/node_in_copying_not_closed.pl
@@ -25,6 +25,7 @@ $result_tree_text{'node_in_copying_not_closed'} = 
'*document_root C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -40,6 +41,7 @@ $result_tree_text{'node_in_copying_not_closed'} = 
'*document_root C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/invalid_nestings/node_on_index_entry_line.pl 
b/tta/perl/t/results/invalid_nestings/node_on_index_entry_line.pl
index 6c0bec0894..eb0510be15 100644
--- a/tta/perl/t/results/invalid_nestings/node_on_index_entry_line.pl
+++ b/tta/perl/t/results/invalid_nestings/node_on_index_entry_line.pl
@@ -26,6 +26,7 @@ $result_tree_text{'node_on_index_entry_line'} = 
'*document_root C2
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->MISSING: (line_arg)[C4]|prev->MISSING: 
(line_arg)[C4]|up->MISSING: (line_arg)[C4]]
+ |node_number:{1}
  |normalized:{a}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/invalid_nestings/on_node_line.pl 
b/tta/perl/t/results/invalid_nestings/on_node_line.pl
index 0fb19e7447..17cab5ed40 100644
--- a/tta/perl/t/results/invalid_nestings/on_node_line.pl
+++ b/tta/perl/t/results/invalid_nestings/on_node_line.pl
@@ -13,6 +13,7 @@ $result_tree_text{'on_node_line'} = '*document_root C2
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->MISSING: (line_arg)[C8]]
+ |node_number:{1}
  |normalized:{a}
   *arguments_line C2
    *line_arg C1
diff --git a/tta/perl/t/results/invalid_nestings/on_section_line.pl 
b/tta/perl/t/results/invalid_nestings/on_section_line.pl
index 6595bf05b3..6bd25f242a 100644
--- a/tta/perl/t/results/invalid_nestings/on_section_line.pl
+++ b/tta/perl/t/results/invalid_nestings/on_section_line.pl
@@ -12,6 +12,7 @@ $result_tree_text{'on_section_line'} = '*document_root C2
  |spaces_before_argument:
   |{ }
  |EXTRA
+ |section_heading_number:{1}
  |section_level:{2}
  |section_number:{1}
  |sectioning_root:
diff --git a/tta/perl/t/results/invalid_nestings/on_subheading_line.pl 
b/tta/perl/t/results/invalid_nestings/on_subheading_line.pl
index 648c453c5f..406f151f17 100644
--- a/tta/perl/t/results/invalid_nestings/on_subheading_line.pl
+++ b/tta/perl/t/results/invalid_nestings/on_subheading_line.pl
@@ -12,6 +12,7 @@ $result_tree_text{'on_subheading_line'} = '*document_root C1
    |{ }
   |EXTRA
   |global_command_number:{1}
+  |heading_number:{1}
    *line_arg C9
     *@noindent l1
     {ignorable_spaces_after_command: }
diff --git a/tta/perl/t/results/invalid_nestings/quotation_in_ref.pl 
b/tta/perl/t/results/invalid_nestings/quotation_in_ref.pl
index ed9bcef360..a232b3d5e4 100644
--- a/tta/perl/t/results/invalid_nestings/quotation_in_ref.pl
+++ b/tta/perl/t/results/invalid_nestings/quotation_in_ref.pl
@@ -12,6 +12,7 @@ $result_tree_text{'quotation_in_ref'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/invalid_nestings/ref_in_ref.pl 
b/tta/perl/t/results/invalid_nestings/ref_in_ref.pl
index 1c58d787b7..e7198c465b 100644
--- a/tta/perl/t/results/invalid_nestings/ref_in_ref.pl
+++ b/tta/perl/t/results/invalid_nestings/ref_in_ref.pl
@@ -12,6 +12,7 @@ $result_tree_text{'ref_in_ref'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/invalid_nestings/ref_to_top_in_anchor.pl 
b/tta/perl/t/results/invalid_nestings/ref_to_top_in_anchor.pl
index 50d0ecaf6e..2b148c34a0 100644
--- a/tta/perl/t/results/invalid_nestings/ref_to_top_in_anchor.pl
+++ b/tta/perl/t/results/invalid_nestings/ref_to_top_in_anchor.pl
@@ -12,6 +12,7 @@ $result_tree_text{'ref_to_top_in_anchor'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/invalid_nestings/section_in_copying.pl 
b/tta/perl/t/results/invalid_nestings/section_in_copying.pl
index a5f7870e00..1008af4821 100644
--- a/tta/perl/t/results/invalid_nestings/section_in_copying.pl
+++ b/tta/perl/t/results/invalid_nestings/section_in_copying.pl
@@ -21,6 +21,7 @@ $result_tree_text{'section_in_copying'} = '*document_root C2
  |spaces_before_argument:
   |{ }
  |EXTRA
+ |section_heading_number:{1}
  |section_level:{2}
  |section_number:{1}
  |sectioning_root:
diff --git a/tta/perl/t/results/invalid_nestings/section_in_flushright.pl 
b/tta/perl/t/results/invalid_nestings/section_in_flushright.pl
index 3b60376d72..707f785d93 100644
--- a/tta/perl/t/results/invalid_nestings/section_in_flushright.pl
+++ b/tta/perl/t/results/invalid_nestings/section_in_flushright.pl
@@ -21,6 +21,7 @@ $result_tree_text{'section_in_flushright'} = '*document_root 
C2
  |spaces_before_argument:
   |{ }
  |EXTRA
+ |section_heading_number:{1}
  |section_level:{2}
  |section_number:{1}
  |sectioning_root:
diff --git a/tta/perl/t/results/invalid_nestings/section_in_footnote.pl 
b/tta/perl/t/results/invalid_nestings/section_in_footnote.pl
index 04b0eeaae7..513a85a21e 100644
--- a/tta/perl/t/results/invalid_nestings/section_in_footnote.pl
+++ b/tta/perl/t/results/invalid_nestings/section_in_footnote.pl
@@ -20,6 +20,7 @@ $result_tree_text{'section_in_footnote'} = '*document_root C2
  |spaces_before_argument:
   |{ }
  |EXTRA
+ |section_heading_number:{1}
  |section_level:{2}
  |section_number:{1}
  |sectioning_root:
diff --git a/tta/perl/t/results/invalid_nestings/section_in_math.pl 
b/tta/perl/t/results/invalid_nestings/section_in_math.pl
index 140b66bd96..230da48bdf 100644
--- a/tta/perl/t/results/invalid_nestings/section_in_math.pl
+++ b/tta/perl/t/results/invalid_nestings/section_in_math.pl
@@ -22,6 +22,7 @@ $result_tree_text{'section_in_math'} = '*document_root C3
   |{ }
  |EXTRA
  |section_directions:D[next->E1]
+ |section_heading_number:{1}
  |section_level:{2}
  |section_number:{1}
  |sectioning_root:
@@ -52,6 +53,7 @@ $result_tree_text{'section_in_math'} = '*document_root C3
   |{ }
  |EXTRA
  |section_directions:D[prev->E0]
+ |section_heading_number:{2}
  |section_level:{2}
  |section_number:{2}
  |toplevel_directions:D[prev->E0]
diff --git 
a/tta/perl/t/results/invalid_nestings/section_in_nested_block_commands.pl 
b/tta/perl/t/results/invalid_nestings/section_in_nested_block_commands.pl
index 2253cfddde..07f3210f05 100644
--- a/tta/perl/t/results/invalid_nestings/section_in_nested_block_commands.pl
+++ b/tta/perl/t/results/invalid_nestings/section_in_nested_block_commands.pl
@@ -46,6 +46,7 @@ $result_tree_text{'section_in_nested_block_commands'} = 
'*document_root C2
  |spaces_before_argument:
   |{ }
  |EXTRA
+ |section_heading_number:{1}
  |section_level:{2}
  |section_number:{1}
  |sectioning_root:
diff --git a/tta/perl/t/results/invalid_nestings/section_in_table.pl 
b/tta/perl/t/results/invalid_nestings/section_in_table.pl
index 9dde9dd0b2..11fcda52eb 100644
--- a/tta/perl/t/results/invalid_nestings/section_in_table.pl
+++ b/tta/perl/t/results/invalid_nestings/section_in_table.pl
@@ -34,6 +34,7 @@ $result_tree_text{'section_in_table'} = '*document_root C2
  |spaces_before_argument:
   |{ }
  |EXTRA
+ |section_heading_number:{1}
  |section_level:{2}
  |section_number:{1}
  |sectioning_root:
diff --git a/tta/perl/t/results/invalid_nestings/section_on_cartouche_line.pl 
b/tta/perl/t/results/invalid_nestings/section_on_cartouche_line.pl
index baedbff2d3..d85f69474d 100644
--- a/tta/perl/t/results/invalid_nestings/section_on_cartouche_line.pl
+++ b/tta/perl/t/results/invalid_nestings/section_on_cartouche_line.pl
@@ -15,6 +15,7 @@ $result_tree_text{'section_on_cartouche_line'} = 
'*document_root C3
   |{ }
  |EXTRA
  |section_directions:D[next->E1]
+ |section_heading_number:{1}
  |section_level:{2}
  |section_number:{1}
  |sectioning_root:
@@ -42,6 +43,7 @@ $result_tree_text{'section_on_cartouche_line'} = 
'*document_root C3
   |{ }
  |EXTRA
  |section_directions:D[prev->E0]
+ |section_heading_number:{2}
  |section_level:{2}
  |section_number:{2}
  |toplevel_directions:D[prev->E0]
diff --git a/tta/perl/t/results/invalid_nestings/section_on_def_line.pl 
b/tta/perl/t/results/invalid_nestings/section_on_def_line.pl
index 9d26fd661d..6b564c6ac8 100644
--- a/tta/perl/t/results/invalid_nestings/section_on_def_line.pl
+++ b/tta/perl/t/results/invalid_nestings/section_on_def_line.pl
@@ -35,6 +35,7 @@ $result_tree_text{'section_on_def_line'} = '*document_root C2
  |spaces_before_argument:
   |{ }
  |EXTRA
+ |section_heading_number:{1}
  |section_level:{2}
  |section_number:{1}
  |sectioning_root:
diff --git a/tta/perl/t/results/invalid_nestings/section_on_defx_line.pl 
b/tta/perl/t/results/invalid_nestings/section_on_defx_line.pl
index 2ca7cb3adb..16d5039422 100644
--- a/tta/perl/t/results/invalid_nestings/section_on_defx_line.pl
+++ b/tta/perl/t/results/invalid_nestings/section_on_defx_line.pl
@@ -66,6 +66,7 @@ $result_tree_text{'section_on_defx_line'} = '*document_root C2
  |spaces_before_argument:
   |{ }
  |EXTRA
+ |section_heading_number:{1}
  |section_level:{2}
  |section_number:{1}
  |sectioning_root:
diff --git a/tta/perl/t/results/invalid_nestings/section_on_enumerate_line.pl 
b/tta/perl/t/results/invalid_nestings/section_on_enumerate_line.pl
index 4d5911ee1c..8a7f855748 100644
--- a/tta/perl/t/results/invalid_nestings/section_on_enumerate_line.pl
+++ b/tta/perl/t/results/invalid_nestings/section_on_enumerate_line.pl
@@ -24,6 +24,7 @@ $result_tree_text{'section_on_enumerate_line'} = 
'*document_root C3
   |{ }
  |EXTRA
  |section_directions:D[next->E1]
+ |section_heading_number:{1}
  |section_level:{2}
  |section_number:{1}
  |sectioning_root:
@@ -57,6 +58,7 @@ $result_tree_text{'section_on_enumerate_line'} = 
'*document_root C3
   |{ }
  |EXTRA
  |section_directions:D[prev->E0]
+ |section_heading_number:{2}
  |section_level:{2}
  |section_number:{2}
  |toplevel_directions:D[prev->E0]
diff --git a/tta/perl/t/results/invalid_nestings/section_on_float_line.pl 
b/tta/perl/t/results/invalid_nestings/section_on_float_line.pl
index cb13f457c7..7e84ae711b 100644
--- a/tta/perl/t/results/invalid_nestings/section_on_float_line.pl
+++ b/tta/perl/t/results/invalid_nestings/section_on_float_line.pl
@@ -31,6 +31,7 @@ $result_tree_text{'section_on_float_line'} = '*document_root 
C2
  |spaces_before_argument:
   |{ }
  |EXTRA
+ |section_heading_number:{1}
  |section_level:{2}
  |section_number:{1}
  |sectioning_root:
diff --git a/tta/perl/t/results/invalid_nestings/section_on_index_entry_line.pl 
b/tta/perl/t/results/invalid_nestings/section_on_index_entry_line.pl
index 68e2114278..326c619548 100644
--- a/tta/perl/t/results/invalid_nestings/section_on_index_entry_line.pl
+++ b/tta/perl/t/results/invalid_nestings/section_on_index_entry_line.pl
@@ -23,6 +23,7 @@ $result_tree_text{'section_on_index_entry_line'} = 
'*document_root C2
  |spaces_before_argument:
   |{ }
  |EXTRA
+ |section_heading_number:{1}
  |section_level:{2}
  |section_number:{1}
  |sectioning_root:
diff --git a/tta/perl/t/results/invalid_nestings/section_on_itemize_line.pl 
b/tta/perl/t/results/invalid_nestings/section_on_itemize_line.pl
index 5a0ae00ecd..977b809de2 100644
--- a/tta/perl/t/results/invalid_nestings/section_on_itemize_line.pl
+++ b/tta/perl/t/results/invalid_nestings/section_on_itemize_line.pl
@@ -23,6 +23,7 @@ $result_tree_text{'section_on_itemize_line'} = 
'*document_root C5
   |{ }
  |EXTRA
  |section_directions:D[next->E1]
+ |section_heading_number:{1}
  |section_level:{2}
  |section_number:{1}
  |sectioning_root:
@@ -56,6 +57,7 @@ $result_tree_text{'section_on_itemize_line'} = 
'*document_root C5
   |{ }
  |EXTRA
  |section_directions:D[next->E2|prev->E0]
+ |section_heading_number:{2}
  |section_level:{2}
  |section_number:{2}
  |toplevel_directions:D[next->E2|prev->E0]
@@ -78,6 +80,7 @@ $result_tree_text{'section_on_itemize_line'} = 
'*document_root C5
   |{ }
  |EXTRA
  |section_directions:D[next->E3|prev->E1]
+ |section_heading_number:{3}
  |section_level:{2}
  |section_number:{3}
  |toplevel_directions:D[next->E3|prev->E1]
@@ -104,6 +107,7 @@ $result_tree_text{'section_on_itemize_line'} = 
'*document_root C5
   |{ }
  |EXTRA
  |section_directions:D[prev->E2]
+ |section_heading_number:{4}
  |section_level:{2}
  |section_number:{4}
  |toplevel_directions:D[prev->E2]
diff --git a/tta/perl/t/results/invalid_nestings/section_on_multitable_line.pl 
b/tta/perl/t/results/invalid_nestings/section_on_multitable_line.pl
index 0855b6e255..72270fcf54 100644
--- a/tta/perl/t/results/invalid_nestings/section_on_multitable_line.pl
+++ b/tta/perl/t/results/invalid_nestings/section_on_multitable_line.pl
@@ -20,6 +20,7 @@ $result_tree_text{'section_on_multitable_line'} = 
'*document_root C4
   |{ }
  |EXTRA
  |section_directions:D[next->E1]
+ |section_heading_number:{1}
  |section_level:{2}
  |section_number:{1}
  |sectioning_root:
@@ -55,6 +56,7 @@ $result_tree_text{'section_on_multitable_line'} = 
'*document_root C4
   |{ }
  |EXTRA
  |section_directions:D[next->E2|prev->E0]
+ |section_heading_number:{2}
  |section_level:{2}
  |section_number:{2}
  |toplevel_directions:D[next->E2|prev->E0]
@@ -87,6 +89,7 @@ $result_tree_text{'section_on_multitable_line'} = 
'*document_root C4
   |{ }
  |EXTRA
  |section_directions:D[prev->E1]
+ |section_heading_number:{3}
  |section_level:{2}
  |section_number:{3}
  |toplevel_directions:D[prev->E1]
diff --git a/tta/perl/t/results/invalid_nestings/section_on_xtable_line.pl 
b/tta/perl/t/results/invalid_nestings/section_on_xtable_line.pl
index 837484b7e7..f2aa71fd71 100644
--- a/tta/perl/t/results/invalid_nestings/section_on_xtable_line.pl
+++ b/tta/perl/t/results/invalid_nestings/section_on_xtable_line.pl
@@ -18,6 +18,7 @@ $result_tree_text{'section_on_xtable_line'} = '*document_root 
C5
   |{ }
  |EXTRA
  |section_directions:D[next->E1]
+ |section_heading_number:{1}
  |section_level:{2}
  |section_number:{1}
  |sectioning_root:
@@ -49,6 +50,7 @@ $result_tree_text{'section_on_xtable_line'} = '*document_root 
C5
   |{ }
  |EXTRA
  |section_directions:D[next->E2|prev->E0]
+ |section_heading_number:{2}
  |section_level:{2}
  |section_number:{2}
  |toplevel_directions:D[next->E2|prev->E0]
@@ -75,6 +77,7 @@ $result_tree_text{'section_on_xtable_line'} = '*document_root 
C5
   |{ }
  |EXTRA
  |section_directions:D[next->E3|prev->E1]
+ |section_heading_number:{3}
  |section_level:{2}
  |section_number:{3}
  |toplevel_directions:D[next->E3|prev->E1]
@@ -101,6 +104,7 @@ $result_tree_text{'section_on_xtable_line'} = 
'*document_root C5
   |{ }
  |EXTRA
  |section_directions:D[prev->E2]
+ |section_heading_number:{4}
  |section_level:{2}
  |section_number:{4}
  |toplevel_directions:D[prev->E2]
diff --git 
a/tta/perl/t/results/invalid_nestings/style_not_closed_before_first_node.pl 
b/tta/perl/t/results/invalid_nestings/style_not_closed_before_first_node.pl
index 871e55ffa0..08eefe38d0 100644
--- a/tta/perl/t/results/invalid_nestings/style_not_closed_before_first_node.pl
+++ b/tta/perl/t/results/invalid_nestings/style_not_closed_before_first_node.pl
@@ -17,6 +17,7 @@ $result_tree_text{'style_not_closed_before_first_node'} = 
'*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
 
b/tta/perl/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
index c4889330d5..767299ca2c 100644
--- 
a/tta/perl/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
+++ 
b/tta/perl/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
@@ -16,6 +16,7 @@ 
$result_tree_text{'style_not_closed_no_newline_root_commands'} = '*document_root
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ 
$result_tree_text{'style_not_closed_no_newline_root_commands'} = '*document_root
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -88,6 +90,7 @@ 
$result_tree_text{'style_not_closed_no_newline_root_commands'} = '*document_root
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -103,8 +106,9 @@ 
$result_tree_text{'style_not_closed_no_newline_root_commands'} = '*document_root
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/invalid_nestings/style_not_closed_root_commands.pl 
b/tta/perl/t/results/invalid_nestings/style_not_closed_root_commands.pl
index 42f1f5e3f7..3289f8cc2f 100644
--- a/tta/perl/t/results/invalid_nestings/style_not_closed_root_commands.pl
+++ b/tta/perl/t/results/invalid_nestings/style_not_closed_root_commands.pl
@@ -16,6 +16,7 @@ $result_tree_text{'style_not_closed_root_commands'} = 
'*document_root C6
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'style_not_closed_root_commands'} = 
'*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -89,6 +91,7 @@ $result_tree_text{'style_not_closed_root_commands'} = 
'*document_root C6
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -104,8 +107,9 @@ $result_tree_text{'style_not_closed_root_commands'} = 
'*document_root C6
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/invalid_nestings/unclosed_verb_on_section_line.pl 
b/tta/perl/t/results/invalid_nestings/unclosed_verb_on_section_line.pl
index 59d529f8d5..0e7c5fff15 100644
--- a/tta/perl/t/results/invalid_nestings/unclosed_verb_on_section_line.pl
+++ b/tta/perl/t/results/invalid_nestings/unclosed_verb_on_section_line.pl
@@ -14,6 +14,7 @@ T}}
  |spaces_before_argument:
   |{ }
  |EXTRA
+ |section_heading_number:{1}
  |section_level:{2}
  |section_number:{1}
  |sectioning_root:
diff --git a/tta/perl/t/results/invalid_nestings/verbatim_in_ref.pl 
b/tta/perl/t/results/invalid_nestings/verbatim_in_ref.pl
index 8a9b890650..d3759d9f60 100644
--- a/tta/perl/t/results/invalid_nestings/verbatim_in_ref.pl
+++ b/tta/perl/t/results/invalid_nestings/verbatim_in_ref.pl
@@ -12,6 +12,7 @@ $result_tree_text{'verbatim_in_ref'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/itemize/inter_item_commands_in_enumerate.pl 
b/tta/perl/t/results/itemize/inter_item_commands_in_enumerate.pl
index daf1eb23df..64f9a8bdda 100644
--- a/tta/perl/t/results/itemize/inter_item_commands_in_enumerate.pl
+++ b/tta/perl/t/results/itemize/inter_item_commands_in_enumerate.pl
@@ -16,6 +16,7 @@ $result_tree_text{'inter_item_commands_in_enumerate'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'inter_item_commands_in_enumerate'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'inter_item_commands_in_enumerate'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'inter_item_commands_in_enumerate'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/itemize/inter_item_commands_in_itemize.pl 
b/tta/perl/t/results/itemize/inter_item_commands_in_itemize.pl
index f4d310c03f..bf6802125d 100644
--- a/tta/perl/t/results/itemize/inter_item_commands_in_itemize.pl
+++ b/tta/perl/t/results/itemize/inter_item_commands_in_itemize.pl
@@ -16,6 +16,7 @@ $result_tree_text{'inter_item_commands_in_itemize'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'inter_item_commands_in_itemize'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'inter_item_commands_in_itemize'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'inter_item_commands_in_itemize'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/languages/appendix_translated.pl 
b/tta/perl/t/results/languages/appendix_translated.pl
index d5740778d7..80e3f2798e 100644
--- a/tta/perl/t/results/languages/appendix_translated.pl
+++ b/tta/perl/t/results/languages/appendix_translated.pl
@@ -28,6 +28,7 @@ $result_tree_text{'appendix_translated'} = '*document_root C4
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -44,6 +45,7 @@ $result_tree_text{'appendix_translated'} = '*document_root C4
  |associated_node:[E0]
  |section_childs:EC[E2]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -63,8 +65,9 @@ $result_tree_text{'appendix_translated'} = '*document_root C4
   |{ }
  |EXTRA
  |section_directions:D[up->E1]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/languages/command_translated.pl 
b/tta/perl/t/results/languages/command_translated.pl
index 7a9926c703..206b18ce47 100644
--- a/tta/perl/t/results/languages/command_translated.pl
+++ b/tta/perl/t/results/languages/command_translated.pl
@@ -29,6 +29,7 @@ $result_tree_text{'command_translated'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -45,6 +46,7 @@ $result_tree_text{'command_translated'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -74,6 +76,7 @@ $result_tree_text{'command_translated'} = '*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter-error_002d_002d_003e}
   *arguments_line C1
    *line_arg C2
@@ -91,8 +94,9 @@ $result_tree_text{'command_translated'} = '*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/languages/documentlanguage.pl 
b/tta/perl/t/results/languages/documentlanguage.pl
index 20cda7754b..eb47ef9dff 100644
--- a/tta/perl/t/results/languages/documentlanguage.pl
+++ b/tta/perl/t/results/languages/documentlanguage.pl
@@ -69,6 +69,7 @@ $result_tree_text{'documentlanguage'} = '*document_root C6
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -85,6 +86,7 @@ $result_tree_text{'documentlanguage'} = '*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -108,6 +110,7 @@ $result_tree_text{'documentlanguage'} = '*document_root C6
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -123,8 +126,9 @@ $result_tree_text{'documentlanguage'} = '*document_root C6
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/languages/documentlanguage_generated_master_menu.pl 
b/tta/perl/t/results/languages/documentlanguage_generated_master_menu.pl
index c11066a642..673a5dd175 100644
--- a/tta/perl/t/results/languages/documentlanguage_generated_master_menu.pl
+++ b/tta/perl/t/results/languages/documentlanguage_generated_master_menu.pl
@@ -42,6 +42,7 @@ $result_tree_text{'documentlanguage_generated_master_menu'} = 
'*document_root C1
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -58,6 +59,7 @@ $result_tree_text{'documentlanguage_generated_master_menu'} = 
'*document_root C1
  |associated_node:[E0]
  |section_directions:D[next->E2]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -82,6 +84,7 @@ $result_tree_text{'documentlanguage_generated_master_menu'} = 
'*document_root C1
  |section_childs:EC[E4]
  |section_directions:D[next->E5|prev->E1]
  |section_level:{0}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -98,6 +101,7 @@ $result_tree_text{'documentlanguage_generated_master_menu'} 
= '*document_root C1
  |associated_title_command:[E4]
  |is_target:{1}
  |node_directions:D[next->E6|prev->E0|up->E0]
+ |node_number:{2}
  |node_preceding_part:[E2]
  |normalized:{chapter}
   *arguments_line C1
@@ -115,8 +119,9 @@ $result_tree_text{'documentlanguage_generated_master_menu'} 
= '*document_root C1
  |associated_node:[E3]
  |associated_part:[E2]
  |section_directions:D[up->E2]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{3}
  |toplevel_directions:D[next->E7|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -149,6 +154,7 @@ $result_tree_text{'documentlanguage_generated_master_menu'} 
= '*document_root C1
  |section_childs:EC[E7]
  |section_directions:D[next->E9|prev->E2]
  |section_level:{0}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -165,6 +171,7 @@ $result_tree_text{'documentlanguage_generated_master_menu'} 
= '*document_root C1
  |associated_title_command:[E7]
  |is_target:{1}
  |node_directions:D[next->E8|prev->E3|up->E0]
+ |node_number:{3}
  |node_preceding_part:[E5]
  |normalized:{other-chap}
   *arguments_line C1
@@ -182,8 +189,9 @@ $result_tree_text{'documentlanguage_generated_master_menu'} 
= '*document_root C1
  |associated_node:[E6]
  |associated_part:[E5]
  |section_directions:D[up->E5]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{5}
  |toplevel_directions:D[next->E9|prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -214,6 +222,7 @@ $result_tree_text{'documentlanguage_generated_master_menu'} 
= '*document_root C1
  |associated_title_command:[E9]
  |is_target:{1}
  |node_directions:D[prev->E6|up->E0]
+ |node_number:{4}
  |normalized:{appendix}
   *arguments_line C1
    *line_arg C1
@@ -229,8 +238,9 @@ $result_tree_text{'documentlanguage_generated_master_menu'} 
= '*document_root C1
  |associated_anchor_command:[E8]
  |associated_node:[E8]
  |section_directions:D[prev->E5]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{6}
  |toplevel_directions:D[prev->E7|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/languages/documentlanguage_option.pl 
b/tta/perl/t/results/languages/documentlanguage_option.pl
index 0daf31db63..285410eee5 100644
--- a/tta/perl/t/results/languages/documentlanguage_option.pl
+++ b/tta/perl/t/results/languages/documentlanguage_option.pl
@@ -69,6 +69,7 @@ $result_tree_text{'documentlanguage_option'} = 
'*document_root C6
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -85,6 +86,7 @@ $result_tree_text{'documentlanguage_option'} = 
'*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -108,6 +110,7 @@ $result_tree_text{'documentlanguage_option'} = 
'*document_root C6
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -123,8 +126,9 @@ $result_tree_text{'documentlanguage_option'} = 
'*document_root C6
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/languages/documentlanguage_unknown.pl 
b/tta/perl/t/results/languages/documentlanguage_unknown.pl
index 9fba242fcc..02c8870b45 100644
--- a/tta/perl/t/results/languages/documentlanguage_unknown.pl
+++ b/tta/perl/t/results/languages/documentlanguage_unknown.pl
@@ -69,6 +69,7 @@ $result_tree_text{'documentlanguage_unknown'} = 
'*document_root C6
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -85,6 +86,7 @@ $result_tree_text{'documentlanguage_unknown'} = 
'*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -108,6 +110,7 @@ $result_tree_text{'documentlanguage_unknown'} = 
'*document_root C6
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -123,8 +126,9 @@ $result_tree_text{'documentlanguage_unknown'} = 
'*document_root C6
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/languages/invalid_documentlanguage.pl 
b/tta/perl/t/results/languages/invalid_documentlanguage.pl
index 1c82bfd63d..7f888997f6 100644
--- a/tta/perl/t/results/languages/invalid_documentlanguage.pl
+++ b/tta/perl/t/results/languages/invalid_documentlanguage.pl
@@ -230,6 +230,7 @@ $result_tree_text{'invalid_documentlanguage'} = 
'*document_root C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -245,6 +246,7 @@ $result_tree_text{'invalid_documentlanguage'} = 
'*document_root C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/languages/multiple_documentlanguage.pl 
b/tta/perl/t/results/languages/multiple_documentlanguage.pl
index 94dc17d17e..890b718e7e 100644
--- a/tta/perl/t/results/languages/multiple_documentlanguage.pl
+++ b/tta/perl/t/results/languages/multiple_documentlanguage.pl
@@ -116,6 +116,7 @@ $result_tree_text{'multiple_documentlanguage'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -132,6 +133,7 @@ $result_tree_text{'multiple_documentlanguage'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -155,6 +157,7 @@ $result_tree_text{'multiple_documentlanguage'} = 
'*document_root C5
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -170,8 +173,9 @@ $result_tree_text{'multiple_documentlanguage'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/languages/multiple_in_preamble.pl 
b/tta/perl/t/results/languages/multiple_in_preamble.pl
index efee7b0a00..bf87ed065b 100644
--- a/tta/perl/t/results/languages/multiple_in_preamble.pl
+++ b/tta/perl/t/results/languages/multiple_in_preamble.pl
@@ -129,6 +129,7 @@ $result_tree_text{'multiple_in_preamble'} = '*document_root 
C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -145,6 +146,7 @@ $result_tree_text{'multiple_in_preamble'} = '*document_root 
C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -167,6 +169,7 @@ $result_tree_text{'multiple_in_preamble'} = '*document_root 
C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -182,8 +185,9 @@ $result_tree_text{'multiple_in_preamble'} = '*document_root 
C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/languages/multiple_in_preamble_before_node.pl 
b/tta/perl/t/results/languages/multiple_in_preamble_before_node.pl
index 45023fe464..016fc2995b 100644
--- a/tta/perl/t/results/languages/multiple_in_preamble_before_node.pl
+++ b/tta/perl/t/results/languages/multiple_in_preamble_before_node.pl
@@ -145,6 +145,7 @@ $result_tree_text{'multiple_in_preamble_before_node'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -161,6 +162,7 @@ $result_tree_text{'multiple_in_preamble_before_node'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -183,6 +185,7 @@ $result_tree_text{'multiple_in_preamble_before_node'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -198,8 +201,9 @@ $result_tree_text{'multiple_in_preamble_before_node'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/languages/multiple_lang_chapters.pl 
b/tta/perl/t/results/languages/multiple_lang_chapters.pl
index 2c23043240..d84dd87131 100644
--- a/tta/perl/t/results/languages/multiple_lang_chapters.pl
+++ b/tta/perl/t/results/languages/multiple_lang_chapters.pl
@@ -88,6 +88,7 @@ $result_tree_text{'multiple_lang_chapters'} = '*document_root 
C13
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -104,6 +105,7 @@ $result_tree_text{'multiple_lang_chapters'} = 
'*document_root C13
  |associated_node:[E0]
  |section_childs:EC[E4|E6|E8|E10|E12]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -212,6 +214,7 @@ $result_tree_text{'multiple_lang_chapters'} = 
'*document_root C13
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter-ja}
   *arguments_line C1
    *line_arg C1
@@ -227,8 +230,9 @@ $result_tree_text{'multiple_lang_chapters'} = 
'*document_root C13
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -333,6 +337,7 @@ $result_tree_text{'multiple_lang_chapters'} = 
'*document_root C13
  |is_target:{1}
  |menu_directions:D[next->E7|prev->E3|up->E0]
  |node_directions:D[next->E7|prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{chapter-en}
   *arguments_line C1
    *line_arg C1
@@ -348,8 +353,9 @@ $result_tree_text{'multiple_lang_chapters'} = 
'*document_root C13
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[next->E8|prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E8|prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -454,6 +460,7 @@ $result_tree_text{'multiple_lang_chapters'} = 
'*document_root C13
  |is_target:{1}
  |menu_directions:D[next->E9|prev->E5|up->E0]
  |node_directions:D[next->E9|prev->E5|up->E0]
+ |node_number:{4}
  |normalized:{chapter-fr_005fFR}
   *arguments_line C1
    *line_arg C1
@@ -469,8 +476,9 @@ $result_tree_text{'multiple_lang_chapters'} = 
'*document_root C13
  |associated_anchor_command:[E7]
  |associated_node:[E7]
  |section_directions:D[next->E10|prev->E6|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{4}
  |toplevel_directions:D[next->E10|prev->E6|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -566,6 +574,7 @@ $result_tree_text{'multiple_lang_chapters'} = 
'*document_root C13
  |is_target:{1}
  |menu_directions:D[next->E11|prev->E7|up->E0]
  |node_directions:D[next->E11|prev->E7|up->E0]
+ |node_number:{5}
  |normalized:{chapter-de}
   *arguments_line C1
    *line_arg C1
@@ -581,8 +590,9 @@ $result_tree_text{'multiple_lang_chapters'} = 
'*document_root C13
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[next->E12|prev->E8|up->E1]
+ |section_heading_number:{4}
  |section_level:{1}
- |section_number:{4}
+ |section_number:{5}
  |toplevel_directions:D[next->E12|prev->E8|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -613,6 +623,7 @@ $result_tree_text{'multiple_lang_chapters'} = 
'*document_root C13
  |is_target:{1}
  |menu_directions:D[prev->E9|up->E0]
  |node_directions:D[prev->E9|up->E0]
+ |node_number:{6}
  |normalized:{chapter-pt_005fBR}
   *arguments_line C1
    *line_arg C1
@@ -628,8 +639,9 @@ $result_tree_text{'multiple_lang_chapters'} = 
'*document_root C13
  |associated_anchor_command:[E11]
  |associated_node:[E11]
  |section_directions:D[prev->E10|up->E1]
+ |section_heading_number:{5}
  |section_level:{1}
- |section_number:{5}
+ |section_number:{6}
  |toplevel_directions:D[prev->E10|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/languages/multiple_lang_chapters_latex.pl 
b/tta/perl/t/results/languages/multiple_lang_chapters_latex.pl
index 5985e3a633..94d4b0f7bd 100644
--- a/tta/perl/t/results/languages/multiple_lang_chapters_latex.pl
+++ b/tta/perl/t/results/languages/multiple_lang_chapters_latex.pl
@@ -88,6 +88,7 @@ $result_tree_text{'multiple_lang_chapters_latex'} = 
'*document_root C13
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -104,6 +105,7 @@ $result_tree_text{'multiple_lang_chapters_latex'} = 
'*document_root C13
  |associated_node:[E0]
  |section_childs:EC[E4|E6|E8|E10|E12]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -212,6 +214,7 @@ $result_tree_text{'multiple_lang_chapters_latex'} = 
'*document_root C13
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter-ja}
   *arguments_line C1
    *line_arg C1
@@ -227,8 +230,9 @@ $result_tree_text{'multiple_lang_chapters_latex'} = 
'*document_root C13
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -333,6 +337,7 @@ $result_tree_text{'multiple_lang_chapters_latex'} = 
'*document_root C13
  |is_target:{1}
  |menu_directions:D[next->E7|prev->E3|up->E0]
  |node_directions:D[next->E7|prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{chapter-en}
   *arguments_line C1
    *line_arg C1
@@ -348,8 +353,9 @@ $result_tree_text{'multiple_lang_chapters_latex'} = 
'*document_root C13
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[next->E8|prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E8|prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -454,6 +460,7 @@ $result_tree_text{'multiple_lang_chapters_latex'} = 
'*document_root C13
  |is_target:{1}
  |menu_directions:D[next->E9|prev->E5|up->E0]
  |node_directions:D[next->E9|prev->E5|up->E0]
+ |node_number:{4}
  |normalized:{chapter-fr_005fFR}
   *arguments_line C1
    *line_arg C1
@@ -469,8 +476,9 @@ $result_tree_text{'multiple_lang_chapters_latex'} = 
'*document_root C13
  |associated_anchor_command:[E7]
  |associated_node:[E7]
  |section_directions:D[next->E10|prev->E6|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{4}
  |toplevel_directions:D[next->E10|prev->E6|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -566,6 +574,7 @@ $result_tree_text{'multiple_lang_chapters_latex'} = 
'*document_root C13
  |is_target:{1}
  |menu_directions:D[next->E11|prev->E7|up->E0]
  |node_directions:D[next->E11|prev->E7|up->E0]
+ |node_number:{5}
  |normalized:{chapter-de}
   *arguments_line C1
    *line_arg C1
@@ -581,8 +590,9 @@ $result_tree_text{'multiple_lang_chapters_latex'} = 
'*document_root C13
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[next->E12|prev->E8|up->E1]
+ |section_heading_number:{4}
  |section_level:{1}
- |section_number:{4}
+ |section_number:{5}
  |toplevel_directions:D[next->E12|prev->E8|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -613,6 +623,7 @@ $result_tree_text{'multiple_lang_chapters_latex'} = 
'*document_root C13
  |is_target:{1}
  |menu_directions:D[prev->E9|up->E0]
  |node_directions:D[prev->E9|up->E0]
+ |node_number:{6}
  |normalized:{chapter-pt_005fBR}
   *arguments_line C1
    *line_arg C1
@@ -628,8 +639,9 @@ $result_tree_text{'multiple_lang_chapters_latex'} = 
'*document_root C13
  |associated_anchor_command:[E11]
  |associated_node:[E11]
  |section_directions:D[prev->E10|up->E1]
+ |section_heading_number:{5}
  |section_level:{1}
- |section_number:{5}
+ |section_number:{6}
  |toplevel_directions:D[prev->E10|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/languages/multiple_lang_chapters_texi2html.pl 
b/tta/perl/t/results/languages/multiple_lang_chapters_texi2html.pl
index 54feb9630f..acc83eb436 100644
--- a/tta/perl/t/results/languages/multiple_lang_chapters_texi2html.pl
+++ b/tta/perl/t/results/languages/multiple_lang_chapters_texi2html.pl
@@ -75,6 +75,7 @@ $result_tree_text{'multiple_lang_chapters_texi2html'} = 
'*document_root C13
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -91,6 +92,7 @@ $result_tree_text{'multiple_lang_chapters_texi2html'} = 
'*document_root C13
  |associated_node:[E0]
  |section_childs:EC[E4|E6|E8|E10|E12]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -199,6 +201,7 @@ $result_tree_text{'multiple_lang_chapters_texi2html'} = 
'*document_root C13
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter-ja}
   *arguments_line C1
    *line_arg C1
@@ -214,8 +217,9 @@ $result_tree_text{'multiple_lang_chapters_texi2html'} = 
'*document_root C13
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -320,6 +324,7 @@ $result_tree_text{'multiple_lang_chapters_texi2html'} = 
'*document_root C13
  |is_target:{1}
  |menu_directions:D[next->E7|prev->E3|up->E0]
  |node_directions:D[next->E7|prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{chapter-en}
   *arguments_line C1
    *line_arg C1
@@ -335,8 +340,9 @@ $result_tree_text{'multiple_lang_chapters_texi2html'} = 
'*document_root C13
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[next->E8|prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E8|prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -441,6 +447,7 @@ $result_tree_text{'multiple_lang_chapters_texi2html'} = 
'*document_root C13
  |is_target:{1}
  |menu_directions:D[next->E9|prev->E5|up->E0]
  |node_directions:D[next->E9|prev->E5|up->E0]
+ |node_number:{4}
  |normalized:{chapter-fr_005fFR}
   *arguments_line C1
    *line_arg C1
@@ -456,8 +463,9 @@ $result_tree_text{'multiple_lang_chapters_texi2html'} = 
'*document_root C13
  |associated_anchor_command:[E7]
  |associated_node:[E7]
  |section_directions:D[next->E10|prev->E6|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{4}
  |toplevel_directions:D[next->E10|prev->E6|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -553,6 +561,7 @@ $result_tree_text{'multiple_lang_chapters_texi2html'} = 
'*document_root C13
  |is_target:{1}
  |menu_directions:D[next->E11|prev->E7|up->E0]
  |node_directions:D[next->E11|prev->E7|up->E0]
+ |node_number:{5}
  |normalized:{chapter-de}
   *arguments_line C1
    *line_arg C1
@@ -568,8 +577,9 @@ $result_tree_text{'multiple_lang_chapters_texi2html'} = 
'*document_root C13
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[next->E12|prev->E8|up->E1]
+ |section_heading_number:{4}
  |section_level:{1}
- |section_number:{4}
+ |section_number:{5}
  |toplevel_directions:D[next->E12|prev->E8|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -600,6 +610,7 @@ $result_tree_text{'multiple_lang_chapters_texi2html'} = 
'*document_root C13
  |is_target:{1}
  |menu_directions:D[prev->E9|up->E0]
  |node_directions:D[prev->E9|up->E0]
+ |node_number:{6}
  |normalized:{chapter-pt_005fBR}
   *arguments_line C1
    *line_arg C1
@@ -615,8 +626,9 @@ $result_tree_text{'multiple_lang_chapters_texi2html'} = 
'*document_root C13
  |associated_anchor_command:[E11]
  |associated_node:[E11]
  |section_directions:D[prev->E10|up->E1]
+ |section_heading_number:{5}
  |section_level:{1}
- |section_number:{5}
+ |section_number:{6}
  |toplevel_directions:D[prev->E10|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/languages/simple_documentlanguage.pl 
b/tta/perl/t/results/languages/simple_documentlanguage.pl
index 9431bb2e2f..31aff91311 100644
--- a/tta/perl/t/results/languages/simple_documentlanguage.pl
+++ b/tta/perl/t/results/languages/simple_documentlanguage.pl
@@ -27,6 +27,7 @@ $result_tree_text{'simple_documentlanguage'} = 
'*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -41,6 +42,7 @@ $result_tree_text{'simple_documentlanguage'} = 
'*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/languages/unknown_language.pl 
b/tta/perl/t/results/languages/unknown_language.pl
index dd36d91ba3..94c090be0c 100644
--- a/tta/perl/t/results/languages/unknown_language.pl
+++ b/tta/perl/t/results/languages/unknown_language.pl
@@ -29,6 +29,7 @@ $result_tree_text{'unknown_language'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -45,6 +46,7 @@ $result_tree_text{'unknown_language'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -67,6 +69,7 @@ $result_tree_text{'unknown_language'} = '*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -82,8 +85,9 @@ $result_tree_text{'unknown_language'} = '*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/languages/unknown_region.pl 
b/tta/perl/t/results/languages/unknown_region.pl
index 29c8b5ba18..cdf26293c3 100644
--- a/tta/perl/t/results/languages/unknown_region.pl
+++ b/tta/perl/t/results/languages/unknown_region.pl
@@ -27,6 +27,7 @@ $result_tree_text{'unknown_region'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -41,6 +42,7 @@ $result_tree_text{'unknown_region'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/latex_tests/anchor_before_top.pl 
b/tta/perl/t/results/latex_tests/anchor_before_top.pl
index 229d765de9..92bb435cbb 100644
--- a/tta/perl/t/results/latex_tests/anchor_before_top.pl
+++ b/tta/perl/t/results/latex_tests/anchor_before_top.pl
@@ -26,6 +26,7 @@ $result_tree_text{'anchor_before_top'} = '*document_root C5
  |associated_title_command:[E2]
  |is_target:{1}
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -42,6 +43,7 @@ $result_tree_text{'anchor_before_top'} = '*document_root C5
  |associated_node:[E1]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -64,6 +66,7 @@ $result_tree_text{'anchor_before_top'} = '*document_root C5
  |associated_title_command:[E4]
  |is_target:{1}
  |node_directions:D[prev->E1|up->E1]
+ |node_number:{2}
  |normalized:{Chapter}
   *arguments_line C1
    *line_arg C1
@@ -79,8 +82,9 @@ $result_tree_text{'anchor_before_top'} = '*document_root C5
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E2]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E2|up->E2]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/latex_tests/anchor_in_copying.pl 
b/tta/perl/t/results/latex_tests/anchor_in_copying.pl
index 1faa412b50..68d610b857 100644
--- a/tta/perl/t/results/latex_tests/anchor_in_copying.pl
+++ b/tta/perl/t/results/latex_tests/anchor_in_copying.pl
@@ -45,6 +45,7 @@ $result_tree_text{'anchor_in_copying'} = '*document_root C5
  |associated_title_command:[E2]
  |is_target:{1}
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -61,6 +62,7 @@ $result_tree_text{'anchor_in_copying'} = '*document_root C5
  |associated_node:[E1]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -83,6 +85,7 @@ $result_tree_text{'anchor_in_copying'} = '*document_root C5
  |associated_title_command:[E4]
  |is_target:{1}
  |node_directions:D[prev->E1|up->E1]
+ |node_number:{2}
  |normalized:{Chapter}
   *arguments_line C1
    *line_arg C1
@@ -98,8 +101,9 @@ $result_tree_text{'anchor_in_copying'} = '*document_root C5
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E2]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E2|up->E2]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/latex_tests/anchor_in_copying_insertcopying_chap.pl 
b/tta/perl/t/results/latex_tests/anchor_in_copying_insertcopying_chap.pl
index a50b4369d0..ea2d4f975a 100644
--- a/tta/perl/t/results/latex_tests/anchor_in_copying_insertcopying_chap.pl
+++ b/tta/perl/t/results/latex_tests/anchor_in_copying_insertcopying_chap.pl
@@ -45,6 +45,7 @@ $result_tree_text{'anchor_in_copying_insertcopying_chap'} = 
'*document_root C5
  |associated_title_command:[E2]
  |is_target:{1}
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -61,6 +62,7 @@ $result_tree_text{'anchor_in_copying_insertcopying_chap'} = 
'*document_root C5
  |associated_node:[E1]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -83,6 +85,7 @@ $result_tree_text{'anchor_in_copying_insertcopying_chap'} = 
'*document_root C5
  |associated_title_command:[E4]
  |is_target:{1}
  |node_directions:D[prev->E1|up->E1]
+ |node_number:{2}
  |normalized:{Chapter}
   *arguments_line C1
    *line_arg C1
@@ -98,8 +101,9 @@ $result_tree_text{'anchor_in_copying_insertcopying_chap'} = 
'*document_root C5
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E2]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E2|up->E2]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl 
b/tta/perl/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl
index 84132500d2..1eac55f4a7 100644
--- 
a/tta/perl/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl
+++ 
b/tta/perl/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl
@@ -88,6 +88,7 @@ 
$result_tree_text{'anchor_in_copying_insertcopying_titlepage'} = '*document_root
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -104,6 +105,7 @@ 
$result_tree_text{'anchor_in_copying_insertcopying_titlepage'} = '*document_root
  |associated_node:[E2]
  |section_childs:EC[E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -126,6 +128,7 @@ 
$result_tree_text{'anchor_in_copying_insertcopying_titlepage'} = '*document_root
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[prev->E2|up->E2]
+ |node_number:{2}
  |normalized:{Chapter}
   *arguments_line C1
    *line_arg C1
@@ -141,8 +144,9 @@ 
$result_tree_text{'anchor_in_copying_insertcopying_titlepage'} = '*document_root
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[up->E3]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E3|up->E3]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl
 
b/tta/perl/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl
index 8ae14b0705..191565b198 100644
--- 
a/tta/perl/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl
+++ 
b/tta/perl/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl
@@ -79,6 +79,7 @@ 
$result_tree_text{'anchor_in_copying_insertcopying_titlepage_chap'} = '*document
  |associated_title_command:[E2]
  |is_target:{1}
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -95,6 +96,7 @@ 
$result_tree_text{'anchor_in_copying_insertcopying_titlepage_chap'} = '*document
  |associated_node:[E1]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -117,6 +119,7 @@ 
$result_tree_text{'anchor_in_copying_insertcopying_titlepage_chap'} = '*document
  |associated_title_command:[E4]
  |is_target:{1}
  |node_directions:D[prev->E1|up->E1]
+ |node_number:{2}
  |normalized:{Chapter}
   *arguments_line C1
    *line_arg C1
@@ -132,8 +135,9 @@ 
$result_tree_text{'anchor_in_copying_insertcopying_titlepage_chap'} = '*document
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E2]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E2|up->E2]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl 
b/tta/perl/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
index e5806218fd..78415eec8c 100644
--- 
a/tta/perl/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
+++ 
b/tta/perl/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
@@ -13,6 +13,7 @@ 
$result_tree_text{'anchor_links_xref_xrefautomaticsectiontitle'} = '*document_ro
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{node-before}
   *arguments_line C1
    *line_arg C1
@@ -40,6 +41,7 @@ 
$result_tree_text{'anchor_links_xref_xrefautomaticsectiontitle'} = '*document_ro
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E7]
+ |node_number:{2}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -56,6 +58,7 @@ 
$result_tree_text{'anchor_links_xref_xrefautomaticsectiontitle'} = '*document_ro
  |associated_node:[E2]
  |section_childs:EC[E8]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -85,6 +88,7 @@ 
$result_tree_text{'anchor_links_xref_xrefautomaticsectiontitle'} = '*document_ro
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{3}
  |normalized:{after}
   *arguments_line C1
    *line_arg C1
@@ -112,6 +116,7 @@ 
$result_tree_text{'anchor_links_xref_xrefautomaticsectiontitle'} = '*document_ro
  |associated_title_command:[E8]
  |is_target:{1}
  |node_directions:D[prev->E2|up->E2]
+ |node_number:{4}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -127,8 +132,9 @@ 
$result_tree_text{'anchor_links_xref_xrefautomaticsectiontitle'} = '*document_ro
  |associated_anchor_command:[E7]
  |associated_node:[E7]
  |section_directions:D[up->E3]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E3|up->E3]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/latex_tests/custom_heading_with_include.pl 
b/tta/perl/t/results/latex_tests/custom_heading_with_include.pl
index b3288c50ce..5ceb3d53e4 100644
--- a/tta/perl/t/results/latex_tests/custom_heading_with_include.pl
+++ b/tta/perl/t/results/latex_tests/custom_heading_with_include.pl
@@ -45,6 +45,7 @@ $result_tree_text{'custom_heading_with_include'} = 
'*document_root C25
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -61,6 +62,7 @@ $result_tree_text{'custom_heading_with_include'} = 
'*document_root C25
  |associated_node:[E0]
  |section_childs:EC[E3|E5|E12|E15|E18|E21|E25]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -88,6 +90,7 @@ $result_tree_text{'custom_heading_with_include'} = 
'*document_root C25
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{in-main}
   *arguments_line C1
    *line_arg C1
@@ -103,8 +106,9 @@ $result_tree_text{'custom_heading_with_include'} = 
'*document_root C25
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -176,6 +180,7 @@ $result_tree_text{'custom_heading_with_include'} = 
'*document_root C25
  |is_target:{1}
  |menus:EC[E6]
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{Chapter-in-included-file}
   *arguments_line C1
    *line_arg C1
@@ -192,8 +197,9 @@ $result_tree_text{'custom_heading_with_include'} = 
'*document_root C25
  |associated_node:[E4]
  |section_childs:EC[E8]
  |section_directions:D[next->E12|prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E12|prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -242,6 +248,7 @@ $result_tree_text{'custom_heading_with_include'} = 
'*document_root C25
  |menu_directions:D[up->E4]
  |menus:EC[E9]
  |node_directions:D[up->E4]
+ |node_number:{4}
  |normalized:{Section}
   *arguments_line C1
    *line_arg C1
@@ -258,8 +265,9 @@ $result_tree_text{'custom_heading_with_include'} = 
'*document_root C25
  |associated_node:[E7]
  |section_childs:EC[E11]
  |section_directions:D[up->E5]
+ |section_heading_number:{2.1}
  |section_level:{2}
- |section_number:{2.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -306,6 +314,7 @@ $result_tree_text{'custom_heading_with_include'} = 
'*document_root C25
  |is_target:{1}
  |menu_directions:D[up->E7]
  |node_directions:D[up->E7]
+ |node_number:{5}
  |normalized:{Subsection}
   *arguments_line C1
    *line_arg C1
@@ -321,8 +330,9 @@ $result_tree_text{'custom_heading_with_include'} = 
'*document_root C25
  |associated_anchor_command:[E10]
  |associated_node:[E10]
  |section_directions:D[up->E8]
+ |section_heading_number:{2.1.1}
  |section_level:{3}
- |section_number:{2.1.1}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -408,8 +418,9 @@ $result_tree_text{'custom_heading_with_include'} = 
'*document_root C25
  |EXTRA
  |section_childs:EC[E13]
  |section_directions:D[next->E15|prev->E5|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{6}
  |toplevel_directions:D[next->E15|prev->E5|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -425,8 +436,9 @@ $result_tree_text{'custom_heading_with_include'} = 
'*document_root C25
  |EXTRA
  |section_childs:EC[E14]
  |section_directions:D[up->E12]
+ |section_heading_number:{3.1}
  |section_level:{2}
- |section_number:{3.1}
+ |section_number:{7}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -440,8 +452,9 @@ $result_tree_text{'custom_heading_with_include'} = 
'*document_root C25
   |{ }
  |EXTRA
  |section_directions:D[up->E13]
+ |section_heading_number:{3.1.1}
  |section_level:{3}
- |section_number:{3.1.1}
+ |section_number:{8}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -498,8 +511,9 @@ $result_tree_text{'custom_heading_with_include'} = 
'*document_root C25
  |EXTRA
  |section_childs:EC[E16]
  |section_directions:D[next->E18|prev->E12|up->E1]
+ |section_heading_number:{4}
  |section_level:{1}
- |section_number:{4}
+ |section_number:{9}
  |toplevel_directions:D[next->E18|prev->E12|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -515,8 +529,9 @@ $result_tree_text{'custom_heading_with_include'} = 
'*document_root C25
  |EXTRA
  |section_childs:EC[E17]
  |section_directions:D[up->E15]
+ |section_heading_number:{4.1}
  |section_level:{2}
- |section_number:{4.1}
+ |section_number:{10}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -530,8 +545,9 @@ $result_tree_text{'custom_heading_with_include'} = 
'*document_root C25
   |{ }
  |EXTRA
  |section_directions:D[up->E16]
+ |section_heading_number:{4.1.1}
  |section_level:{3}
- |section_number:{4.1.1}
+ |section_number:{11}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -588,8 +604,9 @@ $result_tree_text{'custom_heading_with_include'} = 
'*document_root C25
  |EXTRA
  |section_childs:EC[E19]
  |section_directions:D[next->E21|prev->E15|up->E1]
+ |section_heading_number:{5}
  |section_level:{1}
- |section_number:{5}
+ |section_number:{12}
  |toplevel_directions:D[next->E21|prev->E15|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -605,8 +622,9 @@ $result_tree_text{'custom_heading_with_include'} = 
'*document_root C25
  |EXTRA
  |section_childs:EC[E20]
  |section_directions:D[up->E18]
+ |section_heading_number:{5.1}
  |section_level:{2}
- |section_number:{5.1}
+ |section_number:{13}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -620,8 +638,9 @@ $result_tree_text{'custom_heading_with_include'} = 
'*document_root C25
   |{ }
  |EXTRA
  |section_directions:D[up->E19]
+ |section_heading_number:{5.1.1}
  |section_level:{3}
- |section_number:{5.1.1}
+ |section_number:{14}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -681,8 +700,9 @@ $result_tree_text{'custom_heading_with_include'} = 
'*document_root C25
  |EXTRA
  |section_childs:EC[E22]
  |section_directions:D[next->E25|prev->E18|up->E1]
+ |section_heading_number:{6}
  |section_level:{1}
- |section_number:{6}
+ |section_number:{15}
  |toplevel_directions:D[next->E25|prev->E18|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -698,8 +718,9 @@ $result_tree_text{'custom_heading_with_include'} = 
'*document_root C25
  |EXTRA
  |section_childs:EC[E23]
  |section_directions:D[up->E21]
+ |section_heading_number:{6.1}
  |section_level:{2}
- |section_number:{6.1}
+ |section_number:{16}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -713,8 +734,9 @@ $result_tree_text{'custom_heading_with_include'} = 
'*document_root C25
   |{ }
  |EXTRA
  |section_directions:D[up->E22]
+ |section_heading_number:{6.1.1}
  |section_level:{3}
- |section_number:{6.1.1}
+ |section_number:{17}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -759,6 +781,7 @@ $result_tree_text{'custom_heading_with_include'} = 
'*document_root C25
  |associated_title_command:[E25]
  |is_target:{1}
  |node_directions:D[up->E0]
+ |node_number:{6}
  |normalized:{last-chap}
   *arguments_line C1
    *line_arg C1
@@ -774,8 +797,9 @@ $result_tree_text{'custom_heading_with_include'} = 
'*document_root C25
  |associated_anchor_command:[E24]
  |associated_node:[E24]
  |section_directions:D[prev->E21|up->E1]
+ |section_heading_number:{7}
  |section_level:{1}
- |section_number:{7}
+ |section_number:{18}
  |toplevel_directions:D[prev->E21|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/latex_tests/custom_heading_with_include_in_command.pl 
b/tta/perl/t/results/latex_tests/custom_heading_with_include_in_command.pl
index 2451ab4f15..8921fb6cd5 100644
--- a/tta/perl/t/results/latex_tests/custom_heading_with_include_in_command.pl
+++ b/tta/perl/t/results/latex_tests/custom_heading_with_include_in_command.pl
@@ -47,6 +47,7 @@ $result_tree_text{'custom_heading_with_include_in_command'} = 
'*document_root C2
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -63,6 +64,7 @@ $result_tree_text{'custom_heading_with_include_in_command'} = 
'*document_root C2
  |associated_node:[E0]
  |section_childs:EC[E3|E5|E12|E15|E18|E21|E25]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -90,6 +92,7 @@ $result_tree_text{'custom_heading_with_include_in_command'} = 
'*document_root C2
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{in-main}
   *arguments_line C1
    *line_arg C1
@@ -105,8 +108,9 @@ $result_tree_text{'custom_heading_with_include_in_command'} 
= '*document_root C2
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -178,6 +182,7 @@ $result_tree_text{'custom_heading_with_include_in_command'} 
= '*document_root C2
  |is_target:{1}
  |menus:EC[E6]
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{Chapter-in-included-file}
   *arguments_line C1
    *line_arg C1
@@ -194,8 +199,9 @@ $result_tree_text{'custom_heading_with_include_in_command'} 
= '*document_root C2
  |associated_node:[E4]
  |section_childs:EC[E8]
  |section_directions:D[next->E12|prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E12|prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -244,6 +250,7 @@ $result_tree_text{'custom_heading_with_include_in_command'} 
= '*document_root C2
  |menu_directions:D[up->E4]
  |menus:EC[E9]
  |node_directions:D[up->E4]
+ |node_number:{4}
  |normalized:{Section}
   *arguments_line C1
    *line_arg C1
@@ -260,8 +267,9 @@ $result_tree_text{'custom_heading_with_include_in_command'} 
= '*document_root C2
  |associated_node:[E7]
  |section_childs:EC[E11]
  |section_directions:D[up->E5]
+ |section_heading_number:{2.1}
  |section_level:{2}
- |section_number:{2.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -308,6 +316,7 @@ $result_tree_text{'custom_heading_with_include_in_command'} 
= '*document_root C2
  |is_target:{1}
  |menu_directions:D[up->E7]
  |node_directions:D[up->E7]
+ |node_number:{5}
  |normalized:{Subsection}
   *arguments_line C1
    *line_arg C1
@@ -323,8 +332,9 @@ $result_tree_text{'custom_heading_with_include_in_command'} 
= '*document_root C2
  |associated_anchor_command:[E10]
  |associated_node:[E10]
  |section_directions:D[up->E8]
+ |section_heading_number:{2.1.1}
  |section_level:{3}
- |section_number:{2.1.1}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -410,8 +420,9 @@ $result_tree_text{'custom_heading_with_include_in_command'} 
= '*document_root C2
  |EXTRA
  |section_childs:EC[E13]
  |section_directions:D[next->E15|prev->E5|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{6}
  |toplevel_directions:D[next->E15|prev->E5|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -427,8 +438,9 @@ $result_tree_text{'custom_heading_with_include_in_command'} 
= '*document_root C2
  |EXTRA
  |section_childs:EC[E14]
  |section_directions:D[up->E12]
+ |section_heading_number:{3.1}
  |section_level:{2}
- |section_number:{3.1}
+ |section_number:{7}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -442,8 +454,9 @@ $result_tree_text{'custom_heading_with_include_in_command'} 
= '*document_root C2
   |{ }
  |EXTRA
  |section_directions:D[up->E13]
+ |section_heading_number:{3.1.1}
  |section_level:{3}
- |section_number:{3.1.1}
+ |section_number:{8}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -500,8 +513,9 @@ $result_tree_text{'custom_heading_with_include_in_command'} 
= '*document_root C2
  |EXTRA
  |section_childs:EC[E16]
  |section_directions:D[next->E18|prev->E12|up->E1]
+ |section_heading_number:{4}
  |section_level:{1}
- |section_number:{4}
+ |section_number:{9}
  |toplevel_directions:D[next->E18|prev->E12|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -517,8 +531,9 @@ $result_tree_text{'custom_heading_with_include_in_command'} 
= '*document_root C2
  |EXTRA
  |section_childs:EC[E17]
  |section_directions:D[up->E15]
+ |section_heading_number:{4.1}
  |section_level:{2}
- |section_number:{4.1}
+ |section_number:{10}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -532,8 +547,9 @@ $result_tree_text{'custom_heading_with_include_in_command'} 
= '*document_root C2
   |{ }
  |EXTRA
  |section_directions:D[up->E16]
+ |section_heading_number:{4.1.1}
  |section_level:{3}
- |section_number:{4.1.1}
+ |section_number:{11}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -590,8 +606,9 @@ $result_tree_text{'custom_heading_with_include_in_command'} 
= '*document_root C2
  |EXTRA
  |section_childs:EC[E19]
  |section_directions:D[next->E21|prev->E15|up->E1]
+ |section_heading_number:{5}
  |section_level:{1}
- |section_number:{5}
+ |section_number:{12}
  |toplevel_directions:D[next->E21|prev->E15|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -607,8 +624,9 @@ $result_tree_text{'custom_heading_with_include_in_command'} 
= '*document_root C2
  |EXTRA
  |section_childs:EC[E20]
  |section_directions:D[up->E18]
+ |section_heading_number:{5.1}
  |section_level:{2}
- |section_number:{5.1}
+ |section_number:{13}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -622,8 +640,9 @@ $result_tree_text{'custom_heading_with_include_in_command'} 
= '*document_root C2
   |{ }
  |EXTRA
  |section_directions:D[up->E19]
+ |section_heading_number:{5.1.1}
  |section_level:{3}
- |section_number:{5.1.1}
+ |section_number:{14}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -683,8 +702,9 @@ $result_tree_text{'custom_heading_with_include_in_command'} 
= '*document_root C2
  |EXTRA
  |section_childs:EC[E22]
  |section_directions:D[next->E25|prev->E18|up->E1]
+ |section_heading_number:{6}
  |section_level:{1}
- |section_number:{6}
+ |section_number:{15}
  |toplevel_directions:D[next->E25|prev->E18|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -700,8 +720,9 @@ $result_tree_text{'custom_heading_with_include_in_command'} 
= '*document_root C2
  |EXTRA
  |section_childs:EC[E23]
  |section_directions:D[up->E21]
+ |section_heading_number:{6.1}
  |section_level:{2}
- |section_number:{6.1}
+ |section_number:{16}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -715,8 +736,9 @@ $result_tree_text{'custom_heading_with_include_in_command'} 
= '*document_root C2
   |{ }
  |EXTRA
  |section_directions:D[up->E22]
+ |section_heading_number:{6.1.1}
  |section_level:{3}
- |section_number:{6.1.1}
+ |section_number:{17}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -761,6 +783,7 @@ $result_tree_text{'custom_heading_with_include_in_command'} 
= '*document_root C2
  |associated_title_command:[E25]
  |is_target:{1}
  |node_directions:D[up->E0]
+ |node_number:{6}
  |normalized:{last-chap}
   *arguments_line C1
    *line_arg C1
@@ -776,8 +799,9 @@ $result_tree_text{'custom_heading_with_include_in_command'} 
= '*document_root C2
  |associated_anchor_command:[E24]
  |associated_node:[E24]
  |section_directions:D[prev->E21|up->E1]
+ |section_heading_number:{7}
  |section_level:{1}
- |section_number:{7}
+ |section_number:{18}
  |toplevel_directions:D[prev->E21|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/latex_tests/custom_headings.pl 
b/tta/perl/t/results/latex_tests/custom_headings.pl
index b1cbf8a219..5660fe1ade 100644
--- a/tta/perl/t/results/latex_tests/custom_headings.pl
+++ b/tta/perl/t/results/latex_tests/custom_headings.pl
@@ -63,6 +63,7 @@ $result_tree_text{'custom_headings'} = '*document_root C8
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -79,6 +80,7 @@ $result_tree_text{'custom_headings'} = '*document_root C8
  |associated_node:[E0]
  |section_childs:EC[E3|E5|E6]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -101,6 +103,7 @@ $result_tree_text{'custom_headings'} = '*document_root C8
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -117,8 +120,9 @@ $result_tree_text{'custom_headings'} = '*document_root C8
  |associated_node:[E2]
  |section_childs:EC[E4]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -145,8 +149,9 @@ $result_tree_text{'custom_headings'} = '*document_root C8
   |{ }
  |EXTRA
  |section_directions:D[up->E3]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -160,8 +165,9 @@ $result_tree_text{'custom_headings'} = '*document_root C8
   |{ }
  |EXTRA
  |section_directions:D[next->E6|prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{4}
  |toplevel_directions:D[next->E6|prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -200,8 +206,9 @@ $result_tree_text{'custom_headings'} = '*document_root C8
   |{ }
  |EXTRA
  |section_directions:D[prev->E5|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{5}
  |toplevel_directions:D[prev->E5|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/latex_tests/custom_headings_and_comments.pl 
b/tta/perl/t/results/latex_tests/custom_headings_and_comments.pl
index a59fe45364..1c1aea6c12 100644
--- a/tta/perl/t/results/latex_tests/custom_headings_and_comments.pl
+++ b/tta/perl/t/results/latex_tests/custom_headings_and_comments.pl
@@ -64,6 +64,7 @@ $result_tree_text{'custom_headings_and_comments'} = 
'*document_root C7
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -80,6 +81,7 @@ $result_tree_text{'custom_headings_and_comments'} = 
'*document_root C7
  |associated_node:[E0]
  |section_childs:EC[E3|E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -102,6 +104,7 @@ $result_tree_text{'custom_headings_and_comments'} = 
'*document_root C7
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -118,8 +121,9 @@ $result_tree_text{'custom_headings_and_comments'} = 
'*document_root C7
  |associated_node:[E2]
  |section_childs:EC[E4]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -146,8 +150,9 @@ $result_tree_text{'custom_headings_and_comments'} = 
'*document_root C7
   |{ }
  |EXTRA
  |section_directions:D[up->E3]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -161,8 +166,9 @@ $result_tree_text{'custom_headings_and_comments'} = 
'*document_root C7
   |{ }
  |EXTRA
  |section_directions:D[prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{4}
  |toplevel_directions:D[prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/latex_tests/customize_informative_commands.pl 
b/tta/perl/t/results/latex_tests/customize_informative_commands.pl
index 15ca4ddee9..4d4e958b73 100644
--- a/tta/perl/t/results/latex_tests/customize_informative_commands.pl
+++ b/tta/perl/t/results/latex_tests/customize_informative_commands.pl
@@ -12,6 +12,7 @@ $result_tree_text{'customize_informative_commands'} = 
'*document_root C2
  |spaces_before_argument:
   |{ }
  |EXTRA
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
diff --git a/tta/perl/t/results/latex_tests/error_in_sectioning_command.pl 
b/tta/perl/t/results/latex_tests/error_in_sectioning_command.pl
index 56a6b18a76..cc0619067c 100644
--- a/tta/perl/t/results/latex_tests/error_in_sectioning_command.pl
+++ b/tta/perl/t/results/latex_tests/error_in_sectioning_command.pl
@@ -21,6 +21,7 @@ $result_tree_text{'error_in_sectioning_command'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -37,6 +38,7 @@ $result_tree_text{'error_in_sectioning_command'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -59,6 +61,7 @@ $result_tree_text{'error_in_sectioning_command'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  
|normalized:{_0040error_007b_007d-_0028error_002d_002d_003e_0029_003a-Indicating-an-Error-Message}
   *arguments_line C1
    *line_arg C4
@@ -83,8 +86,9 @@ $result_tree_text{'error_in_sectioning_command'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C4
diff --git a/tta/perl/t/results/latex_tests/float_and_refs.pl 
b/tta/perl/t/results/latex_tests/float_and_refs.pl
index 3e43d98a1d..1c6db10714 100644
--- a/tta/perl/t/results/latex_tests/float_and_refs.pl
+++ b/tta/perl/t/results/latex_tests/float_and_refs.pl
@@ -16,6 +16,7 @@ $result_tree_text{'float_and_refs'} = '*document_root C7
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'float_and_refs'} = '*document_root C7
  |associated_node:[E0]
  |section_childs:EC[E3|E7|E8]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'float_and_refs'} = '*document_root C7
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'float_and_refs'} = '*document_root C7
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E7|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E7|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -219,8 +223,9 @@ $result_tree_text{'float_and_refs'} = '*document_root C7
   |{ }
  |EXTRA
  |section_directions:D[next->E8|prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E8|prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -490,8 +495,9 @@ $result_tree_text{'float_and_refs'} = '*document_root C7
   |{ }
  |EXTRA
  |section_directions:D[prev->E7|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{4}
  |toplevel_directions:D[prev->E7|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/latex_tests/fonttextsize.pl 
b/tta/perl/t/results/latex_tests/fonttextsize.pl
index 15fb36797f..4a734c132a 100644
--- a/tta/perl/t/results/latex_tests/fonttextsize.pl
+++ b/tta/perl/t/results/latex_tests/fonttextsize.pl
@@ -28,6 +28,7 @@ $result_tree_text{'fonttextsize'} = '*document_root C10
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -44,6 +45,7 @@ $result_tree_text{'fonttextsize'} = '*document_root C10
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -66,6 +68,7 @@ $result_tree_text{'fonttextsize'} = '*document_root C10
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -82,8 +85,9 @@ $result_tree_text{'fonttextsize'} = '*document_root C10
  |associated_node:[E2]
  |section_childs:EC[E4]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -99,8 +103,9 @@ $result_tree_text{'fonttextsize'} = '*document_root C10
  |EXTRA
  |section_childs:EC[E5|E6|E7|E8]
  |section_directions:D[up->E3]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -114,8 +119,9 @@ $result_tree_text{'fonttextsize'} = '*document_root C10
   |{ }
  |EXTRA
  |section_directions:D[next->E6|up->E4]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -142,8 +148,9 @@ $result_tree_text{'fonttextsize'} = '*document_root C10
   |{ }
  |EXTRA
  |section_directions:D[next->E7|prev->E5|up->E4]
+ |section_heading_number:{1.1.2}
  |section_level:{3}
- |section_number:{1.1.2}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -169,8 +176,9 @@ $result_tree_text{'fonttextsize'} = '*document_root C10
   |{ }
  |EXTRA
  |section_directions:D[next->E8|prev->E6|up->E4]
+ |section_heading_number:{1.1.3}
  |section_level:{3}
- |section_number:{1.1.3}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -196,8 +204,9 @@ $result_tree_text{'fonttextsize'} = '*document_root C10
   |{ }
  |EXTRA
  |section_directions:D[prev->E7|up->E4]
+ |section_heading_number:{1.1.4}
  |section_level:{3}
- |section_number:{1.1.4}
+ |section_number:{7}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/latex_tests/indices.pl 
b/tta/perl/t/results/latex_tests/indices.pl
index 21d9f9d9e3..7b310c5a8f 100644
--- a/tta/perl/t/results/latex_tests/indices.pl
+++ b/tta/perl/t/results/latex_tests/indices.pl
@@ -24,6 +24,7 @@ $result_tree_text{'indices'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -40,6 +41,7 @@ $result_tree_text{'indices'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -63,6 +65,7 @@ $result_tree_text{'indices'} = '*document_root C5
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -78,8 +81,9 @@ $result_tree_text{'indices'} = '*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/latex_tests/indices_disable_encoding.pl 
b/tta/perl/t/results/latex_tests/indices_disable_encoding.pl
index 2f49d9106f..6ca77ba8e3 100644
--- a/tta/perl/t/results/latex_tests/indices_disable_encoding.pl
+++ b/tta/perl/t/results/latex_tests/indices_disable_encoding.pl
@@ -24,6 +24,7 @@ $result_tree_text{'indices_disable_encoding'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -40,6 +41,7 @@ $result_tree_text{'indices_disable_encoding'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -63,6 +65,7 @@ $result_tree_text{'indices_disable_encoding'} = 
'*document_root C5
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -78,8 +81,9 @@ $result_tree_text{'indices_disable_encoding'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/latex_tests/informative_commands_in_top_node.pl 
b/tta/perl/t/results/latex_tests/informative_commands_in_top_node.pl
index 4c1d3b8c7e..ccf25bb029 100644
--- a/tta/perl/t/results/latex_tests/informative_commands_in_top_node.pl
+++ b/tta/perl/t/results/latex_tests/informative_commands_in_top_node.pl
@@ -16,6 +16,7 @@ $result_tree_text{'informative_commands_in_top_node'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'informative_commands_in_top_node'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -101,6 +103,7 @@ $result_tree_text{'informative_commands_in_top_node'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{next-node}
   *arguments_line C1
    *line_arg C1
@@ -116,8 +119,9 @@ $result_tree_text{'informative_commands_in_top_node'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/latex_tests/node_before_top.pl 
b/tta/perl/t/results/latex_tests/node_before_top.pl
index 2ca35cd44c..1e7a4d041b 100644
--- a/tta/perl/t/results/latex_tests/node_before_top.pl
+++ b/tta/perl/t/results/latex_tests/node_before_top.pl
@@ -13,6 +13,7 @@ $result_tree_text{'node_before_top'} = '*document_root C6
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{before-Top}
   *arguments_line C1
    *line_arg C1
@@ -30,6 +31,7 @@ $result_tree_text{'node_before_top'} = '*document_root C6
  |associated_title_command:[E2]
  |is_target:{1}
  |node_directions:D[next->E3]
+ |node_number:{2}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -46,6 +48,7 @@ $result_tree_text{'node_before_top'} = '*document_root C6
  |associated_node:[E1]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -68,6 +71,7 @@ $result_tree_text{'node_before_top'} = '*document_root C6
  |associated_title_command:[E4]
  |is_target:{1}
  |node_directions:D[prev->E1|up->E1]
+ |node_number:{3}
  |normalized:{Chapter}
   *arguments_line C1
    *line_arg C1
@@ -83,8 +87,9 @@ $result_tree_text{'node_before_top'} = '*document_root C6
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E2]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E2|up->E2]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/latex_tests/pagesizes.pl 
b/tta/perl/t/results/latex_tests/pagesizes.pl
index d0c9b9a30d..8465bd0554 100644
--- a/tta/perl/t/results/latex_tests/pagesizes.pl
+++ b/tta/perl/t/results/latex_tests/pagesizes.pl
@@ -26,6 +26,7 @@ $result_tree_text{'pagesizes'} = '*document_root C6
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -42,6 +43,7 @@ $result_tree_text{'pagesizes'} = '*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E3|E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -64,6 +66,7 @@ $result_tree_text{'pagesizes'} = '*document_root C6
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -79,8 +82,9 @@ $result_tree_text{'pagesizes'} = '*document_root C6
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E4|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E4|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -105,8 +109,9 @@ $result_tree_text{'pagesizes'} = '*document_root C6
   |{ }
  |EXTRA
  |section_directions:D[prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/latex_tests/pagetype.pl 
b/tta/perl/t/results/latex_tests/pagetype.pl
index 85fe3c63ba..82e961774e 100644
--- a/tta/perl/t/results/latex_tests/pagetype.pl
+++ b/tta/perl/t/results/latex_tests/pagetype.pl
@@ -22,6 +22,7 @@ $result_tree_text{'pagetype'} = '*document_root C6
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -38,6 +39,7 @@ $result_tree_text{'pagetype'} = '*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E3|E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -60,6 +62,7 @@ $result_tree_text{'pagetype'} = '*document_root C6
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -75,8 +78,9 @@ $result_tree_text{'pagetype'} = '*document_root C6
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E4|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E4|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -106,8 +110,9 @@ $result_tree_text{'pagetype'} = '*document_root C6
   |{ }
  |EXTRA
  |section_directions:D[prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/latex_tests/settitle_and_headings.pl 
b/tta/perl/t/results/latex_tests/settitle_and_headings.pl
index 28e46fa305..3a4f876b52 100644
--- a/tta/perl/t/results/latex_tests/settitle_and_headings.pl
+++ b/tta/perl/t/results/latex_tests/settitle_and_headings.pl
@@ -37,6 +37,7 @@ $result_tree_text{'settitle_and_headings'} = '*document_root 
C2
  |spaces_before_argument:
   |{ }
  |EXTRA
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
diff --git a/tta/perl/t/results/latex_tests/shorttitlepage.pl 
b/tta/perl/t/results/latex_tests/shorttitlepage.pl
index 6028efa8e2..e8de744110 100644
--- a/tta/perl/t/results/latex_tests/shorttitlepage.pl
+++ b/tta/perl/t/results/latex_tests/shorttitlepage.pl
@@ -28,6 +28,7 @@ $result_tree_text{'shorttitlepage'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -44,6 +45,7 @@ $result_tree_text{'shorttitlepage'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -66,6 +68,7 @@ $result_tree_text{'shorttitlepage'} = '*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -81,8 +84,9 @@ $result_tree_text{'shorttitlepage'} = '*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/latex_tests/titlepage_classical.pl 
b/tta/perl/t/results/latex_tests/titlepage_classical.pl
index cc72f89c50..afcf58aea1 100644
--- a/tta/perl/t/results/latex_tests/titlepage_classical.pl
+++ b/tta/perl/t/results/latex_tests/titlepage_classical.pl
@@ -120,6 +120,7 @@ $result_tree_text{'titlepage_classical'} = '*document_root 
C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -136,6 +137,7 @@ $result_tree_text{'titlepage_classical'} = '*document_root 
C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -158,6 +160,7 @@ $result_tree_text{'titlepage_classical'} = '*document_root 
C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -173,8 +176,9 @@ $result_tree_text{'titlepage_classical'} = '*document_root 
C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/latex_tests/titlepage_in_top_node.pl 
b/tta/perl/t/results/latex_tests/titlepage_in_top_node.pl
index 9ee0193e45..b1c57051d0 100644
--- a/tta/perl/t/results/latex_tests/titlepage_in_top_node.pl
+++ b/tta/perl/t/results/latex_tests/titlepage_in_top_node.pl
@@ -16,6 +16,7 @@ $result_tree_text{'titlepage_in_top_node'} = '*document_root 
C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'titlepage_in_top_node'} = '*document_root 
C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -84,6 +86,7 @@ $result_tree_text{'titlepage_in_top_node'} = '*document_root 
C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -99,8 +102,9 @@ $result_tree_text{'titlepage_in_top_node'} = '*document_root 
C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/latex_tests/titlepage_long_title.pl 
b/tta/perl/t/results/latex_tests/titlepage_long_title.pl
index 2d0640c82a..a58af41b99 100644
--- a/tta/perl/t/results/latex_tests/titlepage_long_title.pl
+++ b/tta/perl/t/results/latex_tests/titlepage_long_title.pl
@@ -46,6 +46,7 @@ $result_tree_text{'titlepage_long_title'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -62,6 +63,7 @@ $result_tree_text{'titlepage_long_title'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -84,6 +86,7 @@ $result_tree_text{'titlepage_long_title'} = '*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -99,8 +102,9 @@ $result_tree_text{'titlepage_long_title'} = '*document_root 
C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/latex_tests/titlepage_no_author.pl 
b/tta/perl/t/results/latex_tests/titlepage_no_author.pl
index 084c508e2b..a5f0cb08ed 100644
--- a/tta/perl/t/results/latex_tests/titlepage_no_author.pl
+++ b/tta/perl/t/results/latex_tests/titlepage_no_author.pl
@@ -43,6 +43,7 @@ $result_tree_text{'titlepage_no_author'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -59,6 +60,7 @@ $result_tree_text{'titlepage_no_author'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -81,6 +83,7 @@ $result_tree_text{'titlepage_no_author'} = '*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -96,8 +99,9 @@ $result_tree_text{'titlepage_no_author'} = '*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/latex_tests/titlepage_no_title.pl 
b/tta/perl/t/results/latex_tests/titlepage_no_title.pl
index cb6a47dcdc..d0dba06614 100644
--- a/tta/perl/t/results/latex_tests/titlepage_no_title.pl
+++ b/tta/perl/t/results/latex_tests/titlepage_no_title.pl
@@ -52,6 +52,7 @@ $result_tree_text{'titlepage_no_title'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -68,6 +69,7 @@ $result_tree_text{'titlepage_no_title'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -90,6 +92,7 @@ $result_tree_text{'titlepage_no_title'} = '*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -105,8 +108,9 @@ $result_tree_text{'titlepage_no_title'} = '*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/latex_tests/titlepage_with_commands_classical.pl 
b/tta/perl/t/results/latex_tests/titlepage_with_commands_classical.pl
index 67836e0a4b..03236b9a75 100644
--- a/tta/perl/t/results/latex_tests/titlepage_with_commands_classical.pl
+++ b/tta/perl/t/results/latex_tests/titlepage_with_commands_classical.pl
@@ -162,6 +162,7 @@ $result_tree_text{'titlepage_with_commands_classical'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -178,6 +179,7 @@ $result_tree_text{'titlepage_with_commands_classical'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -200,6 +202,7 @@ $result_tree_text{'titlepage_with_commands_classical'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -215,8 +218,9 @@ $result_tree_text{'titlepage_with_commands_classical'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/latex_tests/top_no_sectioning_command.pl 
b/tta/perl/t/results/latex_tests/top_no_sectioning_command.pl
index 4dfb3f0065..81313d8c08 100644
--- a/tta/perl/t/results/latex_tests/top_no_sectioning_command.pl
+++ b/tta/perl/t/results/latex_tests/top_no_sectioning_command.pl
@@ -14,6 +14,7 @@ $result_tree_text{'top_no_sectioning_command'} = 
'*document_root C4
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'top_no_sectioning_command'} = 
'*document_root C4
  |associated_title_command:[E2]
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{Chapter}
   *arguments_line C1
    *line_arg C1
@@ -45,6 +47,7 @@ $result_tree_text{'top_no_sectioning_command'} = 
'*document_root C4
  |EXTRA
  |associated_anchor_command:[E1]
  |associated_node:[E1]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
diff --git a/tta/perl/t/results/layout/navigation.pl 
b/tta/perl/t/results/layout/navigation.pl
index 8a13c6be05..bde3ef8b10 100644
--- a/tta/perl/t/results/layout/navigation.pl
+++ b/tta/perl/t/results/layout/navigation.pl
@@ -20,6 +20,7 @@ $result_tree_text{'navigation'} = '*document_root C10
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'navigation'} = '*document_root C10
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -89,6 +91,7 @@ $result_tree_text{'navigation'} = '*document_root C10
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -105,8 +108,9 @@ $result_tree_text{'navigation'} = '*document_root C10
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -155,6 +159,7 @@ $result_tree_text{'navigation'} = '*document_root C10
  |menu_directions:D[up->E3]
  |menus:EC[E8]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -171,8 +176,9 @@ $result_tree_text{'navigation'} = '*document_root C10
  |associated_node:[E6]
  |section_childs:EC[E10]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -259,6 +265,7 @@ $result_tree_text{'navigation'} = '*document_root C10
  |is_target:{1}
  |menu_directions:D[up->E6]
  |node_directions:D[up->E6]
+ |node_number:{4}
  |normalized:{subsection}
   *arguments_line C1
    *line_arg C1
@@ -274,8 +281,9 @@ $result_tree_text{'navigation'} = '*document_root C10
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[up->E7]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/layout/navigation_chapter.pl 
b/tta/perl/t/results/layout/navigation_chapter.pl
index 4bac92e407..86977d0eb5 100644
--- a/tta/perl/t/results/layout/navigation_chapter.pl
+++ b/tta/perl/t/results/layout/navigation_chapter.pl
@@ -20,6 +20,7 @@ $result_tree_text{'navigation_chapter'} = '*document_root C10
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'navigation_chapter'} = '*document_root C10
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -89,6 +91,7 @@ $result_tree_text{'navigation_chapter'} = '*document_root C10
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -105,8 +108,9 @@ $result_tree_text{'navigation_chapter'} = '*document_root 
C10
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -155,6 +159,7 @@ $result_tree_text{'navigation_chapter'} = '*document_root 
C10
  |menu_directions:D[up->E3]
  |menus:EC[E8]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -171,8 +176,9 @@ $result_tree_text{'navigation_chapter'} = '*document_root 
C10
  |associated_node:[E6]
  |section_childs:EC[E10]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -259,6 +265,7 @@ $result_tree_text{'navigation_chapter'} = '*document_root 
C10
  |is_target:{1}
  |menu_directions:D[up->E6]
  |node_directions:D[up->E6]
+ |node_number:{4}
  |normalized:{subsection}
   *arguments_line C1
    *line_arg C1
@@ -274,8 +281,9 @@ $result_tree_text{'navigation_chapter'} = '*document_root 
C10
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[up->E7]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/layout/navigation_chapter_no_header.pl 
b/tta/perl/t/results/layout/navigation_chapter_no_header.pl
index 058787ced8..1f59fabcbd 100644
--- a/tta/perl/t/results/layout/navigation_chapter_no_header.pl
+++ b/tta/perl/t/results/layout/navigation_chapter_no_header.pl
@@ -20,6 +20,7 @@ $result_tree_text{'navigation_chapter_no_header'} = 
'*document_root C10
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'navigation_chapter_no_header'} = 
'*document_root C10
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -89,6 +91,7 @@ $result_tree_text{'navigation_chapter_no_header'} = 
'*document_root C10
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -105,8 +108,9 @@ $result_tree_text{'navigation_chapter_no_header'} = 
'*document_root C10
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -155,6 +159,7 @@ $result_tree_text{'navigation_chapter_no_header'} = 
'*document_root C10
  |menu_directions:D[up->E3]
  |menus:EC[E8]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -171,8 +176,9 @@ $result_tree_text{'navigation_chapter_no_header'} = 
'*document_root C10
  |associated_node:[E6]
  |section_childs:EC[E10]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -259,6 +265,7 @@ $result_tree_text{'navigation_chapter_no_header'} = 
'*document_root C10
  |is_target:{1}
  |menu_directions:D[up->E6]
  |node_directions:D[up->E6]
+ |node_number:{4}
  |normalized:{subsection}
   *arguments_line C1
    *line_arg C1
@@ -274,8 +281,9 @@ $result_tree_text{'navigation_chapter_no_header'} = 
'*document_root C10
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[up->E7]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/layout/navigation_chapter_no_header_vertical.pl 
b/tta/perl/t/results/layout/navigation_chapter_no_header_vertical.pl
index ebc049ba87..e47bae0aee 100644
--- a/tta/perl/t/results/layout/navigation_chapter_no_header_vertical.pl
+++ b/tta/perl/t/results/layout/navigation_chapter_no_header_vertical.pl
@@ -20,6 +20,7 @@ $result_tree_text{'navigation_chapter_no_header_vertical'} = 
'*document_root C10
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'navigation_chapter_no_header_vertical'} = 
'*document_root C10
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -89,6 +91,7 @@ $result_tree_text{'navigation_chapter_no_header_vertical'} = 
'*document_root C10
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -105,8 +108,9 @@ $result_tree_text{'navigation_chapter_no_header_vertical'} 
= '*document_root C10
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -155,6 +159,7 @@ $result_tree_text{'navigation_chapter_no_header_vertical'} 
= '*document_root C10
  |menu_directions:D[up->E3]
  |menus:EC[E8]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -171,8 +176,9 @@ $result_tree_text{'navigation_chapter_no_header_vertical'} 
= '*document_root C10
  |associated_node:[E6]
  |section_childs:EC[E10]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -259,6 +265,7 @@ $result_tree_text{'navigation_chapter_no_header_vertical'} 
= '*document_root C10
  |is_target:{1}
  |menu_directions:D[up->E6]
  |node_directions:D[up->E6]
+ |node_number:{4}
  |normalized:{subsection}
   *arguments_line C1
    *line_arg C1
@@ -274,8 +281,9 @@ $result_tree_text{'navigation_chapter_no_header_vertical'} 
= '*document_root C10
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[up->E7]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/layout/navigation_chapter_vertical.pl 
b/tta/perl/t/results/layout/navigation_chapter_vertical.pl
index b36fe4b359..a5646f3609 100644
--- a/tta/perl/t/results/layout/navigation_chapter_vertical.pl
+++ b/tta/perl/t/results/layout/navigation_chapter_vertical.pl
@@ -20,6 +20,7 @@ $result_tree_text{'navigation_chapter_vertical'} = 
'*document_root C10
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'navigation_chapter_vertical'} = 
'*document_root C10
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -89,6 +91,7 @@ $result_tree_text{'navigation_chapter_vertical'} = 
'*document_root C10
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -105,8 +108,9 @@ $result_tree_text{'navigation_chapter_vertical'} = 
'*document_root C10
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -155,6 +159,7 @@ $result_tree_text{'navigation_chapter_vertical'} = 
'*document_root C10
  |menu_directions:D[up->E3]
  |menus:EC[E8]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -171,8 +176,9 @@ $result_tree_text{'navigation_chapter_vertical'} = 
'*document_root C10
  |associated_node:[E6]
  |section_childs:EC[E10]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -259,6 +265,7 @@ $result_tree_text{'navigation_chapter_vertical'} = 
'*document_root C10
  |is_target:{1}
  |menu_directions:D[up->E6]
  |node_directions:D[up->E6]
+ |node_number:{4}
  |normalized:{subsection}
   *arguments_line C1
    *line_arg C1
@@ -274,8 +281,9 @@ $result_tree_text{'navigation_chapter_vertical'} = 
'*document_root C10
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[up->E7]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/layout/navigation_no_header.pl 
b/tta/perl/t/results/layout/navigation_no_header.pl
index 361677b958..717d14cb97 100644
--- a/tta/perl/t/results/layout/navigation_no_header.pl
+++ b/tta/perl/t/results/layout/navigation_no_header.pl
@@ -20,6 +20,7 @@ $result_tree_text{'navigation_no_header'} = '*document_root 
C10
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'navigation_no_header'} = '*document_root 
C10
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -89,6 +91,7 @@ $result_tree_text{'navigation_no_header'} = '*document_root 
C10
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -105,8 +108,9 @@ $result_tree_text{'navigation_no_header'} = '*document_root 
C10
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -155,6 +159,7 @@ $result_tree_text{'navigation_no_header'} = '*document_root 
C10
  |menu_directions:D[up->E3]
  |menus:EC[E8]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -171,8 +176,9 @@ $result_tree_text{'navigation_no_header'} = '*document_root 
C10
  |associated_node:[E6]
  |section_childs:EC[E10]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -259,6 +265,7 @@ $result_tree_text{'navigation_no_header'} = '*document_root 
C10
  |is_target:{1}
  |menu_directions:D[up->E6]
  |node_directions:D[up->E6]
+ |node_number:{4}
  |normalized:{subsection}
   *arguments_line C1
    *line_arg C1
@@ -274,8 +281,9 @@ $result_tree_text{'navigation_no_header'} = '*document_root 
C10
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[up->E7]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/layout/navigation_no_header_vertical.pl 
b/tta/perl/t/results/layout/navigation_no_header_vertical.pl
index 0c7c513659..f072c17b1a 100644
--- a/tta/perl/t/results/layout/navigation_no_header_vertical.pl
+++ b/tta/perl/t/results/layout/navigation_no_header_vertical.pl
@@ -20,6 +20,7 @@ $result_tree_text{'navigation_no_header_vertical'} = 
'*document_root C10
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'navigation_no_header_vertical'} = 
'*document_root C10
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -89,6 +91,7 @@ $result_tree_text{'navigation_no_header_vertical'} = 
'*document_root C10
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -105,8 +108,9 @@ $result_tree_text{'navigation_no_header_vertical'} = 
'*document_root C10
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -155,6 +159,7 @@ $result_tree_text{'navigation_no_header_vertical'} = 
'*document_root C10
  |menu_directions:D[up->E3]
  |menus:EC[E8]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -171,8 +176,9 @@ $result_tree_text{'navigation_no_header_vertical'} = 
'*document_root C10
  |associated_node:[E6]
  |section_childs:EC[E10]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -259,6 +265,7 @@ $result_tree_text{'navigation_no_header_vertical'} = 
'*document_root C10
  |is_target:{1}
  |menu_directions:D[up->E6]
  |node_directions:D[up->E6]
+ |node_number:{4}
  |normalized:{subsection}
   *arguments_line C1
    *line_arg C1
@@ -274,8 +281,9 @@ $result_tree_text{'navigation_no_header_vertical'} = 
'*document_root C10
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[up->E7]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/layout/navigation_node.pl 
b/tta/perl/t/results/layout/navigation_node.pl
index 3626655013..ac97355b74 100644
--- a/tta/perl/t/results/layout/navigation_node.pl
+++ b/tta/perl/t/results/layout/navigation_node.pl
@@ -20,6 +20,7 @@ $result_tree_text{'navigation_node'} = '*document_root C10
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'navigation_node'} = '*document_root C10
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -89,6 +91,7 @@ $result_tree_text{'navigation_node'} = '*document_root C10
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -105,8 +108,9 @@ $result_tree_text{'navigation_node'} = '*document_root C10
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -155,6 +159,7 @@ $result_tree_text{'navigation_node'} = '*document_root C10
  |menu_directions:D[up->E3]
  |menus:EC[E8]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -171,8 +176,9 @@ $result_tree_text{'navigation_node'} = '*document_root C10
  |associated_node:[E6]
  |section_childs:EC[E10]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -259,6 +265,7 @@ $result_tree_text{'navigation_node'} = '*document_root C10
  |is_target:{1}
  |menu_directions:D[up->E6]
  |node_directions:D[up->E6]
+ |node_number:{4}
  |normalized:{subsection}
   *arguments_line C1
    *line_arg C1
@@ -274,8 +281,9 @@ $result_tree_text{'navigation_node'} = '*document_root C10
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[up->E7]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/layout/navigation_node_no_header.pl 
b/tta/perl/t/results/layout/navigation_node_no_header.pl
index 1c5b3324e3..313b97839c 100644
--- a/tta/perl/t/results/layout/navigation_node_no_header.pl
+++ b/tta/perl/t/results/layout/navigation_node_no_header.pl
@@ -20,6 +20,7 @@ $result_tree_text{'navigation_node_no_header'} = 
'*document_root C10
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'navigation_node_no_header'} = 
'*document_root C10
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -89,6 +91,7 @@ $result_tree_text{'navigation_node_no_header'} = 
'*document_root C10
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -105,8 +108,9 @@ $result_tree_text{'navigation_node_no_header'} = 
'*document_root C10
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -155,6 +159,7 @@ $result_tree_text{'navigation_node_no_header'} = 
'*document_root C10
  |menu_directions:D[up->E3]
  |menus:EC[E8]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -171,8 +176,9 @@ $result_tree_text{'navigation_node_no_header'} = 
'*document_root C10
  |associated_node:[E6]
  |section_childs:EC[E10]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -259,6 +265,7 @@ $result_tree_text{'navigation_node_no_header'} = 
'*document_root C10
  |is_target:{1}
  |menu_directions:D[up->E6]
  |node_directions:D[up->E6]
+ |node_number:{4}
  |normalized:{subsection}
   *arguments_line C1
    *line_arg C1
@@ -274,8 +281,9 @@ $result_tree_text{'navigation_node_no_header'} = 
'*document_root C10
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[up->E7]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/layout/navigation_node_no_header_vertical.pl 
b/tta/perl/t/results/layout/navigation_node_no_header_vertical.pl
index acdeeafb04..9736578b78 100644
--- a/tta/perl/t/results/layout/navigation_node_no_header_vertical.pl
+++ b/tta/perl/t/results/layout/navigation_node_no_header_vertical.pl
@@ -20,6 +20,7 @@ $result_tree_text{'navigation_node_no_header_vertical'} = 
'*document_root C10
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'navigation_node_no_header_vertical'} = 
'*document_root C10
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -89,6 +91,7 @@ $result_tree_text{'navigation_node_no_header_vertical'} = 
'*document_root C10
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -105,8 +108,9 @@ $result_tree_text{'navigation_node_no_header_vertical'} = 
'*document_root C10
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -155,6 +159,7 @@ $result_tree_text{'navigation_node_no_header_vertical'} = 
'*document_root C10
  |menu_directions:D[up->E3]
  |menus:EC[E8]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -171,8 +176,9 @@ $result_tree_text{'navigation_node_no_header_vertical'} = 
'*document_root C10
  |associated_node:[E6]
  |section_childs:EC[E10]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -259,6 +265,7 @@ $result_tree_text{'navigation_node_no_header_vertical'} = 
'*document_root C10
  |is_target:{1}
  |menu_directions:D[up->E6]
  |node_directions:D[up->E6]
+ |node_number:{4}
  |normalized:{subsection}
   *arguments_line C1
    *line_arg C1
@@ -274,8 +281,9 @@ $result_tree_text{'navigation_node_no_header_vertical'} = 
'*document_root C10
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[up->E7]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/layout/navigation_node_vertical.pl 
b/tta/perl/t/results/layout/navigation_node_vertical.pl
index 9db5f8edfb..ac92608a41 100644
--- a/tta/perl/t/results/layout/navigation_node_vertical.pl
+++ b/tta/perl/t/results/layout/navigation_node_vertical.pl
@@ -20,6 +20,7 @@ $result_tree_text{'navigation_node_vertical'} = 
'*document_root C10
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'navigation_node_vertical'} = 
'*document_root C10
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -89,6 +91,7 @@ $result_tree_text{'navigation_node_vertical'} = 
'*document_root C10
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -105,8 +108,9 @@ $result_tree_text{'navigation_node_vertical'} = 
'*document_root C10
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -155,6 +159,7 @@ $result_tree_text{'navigation_node_vertical'} = 
'*document_root C10
  |menu_directions:D[up->E3]
  |menus:EC[E8]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -171,8 +176,9 @@ $result_tree_text{'navigation_node_vertical'} = 
'*document_root C10
  |associated_node:[E6]
  |section_childs:EC[E10]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -259,6 +265,7 @@ $result_tree_text{'navigation_node_vertical'} = 
'*document_root C10
  |is_target:{1}
  |menu_directions:D[up->E6]
  |node_directions:D[up->E6]
+ |node_number:{4}
  |normalized:{subsection}
   *arguments_line C1
    *line_arg C1
@@ -274,8 +281,9 @@ $result_tree_text{'navigation_node_vertical'} = 
'*document_root C10
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[up->E7]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/layout/navigation_section.pl 
b/tta/perl/t/results/layout/navigation_section.pl
index 8d6b15f209..1bc2e0f47d 100644
--- a/tta/perl/t/results/layout/navigation_section.pl
+++ b/tta/perl/t/results/layout/navigation_section.pl
@@ -20,6 +20,7 @@ $result_tree_text{'navigation_section'} = '*document_root C10
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'navigation_section'} = '*document_root C10
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -89,6 +91,7 @@ $result_tree_text{'navigation_section'} = '*document_root C10
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -105,8 +108,9 @@ $result_tree_text{'navigation_section'} = '*document_root 
C10
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -155,6 +159,7 @@ $result_tree_text{'navigation_section'} = '*document_root 
C10
  |menu_directions:D[up->E3]
  |menus:EC[E8]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -171,8 +176,9 @@ $result_tree_text{'navigation_section'} = '*document_root 
C10
  |associated_node:[E6]
  |section_childs:EC[E10]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -259,6 +265,7 @@ $result_tree_text{'navigation_section'} = '*document_root 
C10
  |is_target:{1}
  |menu_directions:D[up->E6]
  |node_directions:D[up->E6]
+ |node_number:{4}
  |normalized:{subsection}
   *arguments_line C1
    *line_arg C1
@@ -274,8 +281,9 @@ $result_tree_text{'navigation_section'} = '*document_root 
C10
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[up->E7]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/layout/navigation_section_no_header.pl 
b/tta/perl/t/results/layout/navigation_section_no_header.pl
index 38abd77580..b293617ded 100644
--- a/tta/perl/t/results/layout/navigation_section_no_header.pl
+++ b/tta/perl/t/results/layout/navigation_section_no_header.pl
@@ -20,6 +20,7 @@ $result_tree_text{'navigation_section_no_header'} = 
'*document_root C10
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'navigation_section_no_header'} = 
'*document_root C10
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -89,6 +91,7 @@ $result_tree_text{'navigation_section_no_header'} = 
'*document_root C10
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -105,8 +108,9 @@ $result_tree_text{'navigation_section_no_header'} = 
'*document_root C10
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -155,6 +159,7 @@ $result_tree_text{'navigation_section_no_header'} = 
'*document_root C10
  |menu_directions:D[up->E3]
  |menus:EC[E8]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -171,8 +176,9 @@ $result_tree_text{'navigation_section_no_header'} = 
'*document_root C10
  |associated_node:[E6]
  |section_childs:EC[E10]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -259,6 +265,7 @@ $result_tree_text{'navigation_section_no_header'} = 
'*document_root C10
  |is_target:{1}
  |menu_directions:D[up->E6]
  |node_directions:D[up->E6]
+ |node_number:{4}
  |normalized:{subsection}
   *arguments_line C1
    *line_arg C1
@@ -274,8 +281,9 @@ $result_tree_text{'navigation_section_no_header'} = 
'*document_root C10
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[up->E7]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/layout/navigation_section_no_header_vertical.pl 
b/tta/perl/t/results/layout/navigation_section_no_header_vertical.pl
index 55cf90e2cc..b5a593130e 100644
--- a/tta/perl/t/results/layout/navigation_section_no_header_vertical.pl
+++ b/tta/perl/t/results/layout/navigation_section_no_header_vertical.pl
@@ -20,6 +20,7 @@ $result_tree_text{'navigation_section_no_header_vertical'} = 
'*document_root C10
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'navigation_section_no_header_vertical'} = 
'*document_root C10
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -89,6 +91,7 @@ $result_tree_text{'navigation_section_no_header_vertical'} = 
'*document_root C10
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -105,8 +108,9 @@ $result_tree_text{'navigation_section_no_header_vertical'} 
= '*document_root C10
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -155,6 +159,7 @@ $result_tree_text{'navigation_section_no_header_vertical'} 
= '*document_root C10
  |menu_directions:D[up->E3]
  |menus:EC[E8]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -171,8 +176,9 @@ $result_tree_text{'navigation_section_no_header_vertical'} 
= '*document_root C10
  |associated_node:[E6]
  |section_childs:EC[E10]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -259,6 +265,7 @@ $result_tree_text{'navigation_section_no_header_vertical'} 
= '*document_root C10
  |is_target:{1}
  |menu_directions:D[up->E6]
  |node_directions:D[up->E6]
+ |node_number:{4}
  |normalized:{subsection}
   *arguments_line C1
    *line_arg C1
@@ -274,8 +281,9 @@ $result_tree_text{'navigation_section_no_header_vertical'} 
= '*document_root C10
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[up->E7]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/layout/navigation_section_vertical.pl 
b/tta/perl/t/results/layout/navigation_section_vertical.pl
index 0a6a93a6a2..8df3d3aca3 100644
--- a/tta/perl/t/results/layout/navigation_section_vertical.pl
+++ b/tta/perl/t/results/layout/navigation_section_vertical.pl
@@ -20,6 +20,7 @@ $result_tree_text{'navigation_section_vertical'} = 
'*document_root C10
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'navigation_section_vertical'} = 
'*document_root C10
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -89,6 +91,7 @@ $result_tree_text{'navigation_section_vertical'} = 
'*document_root C10
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -105,8 +108,9 @@ $result_tree_text{'navigation_section_vertical'} = 
'*document_root C10
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -155,6 +159,7 @@ $result_tree_text{'navigation_section_vertical'} = 
'*document_root C10
  |menu_directions:D[up->E3]
  |menus:EC[E8]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -171,8 +176,9 @@ $result_tree_text{'navigation_section_vertical'} = 
'*document_root C10
  |associated_node:[E6]
  |section_childs:EC[E10]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -259,6 +265,7 @@ $result_tree_text{'navigation_section_vertical'} = 
'*document_root C10
  |is_target:{1}
  |menu_directions:D[up->E6]
  |node_directions:D[up->E6]
+ |node_number:{4}
  |normalized:{subsection}
   *arguments_line C1
    *line_arg C1
@@ -274,8 +281,9 @@ $result_tree_text{'navigation_section_vertical'} = 
'*document_root C10
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[up->E7]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/layout/navigation_test_misc_file_collision.pl 
b/tta/perl/t/results/layout/navigation_test_misc_file_collision.pl
index f3d8f2c20d..d916677b21 100644
--- a/tta/perl/t/results/layout/navigation_test_misc_file_collision.pl
+++ b/tta/perl/t/results/layout/navigation_test_misc_file_collision.pl
@@ -20,6 +20,7 @@ $result_tree_text{'navigation_test_misc_file_collision'} = 
'*document_root C10
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'navigation_test_misc_file_collision'} = 
'*document_root C10
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -89,6 +91,7 @@ $result_tree_text{'navigation_test_misc_file_collision'} = 
'*document_root C10
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -105,8 +108,9 @@ $result_tree_text{'navigation_test_misc_file_collision'} = 
'*document_root C10
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -155,6 +159,7 @@ $result_tree_text{'navigation_test_misc_file_collision'} = 
'*document_root C10
  |menu_directions:D[up->E3]
  |menus:EC[E8]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -171,8 +176,9 @@ $result_tree_text{'navigation_test_misc_file_collision'} = 
'*document_root C10
  |associated_node:[E6]
  |section_childs:EC[E10]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -259,6 +265,7 @@ $result_tree_text{'navigation_test_misc_file_collision'} = 
'*document_root C10
  |is_target:{1}
  |menu_directions:D[up->E6]
  |node_directions:D[up->E6]
+ |node_number:{4}
  |normalized:{subsection}
   *arguments_line C1
    *line_arg C1
@@ -274,8 +281,9 @@ $result_tree_text{'navigation_test_misc_file_collision'} = 
'*document_root C10
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[up->E7]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/layout/navigation_test_undef_top_buttons.pl 
b/tta/perl/t/results/layout/navigation_test_undef_top_buttons.pl
index 7cc1ffad86..b4e58daac9 100644
--- a/tta/perl/t/results/layout/navigation_test_undef_top_buttons.pl
+++ b/tta/perl/t/results/layout/navigation_test_undef_top_buttons.pl
@@ -20,6 +20,7 @@ $result_tree_text{'navigation_test_undef_top_buttons'} = 
'*document_root C10
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'navigation_test_undef_top_buttons'} = 
'*document_root C10
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -89,6 +91,7 @@ $result_tree_text{'navigation_test_undef_top_buttons'} = 
'*document_root C10
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -105,8 +108,9 @@ $result_tree_text{'navigation_test_undef_top_buttons'} = 
'*document_root C10
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -155,6 +159,7 @@ $result_tree_text{'navigation_test_undef_top_buttons'} = 
'*document_root C10
  |menu_directions:D[up->E3]
  |menus:EC[E8]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -171,8 +176,9 @@ $result_tree_text{'navigation_test_undef_top_buttons'} = 
'*document_root C10
  |associated_node:[E6]
  |section_childs:EC[E10]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -259,6 +265,7 @@ $result_tree_text{'navigation_test_undef_top_buttons'} = 
'*document_root C10
  |is_target:{1}
  |menu_directions:D[up->E6]
  |node_directions:D[up->E6]
+ |node_number:{4}
  |normalized:{subsection}
   *arguments_line C1
    *line_arg C1
@@ -274,8 +281,9 @@ $result_tree_text{'navigation_test_undef_top_buttons'} = 
'*document_root C10
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[up->E7]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/layout/navigation_test_zero_top_buttons.pl 
b/tta/perl/t/results/layout/navigation_test_zero_top_buttons.pl
index 63997b48db..1db880082f 100644
--- a/tta/perl/t/results/layout/navigation_test_zero_top_buttons.pl
+++ b/tta/perl/t/results/layout/navigation_test_zero_top_buttons.pl
@@ -20,6 +20,7 @@ $result_tree_text{'navigation_test_zero_top_buttons'} = 
'*document_root C10
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'navigation_test_zero_top_buttons'} = 
'*document_root C10
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -89,6 +91,7 @@ $result_tree_text{'navigation_test_zero_top_buttons'} = 
'*document_root C10
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -105,8 +108,9 @@ $result_tree_text{'navigation_test_zero_top_buttons'} = 
'*document_root C10
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -155,6 +159,7 @@ $result_tree_text{'navigation_test_zero_top_buttons'} = 
'*document_root C10
  |menu_directions:D[up->E3]
  |menus:EC[E8]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -171,8 +176,9 @@ $result_tree_text{'navigation_test_zero_top_buttons'} = 
'*document_root C10
  |associated_node:[E6]
  |section_childs:EC[E10]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -259,6 +265,7 @@ $result_tree_text{'navigation_test_zero_top_buttons'} = 
'*document_root C10
  |is_target:{1}
  |menu_directions:D[up->E6]
  |node_directions:D[up->E6]
+ |node_number:{4}
  |normalized:{subsection}
   *arguments_line C1
    *line_arg C1
@@ -274,8 +281,9 @@ $result_tree_text{'navigation_test_zero_top_buttons'} = 
'*document_root C10
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[up->E7]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/layout/navigation_vertical.pl 
b/tta/perl/t/results/layout/navigation_vertical.pl
index d8539e93ee..9124c8e059 100644
--- a/tta/perl/t/results/layout/navigation_vertical.pl
+++ b/tta/perl/t/results/layout/navigation_vertical.pl
@@ -20,6 +20,7 @@ $result_tree_text{'navigation_vertical'} = '*document_root C10
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'navigation_vertical'} = '*document_root C10
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -89,6 +91,7 @@ $result_tree_text{'navigation_vertical'} = '*document_root C10
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -105,8 +108,9 @@ $result_tree_text{'navigation_vertical'} = '*document_root 
C10
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -155,6 +159,7 @@ $result_tree_text{'navigation_vertical'} = '*document_root 
C10
  |menu_directions:D[up->E3]
  |menus:EC[E8]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -171,8 +176,9 @@ $result_tree_text{'navigation_vertical'} = '*document_root 
C10
  |associated_node:[E6]
  |section_childs:EC[E10]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -259,6 +265,7 @@ $result_tree_text{'navigation_vertical'} = '*document_root 
C10
  |is_target:{1}
  |menu_directions:D[up->E6]
  |node_directions:D[up->E6]
+ |node_number:{4}
  |normalized:{subsection}
   *arguments_line C1
    *line_arg C1
@@ -274,8 +281,9 @@ $result_tree_text{'navigation_vertical'} = '*document_root 
C10
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[up->E7]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/layout/no_monolithic.pl 
b/tta/perl/t/results/layout/no_monolithic.pl
index fa159d9564..2b5fe256a1 100644
--- a/tta/perl/t/results/layout/no_monolithic.pl
+++ b/tta/perl/t/results/layout/no_monolithic.pl
@@ -20,6 +20,7 @@ $result_tree_text{'no_monolithic'} = '*document_root C6
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'no_monolithic'} = '*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -113,6 +115,7 @@ $result_tree_text{'no_monolithic'} = '*document_root C6
  |isindex:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -128,8 +131,9 @@ $result_tree_text{'no_monolithic'} = '*document_root C6
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/layout/no_monolithic_only_toc_out.pl 
b/tta/perl/t/results/layout/no_monolithic_only_toc_out.pl
index 1ce7c3a5d1..018cccb7c3 100644
--- a/tta/perl/t/results/layout/no_monolithic_only_toc_out.pl
+++ b/tta/perl/t/results/layout/no_monolithic_only_toc_out.pl
@@ -20,6 +20,7 @@ $result_tree_text{'no_monolithic_only_toc_out'} = 
'*document_root C6
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'no_monolithic_only_toc_out'} = 
'*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -113,6 +115,7 @@ $result_tree_text{'no_monolithic_only_toc_out'} = 
'*document_root C6
  |isindex:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -128,8 +131,9 @@ $result_tree_text{'no_monolithic_only_toc_out'} = 
'*document_root C6
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/linemacro/simple_nested_linemacro_calls.pl 
b/tta/perl/t/results/linemacro/simple_nested_linemacro_calls.pl
index c37d264d06..584b604d43 100644
--- a/tta/perl/t/results/linemacro/simple_nested_linemacro_calls.pl
+++ b/tta/perl/t/results/linemacro/simple_nested_linemacro_calls.pl
@@ -12,6 +12,7 @@ $result_tree_text{'simple_nested_linemacro_calls'} = 
'*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/macro/backslash_in_arg.pl 
b/tta/perl/t/results/macro/backslash_in_arg.pl
index f4b6e09ecf..2f12bc23c7 100644
--- a/tta/perl/t/results/macro/backslash_in_arg.pl
+++ b/tta/perl/t/results/macro/backslash_in_arg.pl
@@ -13,6 +13,7 @@ $result_tree_text{'backslash_in_arg'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -28,6 +29,7 @@ $result_tree_text{'backslash_in_arg'} = '*document_root C3
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/macro/bib_example.pl 
b/tta/perl/t/results/macro/bib_example.pl
index 9da2ff9466..8549e5d05d 100644
--- a/tta/perl/t/results/macro/bib_example.pl
+++ b/tta/perl/t/results/macro/bib_example.pl
@@ -610,6 +610,7 @@ $result_tree_text{'bib_example'} = '*document_root C9
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -626,6 +627,7 @@ $result_tree_text{'bib_example'} = '*document_root C9
  |associated_node:[E0]
  |section_childs:EC[E4|E6]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -704,6 +706,7 @@ $result_tree_text{'bib_example'} = '*document_root C9
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Introduction}
   *arguments_line C1
    *line_arg C1
@@ -719,8 +722,9 @@ $result_tree_text{'bib_example'} = '*document_root C9
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -851,6 +855,7 @@ $result_tree_text{'bib_example'} = '*document_root C9
  |is_target:{1}
  |menu_directions:D[prev->E3|up->E0]
  |node_directions:D[prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{References}
   *arguments_line C1
    *line_arg C1
@@ -869,8 +874,9 @@ $result_tree_text{'bib_example'} = '*document_root C9
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/macro/glossary.pl 
b/tta/perl/t/results/macro/glossary.pl
index ab1dc2967a..61cd990215 100644
--- a/tta/perl/t/results/macro/glossary.pl
+++ b/tta/perl/t/results/macro/glossary.pl
@@ -108,6 +108,7 @@ $result_tree_text{'glossary'} = '*document_root C5
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -124,6 +125,7 @@ $result_tree_text{'glossary'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -439,6 +441,7 @@ $result_tree_text{'glossary'} = '*document_root C5
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{glossary}
   *arguments_line C1
    *line_arg C1
@@ -454,8 +457,9 @@ $result_tree_text{'glossary'} = '*document_root C5
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/macro/macro_alias_definfoenclose_defindex.pl 
b/tta/perl/t/results/macro/macro_alias_definfoenclose_defindex.pl
index ad7bdc73aa..02761c5ac7 100644
--- a/tta/perl/t/results/macro/macro_alias_definfoenclose_defindex.pl
+++ b/tta/perl/t/results/macro/macro_alias_definfoenclose_defindex.pl
@@ -15,6 +15,7 @@ $result_tree_text{'macro_alias_definfoenclose_defindex'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'macro_alias_definfoenclose_defindex'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'macro_alias_definfoenclose_defindex'} = 
'*document_root C5
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'macro_alias_definfoenclose_defindex'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/macro/macro_in_index_commands.pl 
b/tta/perl/t/results/macro/macro_in_index_commands.pl
index 7e916ab527..7a039dc696 100644
--- a/tta/perl/t/results/macro/macro_in_index_commands.pl
+++ b/tta/perl/t/results/macro/macro_in_index_commands.pl
@@ -232,6 +232,7 @@ $result_tree_text{'macro_in_index_commands'} = 
'*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -247,6 +248,7 @@ $result_tree_text{'macro_in_index_commands'} = 
'*document_root C3
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/macro/macro_in_misc_commands.pl 
b/tta/perl/t/results/macro/macro_in_misc_commands.pl
index e5677260d6..27c6ec362c 100644
--- a/tta/perl/t/results/macro/macro_in_misc_commands.pl
+++ b/tta/perl/t/results/macro/macro_in_misc_commands.pl
@@ -60,6 +60,7 @@ $result_tree_text{'macro_in_misc_commands'} = '*document_root 
C6
  |is_target:{1}
  |menus:EC[E3]
  |node_directions:D[next->E4]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -78,6 +79,7 @@ $result_tree_text{'macro_in_misc_commands'} = '*document_root 
C6
  |associated_node:[E0]
  |section_childs:EC[E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -103,6 +105,7 @@ $result_tree_text{'macro_in_misc_commands'} = 
'*document_root C6
    |{ }
   |EXTRA
   |global_command_number:{1}
+  |heading_number:{1}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -1525,6 +1528,7 @@ $result_tree_text{'macro_in_misc_commands'} = 
'*document_root C6
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node-atext}
   *arguments_line C1
    *line_arg C1
@@ -1547,8 +1551,9 @@ $result_tree_text{'macro_in_misc_commands'} = 
'*document_root C6
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
  >SOURCEMARKS
  >macro_expansion<end;51>
diff --git 
a/tta/perl/t/results/menu/appendix_and_associated_part_in_generated_menu.pl 
b/tta/perl/t/results/menu/appendix_and_associated_part_in_generated_menu.pl
index 5fe35bf41f..661cc7dd52 100644
--- a/tta/perl/t/results/menu/appendix_and_associated_part_in_generated_menu.pl
+++ b/tta/perl/t/results/menu/appendix_and_associated_part_in_generated_menu.pl
@@ -15,6 +15,7 @@ 
$result_tree_text{'appendix_and_associated_part_in_generated_menu'} = '*document
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ 
$result_tree_text{'appendix_and_associated_part_in_generated_menu'} = '*document
  |section_childs:EC[E3]
  |section_directions:D[next->E6]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ 
$result_tree_text{'appendix_and_associated_part_in_generated_menu'} = '*document
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E7|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -70,8 +73,9 @@ 
$result_tree_text{'appendix_and_associated_part_in_generated_menu'} = '*document
  |associated_node:[E2]
  |section_childs:EC[E5]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E8|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -89,6 +93,7 @@ 
$result_tree_text{'appendix_and_associated_part_in_generated_menu'} = '*document
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[up->E2]
+ |node_number:{3}
  |normalized:{sec}
   *arguments_line C1
    *line_arg C1
@@ -104,8 +109,9 @@ 
$result_tree_text{'appendix_and_associated_part_in_generated_menu'} = '*document
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[up->E3]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -124,6 +130,7 @@ 
$result_tree_text{'appendix_and_associated_part_in_generated_menu'} = '*document
  |section_childs:EC[E8]
  |section_directions:D[next->E9|prev->E1]
  |section_level:{0}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -140,6 +147,7 @@ 
$result_tree_text{'appendix_and_associated_part_in_generated_menu'} = '*document
  |associated_title_command:[E8]
  |is_target:{1}
  |node_directions:D[next->E10|prev->E2|up->E0]
+ |node_number:{4}
  |node_preceding_part:[E6]
  |normalized:{chap2}
   *arguments_line C1
@@ -157,8 +165,9 @@ 
$result_tree_text{'appendix_and_associated_part_in_generated_menu'} = '*document
  |associated_node:[E7]
  |associated_part:[E6]
  |section_directions:D[up->E6]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{5}
  |toplevel_directions:D[next->E11|prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -178,6 +187,7 @@ 
$result_tree_text{'appendix_and_associated_part_in_generated_menu'} = '*document
  |section_childs:EC[E11]
  |section_directions:D[prev->E6]
  |section_level:{0}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -194,6 +204,7 @@ 
$result_tree_text{'appendix_and_associated_part_in_generated_menu'} = '*document
  |associated_title_command:[E11]
  |is_target:{1}
  |node_directions:D[prev->E7|up->E0]
+ |node_number:{5}
  |node_preceding_part:[E9]
  |normalized:{app}
   *arguments_line C1
@@ -211,8 +222,9 @@ 
$result_tree_text{'appendix_and_associated_part_in_generated_menu'} = '*document
  |associated_node:[E10]
  |associated_part:[E9]
  |section_directions:D[up->E9]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{7}
  |toplevel_directions:D[prev->E8|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/menu/block_commands_in_menu_description.pl 
b/tta/perl/t/results/menu/block_commands_in_menu_description.pl
index 6adacf35e9..5ec168f751 100644
--- a/tta/perl/t/results/menu/block_commands_in_menu_description.pl
+++ b/tta/perl/t/results/menu/block_commands_in_menu_description.pl
@@ -15,6 +15,7 @@ $result_tree_text{'block_commands_in_menu_description'} = 
'*document_root C3
  |associated_title_command:[E1]
  |is_target:{1}
  |menus:EC[E2]
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
@@ -30,6 +31,7 @@ $result_tree_text{'block_commands_in_menu_description'} = 
'*document_root C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/menu/commands_in_nodedescriptionblock.pl 
b/tta/perl/t/results/menu/commands_in_nodedescriptionblock.pl
index ed62cc60e9..06191c6e38 100644
--- a/tta/perl/t/results/menu/commands_in_nodedescriptionblock.pl
+++ b/tta/perl/t/results/menu/commands_in_nodedescriptionblock.pl
@@ -16,6 +16,7 @@ $result_tree_text{'commands_in_nodedescriptionblock'} = 
'*document_root C7
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'commands_in_nodedescriptionblock'} = 
'*document_root C7
  |associated_node:[E0]
  |section_childs:EC[E4|E9]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -113,6 +115,7 @@ $result_tree_text{'commands_in_nodedescriptionblock'} = 
'*document_root C7
  |node_description:[E5]
  |node_directions:D[next->E8|prev->E0|up->E0]
  |node_long_description:[E5]
+ |node_number:{2}
  |normalized:{node1}
   *arguments_line C1
    *line_arg C1
@@ -128,8 +131,9 @@ $result_tree_text{'commands_in_nodedescriptionblock'} = 
'*document_root C7
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E9|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E9|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -257,6 +261,7 @@ $result_tree_text{'commands_in_nodedescriptionblock'} = 
'*document_root C7
  |menu_directions:D[prev->E3|up->E0]
  |menus:EC[E10]
  |node_directions:D[prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{node2}
   *arguments_line C1
    *line_arg C1
@@ -272,8 +277,9 @@ $result_tree_text{'commands_in_nodedescriptionblock'} = 
'*document_root C7
  |associated_anchor_command:[E8]
  |associated_node:[E8]
  |section_directions:D[prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/menu/comment_on_menu_line.pl 
b/tta/perl/t/results/menu/comment_on_menu_line.pl
index 6a83265d81..043370457a 100644
--- a/tta/perl/t/results/menu/comment_on_menu_line.pl
+++ b/tta/perl/t/results/menu/comment_on_menu_line.pl
@@ -16,6 +16,7 @@ $result_tree_text{'comment_on_menu_line'} = '*document_root C4
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -64,6 +65,7 @@ $result_tree_text{'comment_on_menu_line'} = '*document_root C4
  |EXTRA
  |associated_anchor_command:[E0]
  |associated_node:[E0]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
@@ -85,6 +87,7 @@ $result_tree_text{'comment_on_menu_line'} = '*document_root C4
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/menu/detailmenu_on_subnodes.pl 
b/tta/perl/t/results/menu/detailmenu_on_subnodes.pl
index 2ab29f97aa..deefd3731c 100644
--- a/tta/perl/t/results/menu/detailmenu_on_subnodes.pl
+++ b/tta/perl/t/results/menu/detailmenu_on_subnodes.pl
@@ -16,6 +16,7 @@ $result_tree_text{'detailmenu_on_subnodes'} = '*document_root 
C13
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'detailmenu_on_subnodes'} = '*document_root 
C13
  |associated_node:[E0]
  |section_childs:EC[E4|E9]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -177,6 +179,7 @@ $result_tree_text{'detailmenu_on_subnodes'} = 
'*document_root C13
  |menu_directions:D[next->E8|up->E0]
  |menus:EC[E5]
  |node_directions:D[next->E8|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -193,8 +196,9 @@ $result_tree_text{'detailmenu_on_subnodes'} = 
'*document_root C13
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[next->E9|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E9|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -242,6 +246,7 @@ $result_tree_text{'detailmenu_on_subnodes'} = 
'*document_root C13
  |is_target:{1}
  |menu_directions:D[up->E3]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -257,8 +262,9 @@ $result_tree_text{'detailmenu_on_subnodes'} = 
'*document_root C13
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -277,6 +283,7 @@ $result_tree_text{'detailmenu_on_subnodes'} = 
'*document_root C13
  |menu_directions:D[prev->E3|up->E0]
  |menus:EC[E10]
  |node_directions:D[prev->E3|up->E0]
+ |node_number:{4}
  |normalized:{chapter-2}
   *arguments_line C1
    *line_arg C1
@@ -293,8 +300,9 @@ $result_tree_text{'detailmenu_on_subnodes'} = 
'*document_root C13
  |associated_node:[E8]
  |section_childs:EC[E12|E14]
  |section_directions:D[prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{4}
  |toplevel_directions:D[prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -353,6 +361,7 @@ $result_tree_text{'detailmenu_on_subnodes'} = 
'*document_root C13
  |is_target:{1}
  |menu_directions:D[next->E13|up->E8]
  |node_directions:D[next->E13|up->E8]
+ |node_number:{5}
  |normalized:{section-chap-2}
   *arguments_line C1
    *line_arg C1
@@ -368,8 +377,9 @@ $result_tree_text{'detailmenu_on_subnodes'} = 
'*document_root C13
  |associated_anchor_command:[E11]
  |associated_node:[E11]
  |section_directions:D[next->E14|up->E9]
+ |section_heading_number:{2.1}
  |section_level:{2}
- |section_number:{2.1}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -387,6 +397,7 @@ $result_tree_text{'detailmenu_on_subnodes'} = 
'*document_root C13
  |is_target:{1}
  |menu_directions:D[prev->E11|up->E8]
  |node_directions:D[prev->E11|up->E8]
+ |node_number:{6}
  |normalized:{unnumberedsec}
   *arguments_line C1
    *line_arg C1
@@ -403,6 +414,7 @@ $result_tree_text{'detailmenu_on_subnodes'} = 
'*document_root C13
  |associated_node:[E13]
  |section_directions:D[prev->E12|up->E9]
  |section_level:{2}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/menu/detailmenu_unknown_node.pl 
b/tta/perl/t/results/menu/detailmenu_unknown_node.pl
index fa93251351..6c00598696 100644
--- a/tta/perl/t/results/menu/detailmenu_unknown_node.pl
+++ b/tta/perl/t/results/menu/detailmenu_unknown_node.pl
@@ -13,6 +13,7 @@ $result_tree_text{'detailmenu_unknown_node'} = 
'*document_root C2
  |EXTRA
  |is_target:{1}
  |menus:EC[E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/menu/direntry_dircategory_after_first_node.pl 
b/tta/perl/t/results/menu/direntry_dircategory_after_first_node.pl
index 4ea757daca..57270b404a 100644
--- a/tta/perl/t/results/menu/direntry_dircategory_after_first_node.pl
+++ b/tta/perl/t/results/menu/direntry_dircategory_after_first_node.pl
@@ -14,6 +14,7 @@ $result_tree_text{'direntry_dircategory_after_first_node'} = 
'*document_root C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -29,6 +30,7 @@ $result_tree_text{'direntry_dircategory_after_first_node'} = 
'*document_root C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/menu/empty_leading_menu_comment.pl 
b/tta/perl/t/results/menu/empty_leading_menu_comment.pl
index a5d24252a1..62184f5d2c 100644
--- a/tta/perl/t/results/menu/empty_leading_menu_comment.pl
+++ b/tta/perl/t/results/menu/empty_leading_menu_comment.pl
@@ -13,6 +13,7 @@ $result_tree_text{'empty_leading_menu_comment'} = 
'*document_root C2
  |EXTRA
  |is_target:{1}
  |menus:EC[E1]
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/menu/empty_menu_description.pl 
b/tta/perl/t/results/menu/empty_menu_description.pl
index f8f500d39b..fc0a898132 100644
--- a/tta/perl/t/results/menu/empty_menu_description.pl
+++ b/tta/perl/t/results/menu/empty_menu_description.pl
@@ -13,6 +13,7 @@ $result_tree_text{'empty_menu_description'} = '*document_root 
C2
  |EXTRA
  |is_target:{1}
  |menus:EC[E1]
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/menu/empty_menu_entry_name.pl 
b/tta/perl/t/results/menu/empty_menu_entry_name.pl
index 6aa866699f..b7d0c030bf 100644
--- a/tta/perl/t/results/menu/empty_menu_entry_name.pl
+++ b/tta/perl/t/results/menu/empty_menu_entry_name.pl
@@ -13,6 +13,7 @@ $result_tree_text{'empty_menu_entry_name'} = '*document_root 
C3
  |EXTRA
  |is_target:{1}
  |menus:EC[E1]
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
@@ -74,6 +75,7 @@ $result_tree_text{'empty_menu_entry_name'} = '*document_root 
C3
  |is_target:{1}
  |menu_directions:D[prev->MISSING: (menu_entry_node)[C3]|up->E0]
  |node_directions:D[up->E0]
+ |node_number:{2}
  |normalized:{aaa}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/menu/entry_after_detailmenu.pl 
b/tta/perl/t/results/menu/entry_after_detailmenu.pl
index ec553d675f..d825715792 100644
--- a/tta/perl/t/results/menu/entry_after_detailmenu.pl
+++ b/tta/perl/t/results/menu/entry_after_detailmenu.pl
@@ -14,6 +14,7 @@ $result_tree_text{'entry_after_detailmenu'} = '*document_root 
C4
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -138,6 +139,7 @@ $result_tree_text{'entry_after_detailmenu'} = 
'*document_root C4
  |is_target:{1}
  |menu_directions:D[next->E3|up->E0]
  |node_directions:D[next->E3|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap-first}
   *arguments_line C1
    *line_arg C1
@@ -153,6 +155,7 @@ $result_tree_text{'entry_after_detailmenu'} = 
'*document_root C4
  |is_target:{1}
  |menu_directions:D[prev->E2|up->E0]
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{second}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/menu/example_in_menu_description.pl 
b/tta/perl/t/results/menu/example_in_menu_description.pl
index ac54b6e43a..79599355e6 100644
--- a/tta/perl/t/results/menu/example_in_menu_description.pl
+++ b/tta/perl/t/results/menu/example_in_menu_description.pl
@@ -15,6 +15,7 @@ $result_tree_text{'example_in_menu_description'} = 
'*document_root C3
  |associated_title_command:[E1]
  |is_target:{1}
  |menus:EC[E2]
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
@@ -30,6 +31,7 @@ $result_tree_text{'example_in_menu_description'} = 
'*document_root C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/menu/format_menu_undef.pl 
b/tta/perl/t/results/menu/format_menu_undef.pl
index 0420d754a5..0b7805001a 100644
--- a/tta/perl/t/results/menu/format_menu_undef.pl
+++ b/tta/perl/t/results/menu/format_menu_undef.pl
@@ -15,6 +15,7 @@ $result_tree_text{'format_menu_undef'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'format_menu_undef'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -53,6 +55,7 @@ $result_tree_text{'format_menu_undef'} = '*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -68,8 +71,9 @@ $result_tree_text{'format_menu_undef'} = '*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/menu/formats_in_menu.pl 
b/tta/perl/t/results/menu/formats_in_menu.pl
index f8bb82afef..a72f30849d 100644
--- a/tta/perl/t/results/menu/formats_in_menu.pl
+++ b/tta/perl/t/results/menu/formats_in_menu.pl
@@ -13,6 +13,7 @@ $result_tree_text{'formats_in_menu'} = '*document_root C2
  |EXTRA
  |is_target:{1}
  |menus:EC[E1]
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/menu/inlineraw_in_menu_description.pl 
b/tta/perl/t/results/menu/inlineraw_in_menu_description.pl
index 06ab9e6e3b..df2db310ed 100644
--- a/tta/perl/t/results/menu/inlineraw_in_menu_description.pl
+++ b/tta/perl/t/results/menu/inlineraw_in_menu_description.pl
@@ -15,6 +15,7 @@ $result_tree_text{'inlineraw_in_menu_description'} = 
'*document_root C3
  |associated_title_command:[E1]
  |is_target:{1}
  |menus:EC[E2]
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
@@ -30,6 +31,7 @@ $result_tree_text{'inlineraw_in_menu_description'} = 
'*document_root C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/menu/invalid_info_menu_entry.pl 
b/tta/perl/t/results/menu/invalid_info_menu_entry.pl
index af616c4898..fe6c01f20e 100644
--- a/tta/perl/t/results/menu/invalid_info_menu_entry.pl
+++ b/tta/perl/t/results/menu/invalid_info_menu_entry.pl
@@ -13,6 +13,7 @@ $result_tree_text{'invalid_info_menu_entry'} = 
'*document_root C2
  |EXTRA
  |is_target:{1}
  |menus:EC[E1]
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/menu/leading_space_before_menu_star.pl 
b/tta/perl/t/results/menu/leading_space_before_menu_star.pl
index 49cebe4aba..3fc4c17119 100644
--- a/tta/perl/t/results/menu/leading_space_before_menu_star.pl
+++ b/tta/perl/t/results/menu/leading_space_before_menu_star.pl
@@ -13,6 +13,7 @@ $result_tree_text{'leading_space_before_menu_star'} = 
'*document_root C2
  |EXTRA
  |is_target:{1}
  |menus:EC[E1]
+ |node_number:{1}
  |normalized:{a-node}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/menu/menu_in_deffn.pl 
b/tta/perl/t/results/menu/menu_in_deffn.pl
index 1e1510ac7f..5d9f5d982f 100644
--- a/tta/perl/t/results/menu/menu_in_deffn.pl
+++ b/tta/perl/t/results/menu/menu_in_deffn.pl
@@ -12,6 +12,7 @@ $result_tree_text{'menu_in_deffn'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/menu/menu_in_example.pl 
b/tta/perl/t/results/menu/menu_in_example.pl
index ea2bad0d45..35c7d46985 100644
--- a/tta/perl/t/results/menu/menu_in_example.pl
+++ b/tta/perl/t/results/menu/menu_in_example.pl
@@ -12,6 +12,7 @@ $result_tree_text{'menu_in_example'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/menu/menu_node_unterminated.pl 
b/tta/perl/t/results/menu/menu_node_unterminated.pl
index cd746a14d6..c618661abb 100644
--- a/tta/perl/t/results/menu/menu_node_unterminated.pl
+++ b/tta/perl/t/results/menu/menu_node_unterminated.pl
@@ -13,6 +13,7 @@ $result_tree_text{'menu_node_unterminated'} = '*document_root 
C2
  |EXTRA
  |is_target:{1}
  |menus:EC[E1]
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/menu/menu_pointing_to_anchor.pl 
b/tta/perl/t/results/menu/menu_pointing_to_anchor.pl
index 8e2b714e18..174bb79e21 100644
--- a/tta/perl/t/results/menu/menu_pointing_to_anchor.pl
+++ b/tta/perl/t/results/menu/menu_pointing_to_anchor.pl
@@ -16,6 +16,7 @@ $result_tree_text{'menu_pointing_to_anchor'} = 
'*document_root C3
  |is_target:{1}
  |menus:EC[E3]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'menu_pointing_to_anchor'} = 
'*document_root C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/menu/menu_title_before_entries.pl 
b/tta/perl/t/results/menu/menu_title_before_entries.pl
index 4e7fc51860..5dcbf8f0f7 100644
--- a/tta/perl/t/results/menu/menu_title_before_entries.pl
+++ b/tta/perl/t/results/menu/menu_title_before_entries.pl
@@ -14,6 +14,7 @@ $result_tree_text{'menu_title_before_entries'} = 
'*document_root C3
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -62,6 +63,7 @@ $result_tree_text{'menu_title_before_entries'} = 
'*document_root C3
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap-subnode}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/menu/missing_detailmenu_on_subnodes.pl 
b/tta/perl/t/results/menu/missing_detailmenu_on_subnodes.pl
index 8bab0de466..7ab318ed0b 100644
--- a/tta/perl/t/results/menu/missing_detailmenu_on_subnodes.pl
+++ b/tta/perl/t/results/menu/missing_detailmenu_on_subnodes.pl
@@ -16,6 +16,7 @@ $result_tree_text{'missing_detailmenu_on_subnodes'} = 
'*document_root C13
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'missing_detailmenu_on_subnodes'} = 
'*document_root C13
  |associated_node:[E0]
  |section_childs:EC[E4|E9]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -137,6 +139,7 @@ $result_tree_text{'missing_detailmenu_on_subnodes'} = 
'*document_root C13
  |menu_directions:D[next->E8|up->E0]
  |menus:EC[E5]
  |node_directions:D[next->E8|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -153,8 +156,9 @@ $result_tree_text{'missing_detailmenu_on_subnodes'} = 
'*document_root C13
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[next->E9|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E9|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -202,6 +206,7 @@ $result_tree_text{'missing_detailmenu_on_subnodes'} = 
'*document_root C13
  |is_target:{1}
  |menu_directions:D[next->E11|prev->E8|up->E3]
  |node_directions:D[next->E11|prev->E8|up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -217,8 +222,9 @@ $result_tree_text{'missing_detailmenu_on_subnodes'} = 
'*document_root C13
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -237,6 +243,7 @@ $result_tree_text{'missing_detailmenu_on_subnodes'} = 
'*document_root C13
  |menu_directions:D[next->E6|prev->E3|up->E0]
  |menus:EC[E10]
  |node_directions:D[next->E6|prev->E3|up->E0]
+ |node_number:{4}
  |normalized:{chapter-2}
   *arguments_line C1
    *line_arg C1
@@ -253,8 +260,9 @@ $result_tree_text{'missing_detailmenu_on_subnodes'} = 
'*document_root C13
  |associated_node:[E8]
  |section_childs:EC[E12|E14]
  |section_directions:D[prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{4}
  |toplevel_directions:D[prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -313,6 +321,7 @@ $result_tree_text{'missing_detailmenu_on_subnodes'} = 
'*document_root C13
  |is_target:{1}
  |menu_directions:D[next->E13|prev->E6|up->E8]
  |node_directions:D[next->E13|prev->E6|up->E8]
+ |node_number:{5}
  |normalized:{section-chap-2}
   *arguments_line C1
    *line_arg C1
@@ -328,8 +337,9 @@ $result_tree_text{'missing_detailmenu_on_subnodes'} = 
'*document_root C13
  |associated_anchor_command:[E11]
  |associated_node:[E11]
  |section_directions:D[next->E14|up->E9]
+ |section_heading_number:{2.1}
  |section_level:{2}
- |section_number:{2.1}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -347,6 +357,7 @@ $result_tree_text{'missing_detailmenu_on_subnodes'} = 
'*document_root C13
  |is_target:{1}
  |menu_directions:D[prev->E11|up->E8]
  |node_directions:D[prev->E11|up->E8]
+ |node_number:{6}
  |normalized:{unnumberedsec}
   *arguments_line C1
    *line_arg C1
@@ -363,6 +374,7 @@ $result_tree_text{'missing_detailmenu_on_subnodes'} = 
'*document_root C13
  |associated_node:[E13]
  |section_directions:D[prev->E12|up->E9]
  |section_level:{2}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/menu/multiple_menus.pl 
b/tta/perl/t/results/menu/multiple_menus.pl
index ceb31116c4..60a90c5d6f 100644
--- a/tta/perl/t/results/menu/multiple_menus.pl
+++ b/tta/perl/t/results/menu/multiple_menus.pl
@@ -14,6 +14,7 @@ $result_tree_text{'multiple_menus'} = '*document_root C2
  |is_target:{1}
  |menus:EC[E1|E2]
  |node_directions:D[next->MISSING: (menu_entry_node)[C4]]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/menu/no_colon_in_menu.pl 
b/tta/perl/t/results/menu/no_colon_in_menu.pl
index 8a0aaa25f0..11ea99d592 100644
--- a/tta/perl/t/results/menu/no_colon_in_menu.pl
+++ b/tta/perl/t/results/menu/no_colon_in_menu.pl
@@ -13,6 +13,7 @@ $result_tree_text{'no_colon_in_menu'} = '*document_root C2
  |EXTRA
  |is_target:{1}
  |menus:EC[E1]
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/menu/nodedescription_descriptions.pl 
b/tta/perl/t/results/menu/nodedescription_descriptions.pl
index bef3101643..0d710caaed 100644
--- a/tta/perl/t/results/menu/nodedescription_descriptions.pl
+++ b/tta/perl/t/results/menu/nodedescription_descriptions.pl
@@ -16,6 +16,7 @@ $result_tree_text{'nodedescription_descriptions'} = 
'*document_root C17
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'nodedescription_descriptions'} = 
'*document_root C17
  |associated_node:[E0]
  |section_childs:EC[E4|E7|E10|E13|E16|E19|E22]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -160,6 +162,7 @@ $result_tree_text{'nodedescription_descriptions'} = 
'*document_root C17
  |menu_directions:D[next->E6|up->E0]
  |node_description:[E5]
  |node_directions:D[next->E6|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{toto}
   *arguments_line C1
    *line_arg C1
@@ -175,8 +178,9 @@ $result_tree_text{'nodedescription_descriptions'} = 
'*document_root C17
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E7|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E7|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -228,6 +232,7 @@ $result_tree_text{'nodedescription_descriptions'} = 
'*document_root C17
  |menu_directions:D[next->E9|prev->E3|up->E0]
  |node_description:[E8]
  |node_directions:D[next->E9|prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{titi}
   *arguments_line C1
    *line_arg C1
@@ -243,8 +248,9 @@ $result_tree_text{'nodedescription_descriptions'} = 
'*document_root C17
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[next->E10|prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E10|prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -276,6 +282,7 @@ $result_tree_text{'nodedescription_descriptions'} = 
'*document_root C17
  |menu_directions:D[next->E12|prev->E6|up->E0]
  |node_description:[E11]
  |node_directions:D[next->E12|prev->E6|up->E0]
+ |node_number:{4}
  |normalized:{other}
   *arguments_line C1
    *line_arg C1
@@ -291,8 +298,9 @@ $result_tree_text{'nodedescription_descriptions'} = 
'*document_root C17
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[next->E13|prev->E7|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{4}
  |toplevel_directions:D[next->E13|prev->E7|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -324,6 +332,7 @@ $result_tree_text{'nodedescription_descriptions'} = 
'*document_root C17
  |menu_directions:D[next->E15|prev->E9|up->E0]
  |node_description:[E14]
  |node_directions:D[next->E15|prev->E9|up->E0]
+ |node_number:{5}
  |normalized:{last}
   *arguments_line C1
    *line_arg C1
@@ -339,8 +348,9 @@ $result_tree_text{'nodedescription_descriptions'} = 
'*document_root C17
  |associated_anchor_command:[E12]
  |associated_node:[E12]
  |section_directions:D[next->E16|prev->E10|up->E1]
+ |section_heading_number:{4}
  |section_level:{1}
- |section_number:{4}
+ |section_number:{5}
  |toplevel_directions:D[next->E16|prev->E10|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -372,6 +382,7 @@ $result_tree_text{'nodedescription_descriptions'} = 
'*document_root C17
  |menu_directions:D[next->E18|prev->E12|up->E0]
  |node_description:[E17]
  |node_directions:D[next->E18|prev->E12|up->E0]
+ |node_number:{6}
  |normalized:{a-somewhat-long-node-without-description-nor-following-space}
   *arguments_line C1
    *line_arg C1
@@ -387,8 +398,9 @@ $result_tree_text{'nodedescription_descriptions'} = 
'*document_root C17
  |associated_anchor_command:[E15]
  |associated_node:[E15]
  |section_directions:D[next->E19|prev->E13|up->E1]
+ |section_heading_number:{5}
  |section_level:{1}
- |section_number:{5}
+ |section_number:{6}
  |toplevel_directions:D[next->E19|prev->E13|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -420,6 +432,7 @@ $result_tree_text{'nodedescription_descriptions'} = 
'*document_root C17
  |menu_directions:D[next->E21|prev->E15|up->E0]
  |node_description:[E20]
  |node_directions:D[next->E21|prev->E15|up->E0]
+ |node_number:{7}
  
|normalized:{a-very-long-node-without-description-with-very-little-space-left-for}
   *arguments_line C1
    *line_arg C1
@@ -435,8 +448,9 @@ $result_tree_text{'nodedescription_descriptions'} = 
'*document_root C17
  |associated_anchor_command:[E18]
  |associated_node:[E18]
  |section_directions:D[next->E22|prev->E16|up->E1]
+ |section_heading_number:{6}
  |section_level:{1}
- |section_number:{6}
+ |section_number:{7}
  |toplevel_directions:D[next->E22|prev->E16|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -468,6 +482,7 @@ $result_tree_text{'nodedescription_descriptions'} = 
'*document_root C17
  |menu_directions:D[prev->E18|up->E0]
  |node_description:[E23]
  |node_directions:D[prev->E18|up->E0]
+ |node_number:{8}
  
|normalized:{very-very-long-node-extending-past-the-max-columns-and-without-description}
   *arguments_line C1
    *line_arg C1
@@ -483,8 +498,9 @@ $result_tree_text{'nodedescription_descriptions'} = 
'*document_root C17
  |associated_anchor_command:[E21]
  |associated_node:[E21]
  |section_directions:D[prev->E19|up->E1]
+ |section_heading_number:{7}
  |section_level:{1}
- |section_number:{7}
+ |section_number:{8}
  |toplevel_directions:D[prev->E19|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/menu/nodedescriptionblock_descriptions.pl 
b/tta/perl/t/results/menu/nodedescriptionblock_descriptions.pl
index 879ae24bc7..a1a0e3bf05 100644
--- a/tta/perl/t/results/menu/nodedescriptionblock_descriptions.pl
+++ b/tta/perl/t/results/menu/nodedescriptionblock_descriptions.pl
@@ -16,6 +16,7 @@ $result_tree_text{'nodedescriptionblock_descriptions'} = 
'*document_root C13
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'nodedescriptionblock_descriptions'} = 
'*document_root C13
  |associated_node:[E0]
  |section_childs:EC[E4|E8|E11|E14|E18]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -136,6 +138,7 @@ $result_tree_text{'nodedescriptionblock_descriptions'} = 
'*document_root C13
  |node_description:[E5]
  |node_directions:D[next->E7|prev->E0|up->E0]
  |node_long_description:[E6]
+ |node_number:{2}
  |normalized:{toto}
   *arguments_line C1
    *line_arg C1
@@ -151,8 +154,9 @@ $result_tree_text{'nodedescriptionblock_descriptions'} = 
'*document_root C13
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E8|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E8|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -227,6 +231,7 @@ $result_tree_text{'nodedescriptionblock_descriptions'} = 
'*document_root C13
  |node_description:[E9]
  |node_directions:D[next->E10|prev->E3|up->E0]
  |node_long_description:[E9]
+ |node_number:{3}
  |normalized:{titi}
   *arguments_line C1
    *line_arg C1
@@ -242,8 +247,9 @@ $result_tree_text{'nodedescriptionblock_descriptions'} = 
'*document_root C13
  |associated_anchor_command:[E7]
  |associated_node:[E7]
  |section_directions:D[next->E11|prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E11|prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -286,6 +292,7 @@ $result_tree_text{'nodedescriptionblock_descriptions'} = 
'*document_root C13
  |node_description:[E12]
  |node_directions:D[next->E13|prev->E7|up->E0]
  |node_long_description:[E12]
+ |node_number:{4}
  |normalized:{other}
   *arguments_line C1
    *line_arg C1
@@ -301,8 +308,9 @@ $result_tree_text{'nodedescriptionblock_descriptions'} = 
'*document_root C13
  |associated_anchor_command:[E10]
  |associated_node:[E10]
  |section_directions:D[next->E14|prev->E8|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{4}
  |toplevel_directions:D[next->E14|prev->E8|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -368,6 +376,7 @@ $result_tree_text{'nodedescriptionblock_descriptions'} = 
'*document_root C13
  |node_description:[E16]
  |node_directions:D[next->E17|prev->E10|up->E0]
  |node_long_description:[E15]
+ |node_number:{5}
  |normalized:{a-somewhat-long-node-without-description-nor-following-space}
   *arguments_line C1
    *line_arg C1
@@ -383,8 +392,9 @@ $result_tree_text{'nodedescriptionblock_descriptions'} = 
'*document_root C13
  |associated_anchor_command:[E13]
  |associated_node:[E13]
  |section_directions:D[next->E18|prev->E11|up->E1]
+ |section_heading_number:{4}
  |section_level:{1}
- |section_number:{4}
+ |section_number:{5}
  |toplevel_directions:D[next->E18|prev->E11|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -439,6 +449,7 @@ $result_tree_text{'nodedescriptionblock_descriptions'} = 
'*document_root C13
  |node_description:[E19]
  |node_directions:D[prev->E13|up->E0]
  |node_long_description:[E19]
+ |node_number:{6}
  |normalized:{node-double-nodedescriptionblock}
   *arguments_line C1
    *line_arg C1
@@ -454,8 +465,9 @@ $result_tree_text{'nodedescriptionblock_descriptions'} = 
'*document_root C13
  |associated_anchor_command:[E17]
  |associated_node:[E17]
  |section_directions:D[prev->E14|up->E1]
+ |section_heading_number:{5}
  |section_level:{1}
- |section_number:{5}
+ |section_number:{6}
  |toplevel_directions:D[prev->E14|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/menu/part_appendix_in_generated_menu.pl 
b/tta/perl/t/results/menu/part_appendix_in_generated_menu.pl
index 901ec73fd3..a09661f57b 100644
--- a/tta/perl/t/results/menu/part_appendix_in_generated_menu.pl
+++ b/tta/perl/t/results/menu/part_appendix_in_generated_menu.pl
@@ -15,6 +15,7 @@ $result_tree_text{'part_appendix_in_generated_menu'} = 
'*document_root C12
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'part_appendix_in_generated_menu'} = 
'*document_root C12
  |section_childs:EC[E3]
  |section_directions:D[next->E6]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -55,6 +57,7 @@ $result_tree_text{'part_appendix_in_generated_menu'} = 
'*document_root C12
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E7|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -71,8 +74,9 @@ $result_tree_text{'part_appendix_in_generated_menu'} = 
'*document_root C12
  |associated_node:[E2]
  |section_childs:EC[E5]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E8|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -90,6 +94,7 @@ $result_tree_text{'part_appendix_in_generated_menu'} = 
'*document_root C12
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[up->E2]
+ |node_number:{3}
  |normalized:{sec}
   *arguments_line C1
    *line_arg C1
@@ -105,8 +110,9 @@ $result_tree_text{'part_appendix_in_generated_menu'} = 
'*document_root C12
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[up->E3]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -125,6 +131,7 @@ $result_tree_text{'part_appendix_in_generated_menu'} = 
'*document_root C12
  |section_childs:EC[E8]
  |section_directions:D[next->E10|prev->E1]
  |section_level:{0}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -141,6 +148,7 @@ $result_tree_text{'part_appendix_in_generated_menu'} = 
'*document_root C12
  |associated_title_command:[E8]
  |is_target:{1}
  |node_directions:D[next->E9|prev->E2|up->E0]
+ |node_number:{4}
  |node_preceding_part:[E6]
  |normalized:{chap2}
   *arguments_line C1
@@ -158,8 +166,9 @@ $result_tree_text{'part_appendix_in_generated_menu'} = 
'*document_root C12
  |associated_node:[E7]
  |associated_part:[E6]
  |section_directions:D[up->E6]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{5}
  |toplevel_directions:D[next->E10|prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -177,6 +186,7 @@ $result_tree_text{'part_appendix_in_generated_menu'} = 
'*document_root C12
  |associated_title_command:[E10]
  |is_target:{1}
  |node_directions:D[prev->E7|up->E0]
+ |node_number:{5}
  |normalized:{app}
   *arguments_line C1
    *line_arg C1
@@ -192,8 +202,9 @@ $result_tree_text{'part_appendix_in_generated_menu'} = 
'*document_root C12
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[prev->E6]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{6}
  |toplevel_directions:D[prev->E8|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/menu/reference_to_external_manual.pl 
b/tta/perl/t/results/menu/reference_to_external_manual.pl
index 95a71d4e39..2394d7126e 100644
--- a/tta/perl/t/results/menu/reference_to_external_manual.pl
+++ b/tta/perl/t/results/menu/reference_to_external_manual.pl
@@ -14,6 +14,7 @@ $result_tree_text{'reference_to_external_manual'} = 
'*document_root C2
  |EXTRA
  |is_target:{1}
  |menus:EC[E1]
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/menu/sc_in_menu.pl 
b/tta/perl/t/results/menu/sc_in_menu.pl
index 78972079a8..80cdd531ee 100644
--- a/tta/perl/t/results/menu/sc_in_menu.pl
+++ b/tta/perl/t/results/menu/sc_in_menu.pl
@@ -14,6 +14,7 @@ $result_tree_text{'sc_in_menu'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |menus:EC[E1]
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
@@ -113,6 +114,7 @@ $result_tree_text{'sc_in_menu'} = '*document_root C3
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[up->E0]
+ |node_number:{2}
  |normalized:{node}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/menu/space_and_commands_in_menu_node.pl 
b/tta/perl/t/results/menu/space_and_commands_in_menu_node.pl
index 5c4bb920a6..0e91809f65 100644
--- a/tta/perl/t/results/menu/space_and_commands_in_menu_node.pl
+++ b/tta/perl/t/results/menu/space_and_commands_in_menu_node.pl
@@ -16,6 +16,7 @@ $result_tree_text{'space_and_commands_in_menu_node'} = 
'*document_root C5
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'space_and_commands_in_menu_node'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -195,6 +197,7 @@ $result_tree_text{'space_and_commands_in_menu_node'} = 
'*document_root C5
  |is_target:{1}
  |menu_directions:D[next->E3|prev->E3|up->E0]
  |node_directions:D[next->E3|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap-b}
   *arguments_line C1
    *line_arg C3
@@ -212,8 +215,9 @@ $result_tree_text{'space_and_commands_in_menu_node'} = 
'*document_root C5
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/menu/submenu_in_example.pl 
b/tta/perl/t/results/menu/submenu_in_example.pl
index a20e24ee44..296a03f4b7 100644
--- a/tta/perl/t/results/menu/submenu_in_example.pl
+++ b/tta/perl/t/results/menu/submenu_in_example.pl
@@ -13,6 +13,7 @@ $result_tree_text{'submenu_in_example'} = '*document_root C2
  |EXTRA
  |associated_title_command:[E5]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
@@ -131,6 +132,7 @@ $result_tree_text{'submenu_in_example'} = '*document_root C2
      |EXTRA
      |associated_anchor_command:[E0]
      |global_command_number:{1}
+     |heading_number:{1}
       *line_arg C1
       |INFO
       |spaces_after_argument:
diff --git a/tta/perl/t/results/menu/verb_in_menu_description.pl 
b/tta/perl/t/results/menu/verb_in_menu_description.pl
index 7dec3a0cf2..5f9d50132d 100644
--- a/tta/perl/t/results/menu/verb_in_menu_description.pl
+++ b/tta/perl/t/results/menu/verb_in_menu_description.pl
@@ -15,6 +15,7 @@ $result_tree_text{'verb_in_menu_description'} = 
'*document_root C3
  |associated_title_command:[E1]
  |is_target:{1}
  |menus:EC[E2]
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
@@ -30,6 +31,7 @@ $result_tree_text{'verb_in_menu_description'} = 
'*document_root C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/misc_commands/also_not_line.pl 
b/tta/perl/t/results/misc_commands/also_not_line.pl
index 19fd106069..21f6c664e0 100644
--- a/tta/perl/t/results/misc_commands/also_not_line.pl
+++ b/tta/perl/t/results/misc_commands/also_not_line.pl
@@ -61,6 +61,7 @@ $result_tree_text{'also_not_line'} = '*document_root C1
    |{ }
   |EXTRA
   |global_command_number:{1}
+  |heading_number:{1}
    *line_arg C1
    |INFO
    |spaces_after_argument:
diff --git 
a/tta/perl/t/results/misc_commands/codequoteundirected_codequotebacktick.pl 
b/tta/perl/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
index 7c46b6e353..0d61f79f89 100644
--- a/tta/perl/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/tta/perl/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -387,6 +387,7 @@ $result_tree_text{'codequoteundirected_codequotebacktick'} 
= '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -403,6 +404,7 @@ $result_tree_text{'codequoteundirected_codequotebacktick'} 
= '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -425,6 +427,7 @@ $result_tree_text{'codequoteundirected_codequotebacktick'} 
= '*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -440,8 +443,9 @@ $result_tree_text{'codequoteundirected_codequotebacktick'} 
= '*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/misc_commands/comment_space_command_on_line.pl 
b/tta/perl/t/results/misc_commands/comment_space_command_on_line.pl
index eec97f2528..100e1e29cd 100644
--- a/tta/perl/t/results/misc_commands/comment_space_command_on_line.pl
+++ b/tta/perl/t/results/misc_commands/comment_space_command_on_line.pl
@@ -27,6 +27,7 @@ $result_tree_text{'comment_space_command_on_line'} = 
'*document_root C6
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -46,6 +47,7 @@ $result_tree_text{'comment_space_command_on_line'} = 
'*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -73,6 +75,7 @@ $result_tree_text{'comment_space_command_on_line'} = 
'*document_root C6
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -91,8 +94,9 @@ $result_tree_text{'comment_space_command_on_line'} = 
'*document_root C6
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C2
@@ -159,6 +163,7 @@ $result_tree_text{'comment_space_command_on_line'} = 
'*document_root C6
    |{ }
   |EXTRA
   |global_command_number:{1}
+  |heading_number:{1}
    *line_arg C2
    |INFO
    |comment_at_end:
diff --git a/tta/perl/t/results/misc_commands/no_empty_line_between_headings.pl 
b/tta/perl/t/results/misc_commands/no_empty_line_between_headings.pl
index 0a0a3e59c9..2a4f10393e 100644
--- a/tta/perl/t/results/misc_commands/no_empty_line_between_headings.pl
+++ b/tta/perl/t/results/misc_commands/no_empty_line_between_headings.pl
@@ -13,6 +13,7 @@ $result_tree_text{'no_empty_line_between_headings'} = 
'*document_root C4
  |EXTRA
  |section_childs:EC[E2]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -31,6 +32,7 @@ $result_tree_text{'no_empty_line_between_headings'} = 
'*document_root C4
    |{ }
   |EXTRA
   |global_command_number:{1}
+  |heading_number:{1}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -43,8 +45,9 @@ $result_tree_text{'no_empty_line_between_headings'} = 
'*document_root C4
  |EXTRA
  |section_childs:EC[E3]
  |section_directions:D[up->E0]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E0|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -58,8 +61,9 @@ $result_tree_text{'no_empty_line_between_headings'} = 
'*document_root C4
   |{ }
  |EXTRA
  |section_directions:D[up->E2]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/misc_commands/nodedescription.pl 
b/tta/perl/t/results/misc_commands/nodedescription.pl
index f387f64406..7f9bee309a 100644
--- a/tta/perl/t/results/misc_commands/nodedescription.pl
+++ b/tta/perl/t/results/misc_commands/nodedescription.pl
@@ -25,6 +25,7 @@ $result_tree_text{'nodedescription'} = '*document_root C5
  |associated_title_command:[E2]
  |is_target:{1}
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -41,6 +42,7 @@ $result_tree_text{'nodedescription'} = '*document_root C5
  |associated_node:[E1]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -64,6 +66,7 @@ $result_tree_text{'nodedescription'} = '*document_root C5
  |is_target:{1}
  |node_description:[E5]
  |node_directions:D[prev->E1|up->E1]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -79,8 +82,9 @@ $result_tree_text{'nodedescription'} = '*document_root C5
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E2]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E2|up->E2]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/misc_commands/ref_in_center.pl 
b/tta/perl/t/results/misc_commands/ref_in_center.pl
index 981556190a..924fd84489 100644
--- a/tta/perl/t/results/misc_commands/ref_in_center.pl
+++ b/tta/perl/t/results/misc_commands/ref_in_center.pl
@@ -16,6 +16,7 @@ $result_tree_text{'ref_in_center'} = '*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'ref_in_center'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'ref_in_center'} = '*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'ref_in_center'} = '*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/misc_commands/test_allowcodebreaks.pl 
b/tta/perl/t/results/misc_commands/test_allowcodebreaks.pl
index e0ebd53b48..1b76129fbe 100644
--- a/tta/perl/t/results/misc_commands/test_allowcodebreaks.pl
+++ b/tta/perl/t/results/misc_commands/test_allowcodebreaks.pl
@@ -14,6 +14,7 @@ $result_tree_text{'test_allowcodebreaks'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -28,6 +29,7 @@ $result_tree_text{'test_allowcodebreaks'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/misc_commands/text_before_line_command.pl 
b/tta/perl/t/results/misc_commands/text_before_line_command.pl
index 1977ab63d4..4cb3b068c4 100644
--- a/tta/perl/t/results/misc_commands/text_before_line_command.pl
+++ b/tta/perl/t/results/misc_commands/text_before_line_command.pl
@@ -28,6 +28,7 @@ $result_tree_text{'text_before_line_command'} = 
'*document_root C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{LD-Version-Scripts}
   *arguments_line C1
    *line_arg C1
@@ -44,6 +45,7 @@ $result_tree_text{'text_before_line_command'} = 
'*document_root C3
  |EXTRA
  |associated_anchor_command:[E0]
  |associated_node:[E0]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
diff --git a/tta/perl/t/results/moresectioning/anchor_in_footnote.pl 
b/tta/perl/t/results/moresectioning/anchor_in_footnote.pl
index b445629f87..4494b0170b 100644
--- a/tta/perl/t/results/moresectioning/anchor_in_footnote.pl
+++ b/tta/perl/t/results/moresectioning/anchor_in_footnote.pl
@@ -16,6 +16,7 @@ $result_tree_text{'anchor_in_footnote'} = '*document_root C5
  |is_target:{1}
  |menus:EC[E3]
  |node_directions:D[next->E4]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'anchor_in_footnote'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -101,6 +103,7 @@ $result_tree_text{'anchor_in_footnote'} = '*document_root C5
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -116,8 +119,9 @@ $result_tree_text{'anchor_in_footnote'} = '*document_root C5
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/moresectioning/anchor_in_footnote_separate.pl 
b/tta/perl/t/results/moresectioning/anchor_in_footnote_separate.pl
index 1bb96d1eeb..3c9addc762 100644
--- a/tta/perl/t/results/moresectioning/anchor_in_footnote_separate.pl
+++ b/tta/perl/t/results/moresectioning/anchor_in_footnote_separate.pl
@@ -27,6 +27,7 @@ $result_tree_text{'anchor_in_footnote_separate'} = 
'*document_root C5
  |is_target:{1}
  |menus:EC[E3]
  |node_directions:D[next->E4]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -43,6 +44,7 @@ $result_tree_text{'anchor_in_footnote_separate'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -112,6 +114,7 @@ $result_tree_text{'anchor_in_footnote_separate'} = 
'*document_root C5
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -127,8 +130,9 @@ $result_tree_text{'anchor_in_footnote_separate'} = 
'*document_root C5
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/moresectioning/anchor_in_footnote_separate_split_node.pl 
b/tta/perl/t/results/moresectioning/anchor_in_footnote_separate_split_node.pl
index c0c9352b01..7e9edc2ae3 100644
--- 
a/tta/perl/t/results/moresectioning/anchor_in_footnote_separate_split_node.pl
+++ 
b/tta/perl/t/results/moresectioning/anchor_in_footnote_separate_split_node.pl
@@ -28,6 +28,7 @@ $result_tree_text{'anchor_in_footnote_separate_split_node'} = 
'*document_root C5
  |is_target:{1}
  |menus:EC[E3]
  |node_directions:D[next->E4]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -44,6 +45,7 @@ $result_tree_text{'anchor_in_footnote_separate_split_node'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -113,6 +115,7 @@ $result_tree_text{'anchor_in_footnote_separate_split_node'} 
= '*document_root C5
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -128,8 +131,9 @@ $result_tree_text{'anchor_in_footnote_separate_split_node'} 
= '*document_root C5
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/moresectioning/anchor_in_footnote_split_node.pl 
b/tta/perl/t/results/moresectioning/anchor_in_footnote_split_node.pl
index 0b6877d454..d00090be46 100644
--- a/tta/perl/t/results/moresectioning/anchor_in_footnote_split_node.pl
+++ b/tta/perl/t/results/moresectioning/anchor_in_footnote_split_node.pl
@@ -17,6 +17,7 @@ $result_tree_text{'anchor_in_footnote_split_node'} = 
'*document_root C5
  |is_target:{1}
  |menus:EC[E3]
  |node_directions:D[next->E4]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -33,6 +34,7 @@ $result_tree_text{'anchor_in_footnote_split_node'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -102,6 +104,7 @@ $result_tree_text{'anchor_in_footnote_split_node'} = 
'*document_root C5
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -117,8 +120,9 @@ $result_tree_text{'anchor_in_footnote_split_node'} = 
'*document_root C5
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/moresectioning/chapter_sections.pl 
b/tta/perl/t/results/moresectioning/chapter_sections.pl
index 8ed2f05ba1..f3313ac5b6 100644
--- a/tta/perl/t/results/moresectioning/chapter_sections.pl
+++ b/tta/perl/t/results/moresectioning/chapter_sections.pl
@@ -19,6 +19,7 @@ Next: [U1]
  |EXTRA
  |section_directions:D[next->E1]
  |section_level:{1}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -49,8 +50,9 @@ Prev: [U0]
  |EXTRA
  |section_childs:EC[E2]
  |section_directions:D[next->E3|prev->E0]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E3|prev->E0]
   *arguments_line C1
    *line_arg C1
@@ -74,8 +76,9 @@ Up: [U1]
   |{ }
  |EXTRA
  |section_directions:D[up->E1]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -100,8 +103,9 @@ Prev: [U1]
  |EXTRA
  |section_childs:EC[E4]
  |section_directions:D[next->E7|prev->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{4}
  |toplevel_directions:D[next->E7|prev->E1]
   *arguments_line C1
    *line_arg C1
@@ -126,8 +130,9 @@ Up: [U3]
  |EXTRA
  |section_childs:EC[E5|E6]
  |section_directions:D[up->E3]
+ |section_heading_number:{2.1}
  |section_level:{2}
- |section_number:{2.1}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -151,8 +156,9 @@ Up: [U4]
   |{ }
  |EXTRA
  |section_directions:D[next->E6|up->E4]
+ |section_heading_number:{2.1.1}
  |section_level:{3}
- |section_number:{2.1.1}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -176,8 +182,9 @@ Up: [U4]
   |{ }
  |EXTRA
  |section_directions:D[prev->E5|up->E4]
+ |section_heading_number:{2.1.2}
  |section_level:{3}
- |section_number:{2.1.2}
+ |section_number:{7}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -198,8 +205,9 @@ Prev: [U3]
   |{ }
  |EXTRA
  |section_directions:D[prev->E3]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{8}
  |toplevel_directions:D[prev->E3]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/moresectioning/character_and_spaces_in_refs.pl 
b/tta/perl/t/results/moresectioning/character_and_spaces_in_refs.pl
index e093d116f1..d99a5c979f 100644
--- a/tta/perl/t/results/moresectioning/character_and_spaces_in_refs.pl
+++ b/tta/perl/t/results/moresectioning/character_and_spaces_in_refs.pl
@@ -17,6 +17,7 @@ $result_tree_text{'character_and_spaces_in_refs'} = 
'*document_root C11
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -33,6 +34,7 @@ $result_tree_text{'character_and_spaces_in_refs'} = 
'*document_root C11
  |associated_node:[E0]
  |section_childs:EC[E4|E8]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -96,6 +98,7 @@ $result_tree_text{'character_and_spaces_in_refs'} = 
'*document_root C11
  |is_target:{1}
  |menu_directions:D[next->E7|up->E0]
  |node_directions:D[next->E7|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node-to-avoid-DocBook-or-LaTeX-ignored}
   *arguments_line C1
    *line_arg C1
@@ -111,8 +114,9 @@ $result_tree_text{'character_and_spaces_in_refs'} = 
'*document_root C11
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E8|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E8|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -127,6 +131,7 @@ $result_tree_text{'character_and_spaces_in_refs'} = 
'*document_root C11
    |{ }
   |EXTRA
   |global_command_number:{1}
+  |heading_number:{1}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -210,6 +215,7 @@ $result_tree_text{'character_and_spaces_in_refs'} = 
'*document_root C11
    |{ }
   |EXTRA
   |global_command_number:{2}
+  |heading_number:{2}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -263,6 +269,7 @@ $result_tree_text{'character_and_spaces_in_refs'} = 
'*document_root C11
  |menu_directions:D[prev->E3|up->E0]
  |menus:EC[E9]
  |node_directions:D[next->E10|prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{other-nodes}
   *arguments_line C4
    *line_arg C1
@@ -301,8 +308,9 @@ $result_tree_text{'character_and_spaces_in_refs'} = 
'*document_root C11
  |associated_anchor_command:[E7]
  |associated_node:[E7]
  |section_directions:D[prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -370,6 +378,7 @@ $result_tree_text{'character_and_spaces_in_refs'} = 
'*document_root C11
  |is_target:{1}
  |menu_directions:D[next->E11|up->E7]
  |node_directions:D[next->E11|prev->E7|up->E7]
+ |node_number:{4}
  
|normalized:{_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e}
   *arguments_line C4
    *line_arg C1
@@ -409,6 +418,7 @@ $result_tree_text{'character_and_spaces_in_refs'} = 
'*document_root C11
  |is_target:{1}
  |menu_directions:D[next->E12|prev->E10|up->E7]
  |node_directions:D[next->E12|prev->E10|up->E7]
+ |node_number:{5}
  
|normalized:{_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e}
   *arguments_line C4
    *line_arg C1
@@ -442,6 +452,7 @@ $result_tree_text{'character_and_spaces_in_refs'} = 
'*document_root C11
  |is_target:{1}
  |menu_directions:D[prev->E11|up->E7]
  |node_directions:D[prev->E11|up->E7]
+ |node_number:{6}
  |normalized:{local-node}
   *arguments_line C4
    *line_arg C1
diff --git 
a/tta/perl/t/results/moresectioning/character_and_spaces_in_refs_out.pl 
b/tta/perl/t/results/moresectioning/character_and_spaces_in_refs_out.pl
index b11d6690ee..0735b94081 100644
--- a/tta/perl/t/results/moresectioning/character_and_spaces_in_refs_out.pl
+++ b/tta/perl/t/results/moresectioning/character_and_spaces_in_refs_out.pl
@@ -24,6 +24,7 @@ NodeForward: [U1]
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -40,6 +41,7 @@ NodeForward: [U1]
  |associated_node:[E0]
  |section_childs:EC[E4|E8]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -118,6 +120,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[next->E7|up->E0]
  |node_directions:D[next->E7|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node-to-avoid-DocBook-or-LaTeX-ignored}
   *arguments_line C1
    *line_arg C1
@@ -133,8 +136,9 @@ NodeBack: [U0]
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E8|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E8|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -149,6 +153,7 @@ NodeBack: [U0]
    |{ }
   |EXTRA
   |global_command_number:{1}
+  |heading_number:{1}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -232,6 +237,7 @@ NodeBack: [U0]
    |{ }
   |EXTRA
   |global_command_number:{2}
+  |heading_number:{2}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -299,6 +305,7 @@ NodeBack: [U1]
  |menu_directions:D[prev->E3|up->E0]
  |menus:EC[E9]
  |node_directions:D[next->E10|prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{other-nodes}
   *arguments_line C4
    *line_arg C1
@@ -337,8 +344,9 @@ NodeBack: [U1]
  |associated_anchor_command:[E7]
  |associated_node:[E7]
  |section_directions:D[prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -418,6 +426,7 @@ NodeBack: [U2]
  |is_target:{1}
  |menu_directions:D[next->E11|up->E7]
  |node_directions:D[next->E11|prev->E7|up->E7]
+ |node_number:{4}
  
|normalized:{_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e}
   *arguments_line C4
    *line_arg C1
@@ -469,6 +478,7 @@ NodeBack: [U3]
  |is_target:{1}
  |menu_directions:D[next->E12|prev->E10|up->E7]
  |node_directions:D[next->E12|prev->E10|up->E7]
+ |node_number:{5}
  
|normalized:{_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e}
   *arguments_line C4
    *line_arg C1
@@ -512,6 +522,7 @@ NodeBack: [U4]
  |is_target:{1}
  |menu_directions:D[prev->E11|up->E7]
  |node_directions:D[prev->E11|up->E7]
+ |node_number:{6}
  |normalized:{local-node}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/moresectioning/complex.pl 
b/tta/perl/t/results/moresectioning/complex.pl
index d2ba29d8a0..b2e864ad7e 100644
--- a/tta/perl/t/results/moresectioning/complex.pl
+++ b/tta/perl/t/results/moresectioning/complex.pl
@@ -25,6 +25,7 @@ NodeForward: [U1]
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3|prev->MISSING: (line_arg)[C3]]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C3
    *line_arg C1
@@ -49,6 +50,7 @@ NodeForward: [U1]
  |associated_node:[E0]
  |section_childs:EC[E4|E26|E28|E30]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -169,6 +171,7 @@ NodeBack: [U0]
  |menu_directions:D[next->E24|up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{First-node}
   *arguments_line C4
    *line_arg C1
@@ -196,8 +199,9 @@ NodeBack: [U0]
  |associated_node:[E3]
  |section_childs:EC[E7|E18|E23]
  |section_directions:D[next->E26|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E26|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -287,6 +291,7 @@ NodeBack: [U1]
  |menu_directions:D[next->E17|up->E3]
  |menus:EC[E8]
  |node_directions:D[next->E17|up->E3]
+ |node_number:{3}
  |normalized:{unnumbered}
   *arguments_line C1
    *line_arg C1
@@ -304,6 +309,7 @@ NodeBack: [U1]
  |section_childs:EC[E10|E12|E14|E16]
  |section_directions:D[next->E18|up->E4]
  |section_level:{2}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -397,6 +403,7 @@ NodeBack: [U2]
  |is_target:{1}
  |menu_directions:D[next->E11|up->E6]
  |node_directions:D[next->E11|up->E6]
+ |node_number:{4}
  |normalized:{unnumbered-sub}
   *arguments_line C1
    *line_arg C1
@@ -413,6 +420,7 @@ NodeBack: [U2]
  |associated_node:[E9]
  |section_directions:D[next->E12|up->E7]
  |section_level:{3}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -446,6 +454,7 @@ NodeBack: [U3]
  |is_target:{1}
  |menu_directions:D[next->E13|prev->E9|up->E6]
  |node_directions:D[next->E13|prev->E9|up->E6]
+ |node_number:{5}
  |normalized:{numbered-sub}
   *arguments_line C1
    *line_arg C1
@@ -462,6 +471,7 @@ NodeBack: [U3]
  |associated_node:[E11]
  |section_directions:D[next->E14|prev->E10|up->E7]
  |section_level:{3}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -495,6 +505,7 @@ NodeBack: [U4]
  |is_target:{1}
  |menu_directions:D[next->E15|prev->E11|up->E6]
  |node_directions:D[next->E15|prev->E11|up->E6]
+ |node_number:{6}
  |normalized:{unnumbered-sub2}
   *arguments_line C1
    *line_arg C1
@@ -511,6 +522,7 @@ NodeBack: [U4]
  |associated_node:[E13]
  |section_directions:D[next->E16|prev->E12|up->E7]
  |section_level:{3}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -542,6 +554,7 @@ NodeBack: [U5]
  |is_target:{1}
  |menu_directions:D[prev->E13|up->E6]
  |node_directions:D[prev->E13|up->E6]
+ |node_number:{7}
  |normalized:{numbered-sub2}
   *arguments_line C1
    *line_arg C1
@@ -558,6 +571,7 @@ NodeBack: [U5]
  |associated_node:[E15]
  |section_directions:D[prev->E14|up->E7]
  |section_level:{3}
+ |section_number:{7}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -592,6 +606,7 @@ NodeBack: [U6]
  |menu_directions:D[next->E22|prev->E6|up->E3]
  |menus:EC[E19]
  |node_directions:D[next->E22|prev->E6|up->E3]
+ |node_number:{8}
  |normalized:{unnumbered2}
   *arguments_line C1
    *line_arg C1
@@ -609,6 +624,7 @@ NodeBack: [U6]
  |section_childs:EC[E21]
  |section_directions:D[next->E23|prev->E7|up->E4]
  |section_level:{2}
+ |section_number:{8}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -667,6 +683,7 @@ NodeBack: [U7]
  |is_target:{1}
  |menu_directions:D[up->E17]
  |node_directions:D[up->E17]
+ |node_number:{9}
  |normalized:{numbered-sub3}
   *arguments_line C1
    *line_arg C1
@@ -683,6 +700,7 @@ NodeBack: [U7]
  |associated_node:[E20]
  |section_directions:D[up->E18]
  |section_level:{3}
+ |section_number:{9}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -714,6 +732,7 @@ NodeBack: [U8]
  |is_target:{1}
  |menu_directions:D[prev->E17|up->E3]
  |node_directions:D[prev->E17|up->E3]
+ |node_number:{10}
  |normalized:{numbered}
   *arguments_line C1
    *line_arg C1
@@ -729,8 +748,9 @@ NodeBack: [U8]
  |associated_anchor_command:[E22]
  |associated_node:[E22]
  |section_directions:D[prev->E18|up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{10}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -746,6 +766,7 @@ NodeBack: [U8]
  |is_target:{1}
  |menu_directions:D[next->E25|prev->E3|up->E0]
  |node_directions:D[up->E0]
+ |node_number:{11}
  |normalized:{between-node}
   *arguments_line C4
    *line_arg C1
@@ -788,6 +809,7 @@ NodeForward: [U11]
  |is_target:{1}
  |menu_directions:D[next->E27|prev->E24|up->E0]
  |node_directions:D[next->E27|up->E0]
+ |node_number:{12}
  |normalized:{Second-node}
   *arguments_line C4
    *line_arg C1
@@ -818,8 +840,9 @@ NodeForward: [U11]
  |associated_anchor_command:[E25]
  |associated_node:[E25]
  |section_directions:D[next->E28|prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{11}
  |toplevel_directions:D[next->E28|prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -857,6 +880,7 @@ NodeBack: [U10]
  |is_target:{1}
  |menu_directions:D[next->E29|prev->E25|up->E0]
  |node_directions:D[next->E29|prev->E25|up->E0]
+ |node_number:{13}
  |normalized:{Third-node-unnumbered}
   *arguments_line C1
    *line_arg C1
@@ -873,6 +897,7 @@ NodeBack: [U10]
  |associated_node:[E27]
  |section_directions:D[next->E30|prev->E26|up->E1]
  |section_level:{1}
+ |section_number:{12}
  |toplevel_directions:D[next->E30|prev->E26|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -907,6 +932,7 @@ NodeBack: [U11]
  |is_target:{1}
  |menu_directions:D[next->E31|prev->E27|up->E0]
  |node_directions:D[next->E27|prev->E31|up->E0]
+ |node_number:{14}
  |normalized:{continuity}
   *arguments_line C4
    *line_arg C1
@@ -946,6 +972,7 @@ NodeBack: [U11]
  |associated_node:[E29]
  |section_directions:D[prev->E28|up->E1]
  |section_level:{1}
+ |section_number:{13}
  |toplevel_directions:D[prev->E28|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -966,6 +993,7 @@ NodeBack: [U11]
  |is_target:{1}
  |menu_directions:D[prev->E29|up->E0]
  |node_directions:D[prev->E29|up->E0]
+ |node_number:{15}
  |normalized:{Last-node-no-description}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/moresectioning/complex_split_at_node.pl 
b/tta/perl/t/results/moresectioning/complex_split_at_node.pl
index a4781d4146..9792cae850 100644
--- a/tta/perl/t/results/moresectioning/complex_split_at_node.pl
+++ b/tta/perl/t/results/moresectioning/complex_split_at_node.pl
@@ -25,6 +25,7 @@ NodeForward: [U1]
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3|prev->MISSING: (line_arg)[C3]]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C3
    *line_arg C1
@@ -49,6 +50,7 @@ NodeForward: [U1]
  |associated_node:[E0]
  |section_childs:EC[E4|E26|E28|E30]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -169,6 +171,7 @@ NodeBack: [U0]
  |menu_directions:D[next->E24|up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{First-node}
   *arguments_line C4
    *line_arg C1
@@ -196,8 +199,9 @@ NodeBack: [U0]
  |associated_node:[E3]
  |section_childs:EC[E7|E18|E23]
  |section_directions:D[next->E26|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E26|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -287,6 +291,7 @@ NodeBack: [U1]
  |menu_directions:D[next->E17|up->E3]
  |menus:EC[E8]
  |node_directions:D[next->E17|up->E3]
+ |node_number:{3}
  |normalized:{unnumbered}
   *arguments_line C1
    *line_arg C1
@@ -304,6 +309,7 @@ NodeBack: [U1]
  |section_childs:EC[E10|E12|E14|E16]
  |section_directions:D[next->E18|up->E4]
  |section_level:{2}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -397,6 +403,7 @@ NodeBack: [U2]
  |is_target:{1}
  |menu_directions:D[next->E11|up->E6]
  |node_directions:D[next->E11|up->E6]
+ |node_number:{4}
  |normalized:{unnumbered-sub}
   *arguments_line C1
    *line_arg C1
@@ -413,6 +420,7 @@ NodeBack: [U2]
  |associated_node:[E9]
  |section_directions:D[next->E12|up->E7]
  |section_level:{3}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -446,6 +454,7 @@ NodeBack: [U3]
  |is_target:{1}
  |menu_directions:D[next->E13|prev->E9|up->E6]
  |node_directions:D[next->E13|prev->E9|up->E6]
+ |node_number:{5}
  |normalized:{numbered-sub}
   *arguments_line C1
    *line_arg C1
@@ -462,6 +471,7 @@ NodeBack: [U3]
  |associated_node:[E11]
  |section_directions:D[next->E14|prev->E10|up->E7]
  |section_level:{3}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -495,6 +505,7 @@ NodeBack: [U4]
  |is_target:{1}
  |menu_directions:D[next->E15|prev->E11|up->E6]
  |node_directions:D[next->E15|prev->E11|up->E6]
+ |node_number:{6}
  |normalized:{unnumbered-sub2}
   *arguments_line C1
    *line_arg C1
@@ -511,6 +522,7 @@ NodeBack: [U4]
  |associated_node:[E13]
  |section_directions:D[next->E16|prev->E12|up->E7]
  |section_level:{3}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -542,6 +554,7 @@ NodeBack: [U5]
  |is_target:{1}
  |menu_directions:D[prev->E13|up->E6]
  |node_directions:D[prev->E13|up->E6]
+ |node_number:{7}
  |normalized:{numbered-sub2}
   *arguments_line C1
    *line_arg C1
@@ -558,6 +571,7 @@ NodeBack: [U5]
  |associated_node:[E15]
  |section_directions:D[prev->E14|up->E7]
  |section_level:{3}
+ |section_number:{7}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -592,6 +606,7 @@ NodeBack: [U6]
  |menu_directions:D[next->E22|prev->E6|up->E3]
  |menus:EC[E19]
  |node_directions:D[next->E22|prev->E6|up->E3]
+ |node_number:{8}
  |normalized:{unnumbered2}
   *arguments_line C1
    *line_arg C1
@@ -609,6 +624,7 @@ NodeBack: [U6]
  |section_childs:EC[E21]
  |section_directions:D[next->E23|prev->E7|up->E4]
  |section_level:{2}
+ |section_number:{8}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -667,6 +683,7 @@ NodeBack: [U7]
  |is_target:{1}
  |menu_directions:D[up->E17]
  |node_directions:D[up->E17]
+ |node_number:{9}
  |normalized:{numbered-sub3}
   *arguments_line C1
    *line_arg C1
@@ -683,6 +700,7 @@ NodeBack: [U7]
  |associated_node:[E20]
  |section_directions:D[up->E18]
  |section_level:{3}
+ |section_number:{9}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -714,6 +732,7 @@ NodeBack: [U8]
  |is_target:{1}
  |menu_directions:D[prev->E17|up->E3]
  |node_directions:D[prev->E17|up->E3]
+ |node_number:{10}
  |normalized:{numbered}
   *arguments_line C1
    *line_arg C1
@@ -729,8 +748,9 @@ NodeBack: [U8]
  |associated_anchor_command:[E22]
  |associated_node:[E22]
  |section_directions:D[prev->E18|up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{10}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -755,6 +775,7 @@ NodeUp: [U0]
  |is_target:{1}
  |menu_directions:D[next->E25|prev->E3|up->E0]
  |node_directions:D[up->E0]
+ |node_number:{11}
  |normalized:{between-node}
   *arguments_line C4
    *line_arg C1
@@ -797,6 +818,7 @@ NodeForward: [U12]
  |is_target:{1}
  |menu_directions:D[next->E27|prev->E24|up->E0]
  |node_directions:D[next->E27|up->E0]
+ |node_number:{12}
  |normalized:{Second-node}
   *arguments_line C4
    *line_arg C1
@@ -827,8 +849,9 @@ NodeForward: [U12]
  |associated_anchor_command:[E25]
  |associated_node:[E25]
  |section_directions:D[next->E28|prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{11}
  |toplevel_directions:D[next->E28|prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -866,6 +889,7 @@ NodeBack: [U11]
  |is_target:{1}
  |menu_directions:D[next->E29|prev->E25|up->E0]
  |node_directions:D[next->E29|prev->E25|up->E0]
+ |node_number:{13}
  |normalized:{Third-node-unnumbered}
   *arguments_line C1
    *line_arg C1
@@ -882,6 +906,7 @@ NodeBack: [U11]
  |associated_node:[E27]
  |section_directions:D[next->E30|prev->E26|up->E1]
  |section_level:{1}
+ |section_number:{12}
  |toplevel_directions:D[next->E30|prev->E26|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -917,6 +942,7 @@ NodeBack: [U12]
  |is_target:{1}
  |menu_directions:D[next->E31|prev->E27|up->E0]
  |node_directions:D[next->E27|prev->E31|up->E0]
+ |node_number:{14}
  |normalized:{continuity}
   *arguments_line C4
    *line_arg C1
@@ -956,6 +982,7 @@ NodeBack: [U12]
  |associated_node:[E29]
  |section_directions:D[prev->E28|up->E1]
  |section_level:{1}
+ |section_number:{13}
  |toplevel_directions:D[prev->E28|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -984,6 +1011,7 @@ NodeUp: [U0]
  |is_target:{1}
  |menu_directions:D[prev->E29|up->E0]
  |node_directions:D[prev->E29|up->E0]
+ |node_number:{15}
  |normalized:{Last-node-no-description}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/moresectioning/contents.pl 
b/tta/perl/t/results/moresectioning/contents.pl
index 317922c774..b278ae3b13 100644
--- a/tta/perl/t/results/moresectioning/contents.pl
+++ b/tta/perl/t/results/moresectioning/contents.pl
@@ -15,6 +15,7 @@ $result_tree_text{'contents'} = '*document_root C12
  |section_childs:EC[E1]
  |section_directions:D[next->E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -35,8 +36,9 @@ $result_tree_text{'contents'} = '*document_root C12
  |EXTRA
  |section_childs:EC[E2]
  |section_directions:D[up->E0]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E0|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -52,8 +54,9 @@ $result_tree_text{'contents'} = '*document_root C12
  |EXTRA
  |section_childs:EC[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -68,8 +71,9 @@ $result_tree_text{'contents'} = '*document_root C12
  |EXTRA
  |section_childs:EC[E4]
  |section_directions:D[up->E2]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -83,8 +87,9 @@ $result_tree_text{'contents'} = '*document_root C12
   |{ }
  |EXTRA
  |section_directions:D[up->E3]
+ |section_heading_number:{1.1.1.1}
  |section_level:{4}
- |section_number:{1.1.1.1}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -102,6 +107,7 @@ $result_tree_text{'contents'} = '*document_root C12
  |section_childs:EC[E6|E7|E8]
  |section_directions:D[next->E9|prev->E0]
  |section_level:{0}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -116,8 +122,9 @@ $result_tree_text{'contents'} = '*document_root C12
  |EXTRA
  |associated_part:[E5]
  |section_directions:D[next->E7|up->E5]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{7}
  |toplevel_directions:D[next->E7|prev->E1|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -132,8 +139,9 @@ $result_tree_text{'contents'} = '*document_root C12
   |{ }
  |EXTRA
  |section_directions:D[next->E8|prev->E6|up->E5]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{8}
  |toplevel_directions:D[next->E8|prev->E6|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -149,6 +157,7 @@ $result_tree_text{'contents'} = '*document_root C12
  |EXTRA
  |section_directions:D[prev->E7|up->E5]
  |section_level:{1}
+ |section_number:{9}
  |toplevel_directions:D[next->E9|prev->E7|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -164,8 +173,9 @@ $result_tree_text{'contents'} = '*document_root C12
  |EXTRA
  |section_childs:EC[E10]
  |section_directions:D[prev->E5]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{10}
  |toplevel_directions:D[prev->E8|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -180,8 +190,9 @@ $result_tree_text{'contents'} = '*document_root C12
   |{ }
  |EXTRA
  |section_directions:D[up->E9]
+ |section_heading_number:{A.1}
  |section_level:{2}
- |section_number:{A.1}
+ |section_number:{11}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/moresectioning/contents_and_shortcontents.pl 
b/tta/perl/t/results/moresectioning/contents_and_shortcontents.pl
index 87060c1bcb..08459190ee 100644
--- a/tta/perl/t/results/moresectioning/contents_and_shortcontents.pl
+++ b/tta/perl/t/results/moresectioning/contents_and_shortcontents.pl
@@ -15,6 +15,7 @@ $result_tree_text{'contents_and_shortcontents'} = 
'*document_root C12
  |section_childs:EC[E1]
  |section_directions:D[next->E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -35,8 +36,9 @@ $result_tree_text{'contents_and_shortcontents'} = 
'*document_root C12
  |EXTRA
  |section_childs:EC[E2]
  |section_directions:D[up->E0]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E0|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -52,8 +54,9 @@ $result_tree_text{'contents_and_shortcontents'} = 
'*document_root C12
  |EXTRA
  |section_childs:EC[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -68,8 +71,9 @@ $result_tree_text{'contents_and_shortcontents'} = 
'*document_root C12
  |EXTRA
  |section_childs:EC[E4]
  |section_directions:D[up->E2]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -83,8 +87,9 @@ $result_tree_text{'contents_and_shortcontents'} = 
'*document_root C12
   |{ }
  |EXTRA
  |section_directions:D[up->E3]
+ |section_heading_number:{1.1.1.1}
  |section_level:{4}
- |section_number:{1.1.1.1}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -102,6 +107,7 @@ $result_tree_text{'contents_and_shortcontents'} = 
'*document_root C12
  |section_childs:EC[E6|E7|E8]
  |section_directions:D[next->E9|prev->E0]
  |section_level:{0}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -116,8 +122,9 @@ $result_tree_text{'contents_and_shortcontents'} = 
'*document_root C12
  |EXTRA
  |associated_part:[E5]
  |section_directions:D[next->E7|up->E5]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{7}
  |toplevel_directions:D[next->E7|prev->E1|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -132,8 +139,9 @@ $result_tree_text{'contents_and_shortcontents'} = 
'*document_root C12
   |{ }
  |EXTRA
  |section_directions:D[next->E8|prev->E6|up->E5]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{8}
  |toplevel_directions:D[next->E8|prev->E6|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -149,6 +157,7 @@ $result_tree_text{'contents_and_shortcontents'} = 
'*document_root C12
  |EXTRA
  |section_directions:D[prev->E7|up->E5]
  |section_level:{1}
+ |section_number:{9}
  |toplevel_directions:D[next->E9|prev->E7|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -164,8 +173,9 @@ $result_tree_text{'contents_and_shortcontents'} = 
'*document_root C12
  |EXTRA
  |section_childs:EC[E10]
  |section_directions:D[prev->E5]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{10}
  |toplevel_directions:D[prev->E8|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -180,8 +190,9 @@ $result_tree_text{'contents_and_shortcontents'} = 
'*document_root C12
   |{ }
  |EXTRA
  |section_directions:D[up->E9]
+ |section_heading_number:{A.1}
  |section_level:{2}
- |section_number:{A.1}
+ |section_number:{11}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git 
a/tta/perl/t/results/moresectioning/contents_at_begin_chapter_without_node.pl 
b/tta/perl/t/results/moresectioning/contents_at_begin_chapter_without_node.pl
index 5f8166686c..643292cfe1 100644
--- 
a/tta/perl/t/results/moresectioning/contents_at_begin_chapter_without_node.pl
+++ 
b/tta/perl/t/results/moresectioning/contents_at_begin_chapter_without_node.pl
@@ -19,6 +19,7 @@ $result_tree_text{'contents_at_begin_chapter_without_node'} = 
'*document_root C4
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -35,6 +36,7 @@ $result_tree_text{'contents_at_begin_chapter_without_node'} = 
'*document_root C4
  |associated_node:[E0]
  |section_childs:EC[E2]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,8 +56,9 @@ $result_tree_text{'contents_at_begin_chapter_without_node'} = 
'*document_root C4
   |{ }
  |EXTRA
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/moresectioning/contents_at_end_document.pl 
b/tta/perl/t/results/moresectioning/contents_at_end_document.pl
index 69b9babc57..9142934375 100644
--- a/tta/perl/t/results/moresectioning/contents_at_end_document.pl
+++ b/tta/perl/t/results/moresectioning/contents_at_end_document.pl
@@ -14,6 +14,7 @@ $result_tree_text{'contents_at_end_document'} = 
'*document_root C4
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -30,6 +31,7 @@ $result_tree_text{'contents_at_end_document'} = 
'*document_root C4
  |associated_node:[E0]
  |section_childs:EC[E2]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -49,8 +51,9 @@ $result_tree_text{'contents_at_end_document'} = 
'*document_root C4
   |{ }
  |EXTRA
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/moresectioning/contents_at_end_document_after_node.pl 
b/tta/perl/t/results/moresectioning/contents_at_end_document_after_node.pl
index 481a707b7b..a83fcc5bd5 100644
--- a/tta/perl/t/results/moresectioning/contents_at_end_document_after_node.pl
+++ b/tta/perl/t/results/moresectioning/contents_at_end_document_after_node.pl
@@ -16,6 +16,7 @@ $result_tree_text{'contents_at_end_document_after_node'} = 
'*document_root C5
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E4]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'contents_at_end_document_after_node'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -80,8 +82,9 @@ $result_tree_text{'contents_at_end_document_after_node'} = 
'*document_root C5
   |{ }
  |EXTRA
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -98,6 +101,7 @@ $result_tree_text{'contents_at_end_document_after_node'} = 
'*document_root C5
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[up->E0]
+ |node_number:{2}
  |normalized:{a-node}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/moresectioning/contents_in_document.pl 
b/tta/perl/t/results/moresectioning/contents_in_document.pl
index 7f721abdb0..243bf4e570 100644
--- a/tta/perl/t/results/moresectioning/contents_in_document.pl
+++ b/tta/perl/t/results/moresectioning/contents_in_document.pl
@@ -14,6 +14,7 @@ $result_tree_text{'contents_in_document'} = '*document_root C4
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -30,6 +31,7 @@ $result_tree_text{'contents_in_document'} = '*document_root C4
  |associated_node:[E0]
  |section_childs:EC[E2]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,8 +56,9 @@ $result_tree_text{'contents_in_document'} = '*document_root C4
   |{ }
  |EXTRA
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/moresectioning/empty_top_node_up.pl 
b/tta/perl/t/results/moresectioning/empty_top_node_up.pl
index ca4750c430..f789ef9dd1 100644
--- a/tta/perl/t/results/moresectioning/empty_top_node_up.pl
+++ b/tta/perl/t/results/moresectioning/empty_top_node_up.pl
@@ -16,6 +16,7 @@ $result_tree_text{'empty_top_node_up'} = '*document_root C4
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'empty_top_node_up'} = '*document_root C4
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -80,6 +82,7 @@ $result_tree_text{'empty_top_node_up'} = '*document_root C4
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/moresectioning/equivalent_nodes_defined_linked.pl 
b/tta/perl/t/results/moresectioning/equivalent_nodes_defined_linked.pl
index f38203b23e..c8049d7852 100644
--- a/tta/perl/t/results/moresectioning/equivalent_nodes_defined_linked.pl
+++ b/tta/perl/t/results/moresectioning/equivalent_nodes_defined_linked.pl
@@ -14,6 +14,7 @@ $result_tree_text{'equivalent_nodes_defined_linked'} = 
'*document_root C3
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C2
    *line_arg C1
@@ -70,6 +71,7 @@ $result_tree_text{'equivalent_nodes_defined_linked'} = 
'*document_root C3
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/moresectioning/internal_top_node_up.pl 
b/tta/perl/t/results/moresectioning/internal_top_node_up.pl
index 0d7fb898c5..efa99a04dd 100644
--- a/tta/perl/t/results/moresectioning/internal_top_node_up.pl
+++ b/tta/perl/t/results/moresectioning/internal_top_node_up.pl
@@ -22,6 +22,7 @@ NodeForward: [U1]
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -37,6 +38,7 @@ NodeForward: [U1]
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -95,6 +97,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/moresectioning/lowered_subsubsection.pl 
b/tta/perl/t/results/moresectioning/lowered_subsubsection.pl
index a89a14f8f0..abc26d46dd 100644
--- a/tta/perl/t/results/moresectioning/lowered_subsubsection.pl
+++ b/tta/perl/t/results/moresectioning/lowered_subsubsection.pl
@@ -16,6 +16,7 @@ $result_tree_text{'lowered_subsubsection'} = '*document_root 
C16
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -29,6 +30,7 @@ $result_tree_text{'lowered_subsubsection'} = '*document_root 
C16
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -81,6 +83,7 @@ $result_tree_text{'lowered_subsubsection'} = '*document_root 
C16
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Chapter}
   *arguments_line C1
    *line_arg C1
@@ -97,8 +100,9 @@ $result_tree_text{'lowered_subsubsection'} = '*document_root 
C16
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -147,6 +151,7 @@ $result_tree_text{'lowered_subsubsection'} = 
'*document_root C16
  |menu_directions:D[up->E3]
  |menus:EC[E8]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{Section}
   *arguments_line C1
    *line_arg C1
@@ -163,8 +168,9 @@ $result_tree_text{'lowered_subsubsection'} = 
'*document_root C16
  |associated_node:[E6]
  |section_childs:EC[E10]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -212,6 +218,7 @@ $result_tree_text{'lowered_subsubsection'} = 
'*document_root C16
  |menu_directions:D[up->E6]
  |menus:EC[E11]
  |node_directions:D[up->E6]
+ |node_number:{4}
  |normalized:{Subsection}
   *arguments_line C1
    *line_arg C1
@@ -228,8 +235,9 @@ $result_tree_text{'lowered_subsubsection'} = 
'*document_root C16
  |associated_node:[E9]
  |section_childs:EC[E13|E15|E18]
  |section_directions:D[up->E7]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -287,6 +295,7 @@ $result_tree_text{'lowered_subsubsection'} = 
'*document_root C16
  |is_target:{1}
  |menu_directions:D[next->E14|up->E9]
  |node_directions:D[next->E14|up->E9]
+ |node_number:{5}
  |normalized:{Subsubsection}
   *arguments_line C1
    *line_arg C1
@@ -302,8 +311,9 @@ $result_tree_text{'lowered_subsubsection'} = 
'*document_root C16
  |associated_anchor_command:[E12]
  |associated_node:[E12]
  |section_directions:D[next->E15|up->E10]
+ |section_heading_number:{1.1.1.1}
  |section_level:{4}
- |section_number:{1.1.1.1}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -324,6 +334,7 @@ $result_tree_text{'lowered_subsubsection'} = 
'*document_root C16
  |menu_directions:D[prev->E12|up->E9]
  |menus:EC[E16]
  |node_directions:D[next->E17|prev->E12|up->E9]
+ |node_number:{6}
  |normalized:{Lowered-subsec}
   *arguments_line C1
    *line_arg C1
@@ -340,8 +351,9 @@ $result_tree_text{'lowered_subsubsection'} = 
'*document_root C16
  |associated_node:[E14]
  |level_modifier:{-1}
  |section_directions:D[next->E18|prev->E13|up->E10]
+ |section_heading_number:{1.1.1.2}
  |section_level:{4}
- |section_number:{1.1.1.2}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -388,6 +400,7 @@ $result_tree_text{'lowered_subsubsection'} = 
'*document_root C16
  |is_target:{1}
  |menu_directions:D[up->E14]
  |node_directions:D[prev->E14|up->E9]
+ |node_number:{7}
  |normalized:{Lowered-subsubsection}
   *arguments_line C1
    *line_arg C1
@@ -404,8 +417,9 @@ $result_tree_text{'lowered_subsubsection'} = 
'*document_root C16
  |associated_node:[E17]
  |level_modifier:{-1}
  |section_directions:D[prev->E15|up->E10]
+ |section_heading_number:{1.1.1.3}
  |section_level:{4}
- |section_number:{1.1.1.3}
+ |section_number:{7}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/moresectioning/loweredheading.pl 
b/tta/perl/t/results/moresectioning/loweredheading.pl
index 1624666185..ddfc56144e 100644
--- a/tta/perl/t/results/moresectioning/loweredheading.pl
+++ b/tta/perl/t/results/moresectioning/loweredheading.pl
@@ -14,6 +14,7 @@ $result_tree_text{'loweredheading'} = '*document_root C3
   |{ }
  |EXTRA
  |level_modifier:{-1}
+ |section_heading_number:{1}
  |section_level:{3}
  |section_number:{1}
  |sectioning_root:
@@ -33,6 +34,7 @@ $result_tree_text{'loweredheading'} = '*document_root C3
    |{ }
   |EXTRA
   |global_command_number:{1}
+  |heading_number:{1}
   |level_modifier:{-1}
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/moresectioning/more_sections_than_nodes.pl 
b/tta/perl/t/results/moresectioning/more_sections_than_nodes.pl
index f2367292f2..f4710510fc 100644
--- a/tta/perl/t/results/moresectioning/more_sections_than_nodes.pl
+++ b/tta/perl/t/results/moresectioning/more_sections_than_nodes.pl
@@ -16,6 +16,7 @@ $result_tree_text{'more_sections_than_nodes'} = 
'*document_root C19
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E4]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'more_sections_than_nodes'} = 
'*document_root C19
  |associated_node:[E0]
  |section_childs:EC[E3|E5|E8|E14|E19]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -102,8 +104,9 @@ $result_tree_text{'more_sections_than_nodes'} = 
'*document_root C19
   |{ }
  |EXTRA
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -122,6 +125,7 @@ $result_tree_text{'more_sections_than_nodes'} = 
'*document_root C19
  |is_target:{1}
  |menu_directions:D[next->E7|up->E0]
  |node_directions:D[next->E7|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{n-c2}
   *arguments_line C1
    *line_arg C1
@@ -138,8 +142,9 @@ $result_tree_text{'more_sections_than_nodes'} = 
'*document_root C19
  |associated_node:[E4]
  |section_childs:EC[E6]
  |section_directions:D[next->E8|prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E8|prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -154,8 +159,9 @@ $result_tree_text{'more_sections_than_nodes'} = 
'*document_root C19
   |{ }
  |EXTRA
  |section_directions:D[up->E5]
+ |section_heading_number:{2.1}
  |section_level:{2}
- |section_number:{2.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -174,6 +180,7 @@ $result_tree_text{'more_sections_than_nodes'} = 
'*document_root C19
  |menu_directions:D[next->E17|prev->E4|up->E0]
  |menus:EC[E9]
  |node_directions:D[next->E17|prev->E4|up->E0]
+ |node_number:{3}
  |normalized:{n-c3}
   *arguments_line C4
    *line_arg C1
@@ -213,8 +220,9 @@ $result_tree_text{'more_sections_than_nodes'} = 
'*document_root C19
  |associated_node:[E7]
  |section_childs:EC[E10|E12|E13]
  |section_directions:D[next->E14|prev->E5|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{5}
  |toplevel_directions:D[next->E14|prev->E5|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -258,8 +266,9 @@ $result_tree_text{'more_sections_than_nodes'} = 
'*document_root C19
   |{ }
  |EXTRA
  |section_directions:D[next->E12|up->E8]
+ |section_heading_number:{3.1}
  |section_level:{2}
- |section_number:{3.1}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -277,6 +286,7 @@ $result_tree_text{'more_sections_than_nodes'} = 
'*document_root C19
  |is_target:{1}
  |menu_directions:D[up->E7]
  |node_directions:D[up->E7]
+ |node_number:{4}
  |normalized:{n-c3-s-2}
   *arguments_line C1
    *line_arg C1
@@ -292,8 +302,9 @@ $result_tree_text{'more_sections_than_nodes'} = 
'*document_root C19
  |associated_anchor_command:[E11]
  |associated_node:[E11]
  |section_directions:D[next->E13|prev->E10|up->E8]
+ |section_heading_number:{3.2}
  |section_level:{2}
- |section_number:{3.2}
+ |section_number:{7}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -307,8 +318,9 @@ $result_tree_text{'more_sections_than_nodes'} = 
'*document_root C19
   |{ }
  |EXTRA
  |section_directions:D[prev->E12|up->E8]
+ |section_heading_number:{3.3}
  |section_level:{2}
- |section_number:{3.3}
+ |section_number:{8}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -323,8 +335,9 @@ $result_tree_text{'more_sections_than_nodes'} = 
'*document_root C19
  |EXTRA
  |section_childs:EC[E15]
  |section_directions:D[next->E19|prev->E8|up->E1]
+ |section_heading_number:{4}
  |section_level:{1}
- |section_number:{4}
+ |section_number:{9}
  |toplevel_directions:D[next->E19|prev->E8|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -340,8 +353,9 @@ $result_tree_text{'more_sections_than_nodes'} = 
'*document_root C19
  |EXTRA
  |section_childs:EC[E16|E18]
  |section_directions:D[up->E14]
+ |section_heading_number:{4.1}
  |section_level:{2}
- |section_number:{4.1}
+ |section_number:{10}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -355,8 +369,9 @@ $result_tree_text{'more_sections_than_nodes'} = 
'*document_root C19
   |{ }
  |EXTRA
  |section_directions:D[next->E18|up->E15]
+ |section_heading_number:{4.1.1}
  |section_level:{3}
- |section_number:{4.1.1}
+ |section_number:{11}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -374,6 +389,7 @@ $result_tree_text{'more_sections_than_nodes'} = 
'*document_root C19
  |is_target:{1}
  |menu_directions:D[prev->E7|up->E0]
  |node_directions:D[prev->E7|up->E0]
+ |node_number:{5}
  |normalized:{n-c3-s1-s2}
   *arguments_line C4
    *line_arg C1
@@ -400,8 +416,9 @@ $result_tree_text{'more_sections_than_nodes'} = 
'*document_root C19
  |associated_anchor_command:[E17]
  |associated_node:[E17]
  |section_directions:D[prev->E16|up->E15]
+ |section_heading_number:{4.1.2}
  |section_level:{3}
- |section_number:{4.1.2}
+ |section_number:{12}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -415,8 +432,9 @@ $result_tree_text{'more_sections_than_nodes'} = 
'*document_root C19
   |{ }
  |EXTRA
  |section_directions:D[prev->E14|up->E1]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{13}
  |toplevel_directions:D[prev->E14|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/moresectioning/more_sections_than_nodes_texi2html.pl 
b/tta/perl/t/results/moresectioning/more_sections_than_nodes_texi2html.pl
index f25eafd122..66b4ae9682 100644
--- a/tta/perl/t/results/moresectioning/more_sections_than_nodes_texi2html.pl
+++ b/tta/perl/t/results/moresectioning/more_sections_than_nodes_texi2html.pl
@@ -17,6 +17,7 @@ $result_tree_text{'more_sections_than_nodes_texi2html'} = 
'*document_root C19
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E4]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -33,6 +34,7 @@ $result_tree_text{'more_sections_than_nodes_texi2html'} = 
'*document_root C19
  |associated_node:[E0]
  |section_childs:EC[E3|E5|E8|E14|E19]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -103,8 +105,9 @@ $result_tree_text{'more_sections_than_nodes_texi2html'} = 
'*document_root C19
   |{ }
  |EXTRA
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -123,6 +126,7 @@ $result_tree_text{'more_sections_than_nodes_texi2html'} = 
'*document_root C19
  |is_target:{1}
  |menu_directions:D[next->E7|up->E0]
  |node_directions:D[next->E7|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{n-c2}
   *arguments_line C1
    *line_arg C1
@@ -139,8 +143,9 @@ $result_tree_text{'more_sections_than_nodes_texi2html'} = 
'*document_root C19
  |associated_node:[E4]
  |section_childs:EC[E6]
  |section_directions:D[next->E8|prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E8|prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -155,8 +160,9 @@ $result_tree_text{'more_sections_than_nodes_texi2html'} = 
'*document_root C19
   |{ }
  |EXTRA
  |section_directions:D[up->E5]
+ |section_heading_number:{2.1}
  |section_level:{2}
- |section_number:{2.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -175,6 +181,7 @@ $result_tree_text{'more_sections_than_nodes_texi2html'} = 
'*document_root C19
  |menu_directions:D[next->E17|prev->E4|up->E0]
  |menus:EC[E9]
  |node_directions:D[next->E17|prev->E4|up->E0]
+ |node_number:{3}
  |normalized:{n-c3}
   *arguments_line C4
    *line_arg C1
@@ -214,8 +221,9 @@ $result_tree_text{'more_sections_than_nodes_texi2html'} = 
'*document_root C19
  |associated_node:[E7]
  |section_childs:EC[E10|E12|E13]
  |section_directions:D[next->E14|prev->E5|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{5}
  |toplevel_directions:D[next->E14|prev->E5|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -259,8 +267,9 @@ $result_tree_text{'more_sections_than_nodes_texi2html'} = 
'*document_root C19
   |{ }
  |EXTRA
  |section_directions:D[next->E12|up->E8]
+ |section_heading_number:{3.1}
  |section_level:{2}
- |section_number:{3.1}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -278,6 +287,7 @@ $result_tree_text{'more_sections_than_nodes_texi2html'} = 
'*document_root C19
  |is_target:{1}
  |menu_directions:D[up->E7]
  |node_directions:D[up->E7]
+ |node_number:{4}
  |normalized:{n-c3-s-2}
   *arguments_line C1
    *line_arg C1
@@ -293,8 +303,9 @@ $result_tree_text{'more_sections_than_nodes_texi2html'} = 
'*document_root C19
  |associated_anchor_command:[E11]
  |associated_node:[E11]
  |section_directions:D[next->E13|prev->E10|up->E8]
+ |section_heading_number:{3.2}
  |section_level:{2}
- |section_number:{3.2}
+ |section_number:{7}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -308,8 +319,9 @@ $result_tree_text{'more_sections_than_nodes_texi2html'} = 
'*document_root C19
   |{ }
  |EXTRA
  |section_directions:D[prev->E12|up->E8]
+ |section_heading_number:{3.3}
  |section_level:{2}
- |section_number:{3.3}
+ |section_number:{8}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -324,8 +336,9 @@ $result_tree_text{'more_sections_than_nodes_texi2html'} = 
'*document_root C19
  |EXTRA
  |section_childs:EC[E15]
  |section_directions:D[next->E19|prev->E8|up->E1]
+ |section_heading_number:{4}
  |section_level:{1}
- |section_number:{4}
+ |section_number:{9}
  |toplevel_directions:D[next->E19|prev->E8|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -341,8 +354,9 @@ $result_tree_text{'more_sections_than_nodes_texi2html'} = 
'*document_root C19
  |EXTRA
  |section_childs:EC[E16|E18]
  |section_directions:D[up->E14]
+ |section_heading_number:{4.1}
  |section_level:{2}
- |section_number:{4.1}
+ |section_number:{10}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -356,8 +370,9 @@ $result_tree_text{'more_sections_than_nodes_texi2html'} = 
'*document_root C19
   |{ }
  |EXTRA
  |section_directions:D[next->E18|up->E15]
+ |section_heading_number:{4.1.1}
  |section_level:{3}
- |section_number:{4.1.1}
+ |section_number:{11}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -375,6 +390,7 @@ $result_tree_text{'more_sections_than_nodes_texi2html'} = 
'*document_root C19
  |is_target:{1}
  |menu_directions:D[prev->E7|up->E0]
  |node_directions:D[prev->E7|up->E0]
+ |node_number:{5}
  |normalized:{n-c3-s1-s2}
   *arguments_line C4
    *line_arg C1
@@ -401,8 +417,9 @@ $result_tree_text{'more_sections_than_nodes_texi2html'} = 
'*document_root C19
  |associated_anchor_command:[E17]
  |associated_node:[E17]
  |section_directions:D[prev->E16|up->E15]
+ |section_heading_number:{4.1.2}
  |section_level:{3}
- |section_number:{4.1.2}
+ |section_number:{12}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -416,8 +433,9 @@ $result_tree_text{'more_sections_than_nodes_texi2html'} = 
'*document_root C19
   |{ }
  |EXTRA
  |section_directions:D[prev->E14|up->E1]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{13}
  |toplevel_directions:D[prev->E14|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/moresectioning/nodes_before_after_top_xref.pl 
b/tta/perl/t/results/moresectioning/nodes_before_after_top_xref.pl
index 3e2262927e..43093f376a 100644
--- a/tta/perl/t/results/moresectioning/nodes_before_after_top_xref.pl
+++ b/tta/perl/t/results/moresectioning/nodes_before_after_top_xref.pl
@@ -25,6 +25,7 @@ $result_tree_text{'nodes_before_after_top_xref'} = 
'*document_root C7
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{node-before}
   *arguments_line C1
    *line_arg C1
@@ -45,6 +46,7 @@ $result_tree_text{'nodes_before_after_top_xref'} = 
'*document_root C7
  |associated_title_command:[E2]
  |is_target:{1}
  |node_directions:D[next->E4]
+ |node_number:{2}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -61,6 +63,7 @@ $result_tree_text{'nodes_before_after_top_xref'} = 
'*document_root C7
  |associated_node:[E1]
  |section_childs:EC[E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -83,6 +86,7 @@ $result_tree_text{'nodes_before_after_top_xref'} = 
'*document_root C7
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{3}
  |normalized:{after}
   *arguments_line C1
    *line_arg C1
@@ -103,6 +107,7 @@ $result_tree_text{'nodes_before_after_top_xref'} = 
'*document_root C7
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[prev->E1|up->E1]
+ |node_number:{4}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -118,8 +123,9 @@ $result_tree_text{'nodes_before_after_top_xref'} = 
'*document_root C7
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[up->E2]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E2|up->E2]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/moresectioning/nodes_no_section_footnote_no_top_node_output.pl
 
b/tta/perl/t/results/moresectioning/nodes_no_section_footnote_no_top_node_output.pl
index e43ab0d7d4..968fbd48fd 100644
--- 
a/tta/perl/t/results/moresectioning/nodes_no_section_footnote_no_top_node_output.pl
+++ 
b/tta/perl/t/results/moresectioning/nodes_no_section_footnote_no_top_node_output.pl
@@ -14,6 +14,7 @@ 
$result_tree_text{'nodes_no_section_footnote_no_top_node_output'} = '*document_r
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -28,6 +29,7 @@ 
$result_tree_text{'nodes_no_section_footnote_no_top_node_output'} = '*document_r
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/moresectioning/non_automatic_internal_top_node_up.pl 
b/tta/perl/t/results/moresectioning/non_automatic_internal_top_node_up.pl
index 407e75089e..239eaffd6d 100644
--- a/tta/perl/t/results/moresectioning/non_automatic_internal_top_node_up.pl
+++ b/tta/perl/t/results/moresectioning/non_automatic_internal_top_node_up.pl
@@ -22,6 +22,7 @@ NodeForward: [U1]
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C4
    *line_arg C1
@@ -82,6 +83,7 @@ NodeForward: [U1]
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -139,6 +141,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C4
    *line_arg C1
diff --git 
a/tta/perl/t/results/moresectioning/non_automatic_top_node_up_and_url.pl 
b/tta/perl/t/results/moresectioning/non_automatic_top_node_up_and_url.pl
index 7575820020..859112351a 100644
--- a/tta/perl/t/results/moresectioning/non_automatic_top_node_up_and_url.pl
+++ b/tta/perl/t/results/moresectioning/non_automatic_top_node_up_and_url.pl
@@ -22,6 +22,7 @@ NodeForward: [U1]
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C4
    *line_arg C1
@@ -82,6 +83,7 @@ NodeForward: [U1]
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -139,6 +141,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/moresectioning/non_automatic_top_node_up_url.pl 
b/tta/perl/t/results/moresectioning/non_automatic_top_node_up_url.pl
index 56b0a4bd7f..9e13d829d8 100644
--- a/tta/perl/t/results/moresectioning/non_automatic_top_node_up_url.pl
+++ b/tta/perl/t/results/moresectioning/non_automatic_top_node_up_url.pl
@@ -24,6 +24,7 @@ NodeForward: [U1]
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3|prev->MISSING: (line_arg)[C3]|up->MISSING: 
(line_arg)[C3]]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C4
    *line_arg C1
@@ -64,6 +65,7 @@ NodeForward: [U1]
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -122,6 +124,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->MISSING: (line_arg)[C3]]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/moresectioning/only_special_spaces_node.pl 
b/tta/perl/t/results/moresectioning/only_special_spaces_node.pl
index 4b629cc338..52162f3c51 100644
--- a/tta/perl/t/results/moresectioning/only_special_spaces_node.pl
+++ b/tta/perl/t/results/moresectioning/only_special_spaces_node.pl
@@ -18,6 +18,7 @@ $result_tree_text{'only_special_spaces_node'} = 
'*document_root C16
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -34,6 +35,7 @@ $result_tree_text{'only_special_spaces_node'} = 
'*document_root C16
  |associated_node:[E0]
  |section_childs:EC[E3|E5|E7|E9|E11|E13]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -56,6 +58,7 @@ $result_tree_text{'only_special_spaces_node'} = 
'*document_root C16
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{_2002_2003_2002}
   *arguments_line C1
    *line_arg C1
@@ -71,8 +74,9 @@ $result_tree_text{'only_special_spaces_node'} = 
'*document_root C16
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -98,8 +102,9 @@ $result_tree_text{'only_special_spaces_node'} = 
'*document_root C16
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[next->E7|prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E7|prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -125,8 +130,9 @@ $result_tree_text{'only_special_spaces_node'} = 
'*document_root C16
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[next->E9|prev->E5|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{4}
  |toplevel_directions:D[next->E9|prev->E5|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -144,6 +150,7 @@ $result_tree_text{'only_special_spaces_node'} = 
'*document_root C16
  |associated_title_command:[E9]
  |is_target:{1}
  |node_directions:D[next->E10|prev->E6|up->E0]
+ |node_number:{3}
  |normalized:{_0085_00a0_1680}
   *arguments_line C1
    *line_arg C1
@@ -159,8 +166,9 @@ $result_tree_text{'only_special_spaces_node'} = 
'*document_root C16
  |associated_anchor_command:[E8]
  |associated_node:[E8]
  |section_directions:D[next->E11|prev->E7|up->E1]
+ |section_heading_number:{4}
  |section_level:{1}
- |section_number:{4}
+ |section_number:{5}
  |toplevel_directions:D[next->E11|prev->E7|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -178,6 +186,7 @@ $result_tree_text{'only_special_spaces_node'} = 
'*document_root C16
  |associated_title_command:[E11]
  |is_target:{1}
  |node_directions:D[next->E12|prev->E8|up->E0]
+ |node_number:{4}
  |normalized:{_180e_2003}
   *arguments_line C1
    *line_arg C1
@@ -193,8 +202,9 @@ $result_tree_text{'only_special_spaces_node'} = 
'*document_root C16
  |associated_anchor_command:[E10]
  |associated_node:[E10]
  |section_directions:D[next->E13|prev->E9|up->E1]
+ |section_heading_number:{5}
  |section_level:{1}
- |section_number:{5}
+ |section_number:{6}
  |toplevel_directions:D[next->E13|prev->E9|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -212,6 +222,7 @@ $result_tree_text{'only_special_spaces_node'} = 
'*document_root C16
  |associated_title_command:[E13]
  |is_target:{1}
  |node_directions:D[prev->E10|up->E0]
+ |node_number:{5}
  |normalized:{_2004_2005_2006_2007_2008_2009_200a_202f_205f_3000}
   *arguments_line C1
    *line_arg C1
@@ -227,8 +238,9 @@ $result_tree_text{'only_special_spaces_node'} = 
'*document_root C16
  |associated_anchor_command:[E12]
  |associated_node:[E12]
  |section_directions:D[prev->E11|up->E1]
+ |section_heading_number:{6}
  |section_level:{1}
- |section_number:{6}
+ |section_number:{7}
  |toplevel_directions:D[prev->E11|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/moresectioning/placed_things_before_element.pl 
b/tta/perl/t/results/moresectioning/placed_things_before_element.pl
index fbc69afd9f..3aba0c0a7c 100644
--- a/tta/perl/t/results/moresectioning/placed_things_before_element.pl
+++ b/tta/perl/t/results/moresectioning/placed_things_before_element.pl
@@ -151,6 +151,7 @@ $result_tree_text{'placed_things_before_element'} = 
'*document_root C2
  |spaces_before_argument:
   |{ }
  |EXTRA
+ |section_heading_number:{1}
  |section_level:{2}
  |section_number:{1}
  |sectioning_root:
diff --git 
a/tta/perl/t/results/moresectioning/placed_things_before_element_no_use_node.pl 
b/tta/perl/t/results/moresectioning/placed_things_before_element_no_use_node.pl
index d9c7e7dfaa..e0f764db23 100644
--- 
a/tta/perl/t/results/moresectioning/placed_things_before_element_no_use_node.pl
+++ 
b/tta/perl/t/results/moresectioning/placed_things_before_element_no_use_node.pl
@@ -151,6 +151,7 @@ 
$result_tree_text{'placed_things_before_element_no_use_node'} = '*document_root
  |spaces_before_argument:
   |{ }
  |EXTRA
+ |section_heading_number:{1}
  |section_level:{2}
  |section_number:{1}
  |sectioning_root:
diff --git a/tta/perl/t/results/moresectioning/placed_things_before_node.pl 
b/tta/perl/t/results/moresectioning/placed_things_before_node.pl
index 46ed3b7f54..6370a48c81 100644
--- a/tta/perl/t/results/moresectioning/placed_things_before_node.pl
+++ b/tta/perl/t/results/moresectioning/placed_things_before_node.pl
@@ -156,6 +156,7 @@ $result_tree_text{'placed_things_before_node'} = 
'*document_root C5
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[next->E6]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -172,6 +173,7 @@ $result_tree_text{'placed_things_before_node'} = 
'*document_root C5
  |associated_node:[E4]
  |section_childs:EC[E7]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -194,6 +196,7 @@ $result_tree_text{'placed_things_before_node'} = 
'*document_root C5
  |associated_title_command:[E7]
  |is_target:{1}
  |node_directions:D[prev->E4|up->E4]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -209,8 +212,9 @@ $result_tree_text{'placed_things_before_node'} = 
'*document_root C5
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E5]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E5|up->E5]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/moresectioning/raiselowersections.pl 
b/tta/perl/t/results/moresectioning/raiselowersections.pl
index b18d0e5802..0388ae6857 100644
--- a/tta/perl/t/results/moresectioning/raiselowersections.pl
+++ b/tta/perl/t/results/moresectioning/raiselowersections.pl
@@ -21,6 +21,7 @@ $result_tree_text{'raiselowersections'} = '*document_root C14
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -34,6 +35,7 @@ $result_tree_text{'raiselowersections'} = '*document_root C14
  |associated_node:[E0]
  |section_childs:EC[E4|E15]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -96,6 +98,7 @@ $result_tree_text{'raiselowersections'} = '*document_root C14
  |menu_directions:D[next->E14|up->E0]
  |menus:EC[E5]
  |node_directions:D[next->E14|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Chapter}
   *arguments_line C1
    *line_arg C1
@@ -112,8 +115,9 @@ $result_tree_text{'raiselowersections'} = '*document_root 
C14
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[next->E15|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E15|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -256,6 +260,7 @@ $result_tree_text{'raiselowersections'} = '*document_root 
C14
  |menu_directions:D[up->E3]
  |menus:EC[E8]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{Chapter-in-included-file}
   *arguments_line C1
    *line_arg C1
@@ -273,8 +278,9 @@ $result_tree_text{'raiselowersections'} = '*document_root 
C14
  |level_modifier:{-1}
  |section_childs:EC[E10]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -322,6 +328,7 @@ $result_tree_text{'raiselowersections'} = '*document_root 
C14
  |menu_directions:D[up->E6]
  |menus:EC[E11]
  |node_directions:D[up->E6]
+ |node_number:{4}
  |normalized:{Section}
   *arguments_line C1
    *line_arg C1
@@ -339,8 +346,9 @@ $result_tree_text{'raiselowersections'} = '*document_root 
C14
  |level_modifier:{-1}
  |section_childs:EC[E13]
  |section_directions:D[up->E7]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -387,6 +395,7 @@ $result_tree_text{'raiselowersections'} = '*document_root 
C14
  |is_target:{1}
  |menu_directions:D[up->E9]
  |node_directions:D[up->E9]
+ |node_number:{5}
  |normalized:{Subsection}
   *arguments_line C1
    *line_arg C1
@@ -403,8 +412,9 @@ $result_tree_text{'raiselowersections'} = '*document_root 
C14
  |associated_node:[E12]
  |level_modifier:{-1}
  |section_directions:D[up->E10]
+ |section_heading_number:{1.1.1.1}
  |section_level:{4}
- |section_number:{1.1.1.1}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -498,6 +508,7 @@ $result_tree_text{'raiselowersections'} = '*document_root 
C14
  |is_target:{1}
  |menu_directions:D[prev->E3|up->E0]
  |node_directions:D[prev->E3|up->E0]
+ |node_number:{6}
  |normalized:{Second-chapter}
   *arguments_line C1
    *line_arg C1
@@ -513,8 +524,9 @@ $result_tree_text{'raiselowersections'} = '*document_root 
C14
  |associated_anchor_command:[E14]
  |associated_node:[E14]
  |section_directions:D[prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{6}
  |toplevel_directions:D[prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/moresectioning/rec_nodes.pl 
b/tta/perl/t/results/moresectioning/rec_nodes.pl
index bbd91660c9..1f17fab6bf 100644
--- a/tta/perl/t/results/moresectioning/rec_nodes.pl
+++ b/tta/perl/t/results/moresectioning/rec_nodes.pl
@@ -14,6 +14,7 @@ $result_tree_text{'rec_nodes'} = '*document_root C6
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -73,6 +74,7 @@ $result_tree_text{'rec_nodes'} = '*document_root C6
  |menu_directions:D[next->E8|prev->E4|up->E2]
  |menus:EC[E3]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap-node}
   *arguments_line C4
    *line_arg C1
@@ -141,6 +143,7 @@ $result_tree_text{'rec_nodes'} = '*document_root C6
  |menu_directions:D[next->E2|up->E4]
  |menus:EC[E5]
  |node_directions:D[up->E2]
+ |node_number:{3}
  |normalized:{other-node}
   *arguments_line C4
    *line_arg C1
@@ -194,6 +197,7 @@ $result_tree_text{'rec_nodes'} = '*document_root C6
  |menu_directions:D[up->E8]
  |menus:EC[E7]
  |node_directions:D[up->E8]
+ |node_number:{4}
  |normalized:{node-up-node-following-second}
   *arguments_line C4
    *line_arg C1
@@ -249,6 +253,7 @@ $result_tree_text{'rec_nodes'} = '*document_root C6
  |menu_directions:D[prev->E2|up->E6]
  |menus:EC[E9]
  |node_directions:D[up->E6]
+ |node_number:{5}
  |normalized:{node-following-second}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/moresectioning/section_in_unnumbered_info.pl 
b/tta/perl/t/results/moresectioning/section_in_unnumbered_info.pl
index 88cc027736..43f9ef990a 100644
--- a/tta/perl/t/results/moresectioning/section_in_unnumbered_info.pl
+++ b/tta/perl/t/results/moresectioning/section_in_unnumbered_info.pl
@@ -19,6 +19,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -35,6 +36,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |associated_node:[E0]
  |section_childs:EC[E4|E9|E14|E33|E64]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -140,6 +142,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |menu_directions:D[next->E8|up->E0]
  |menus:EC[E5]
  |node_directions:D[next->E8|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -156,8 +159,9 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[next->E9|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E9|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -205,6 +209,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[up->E3]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section-in-chapter}
   *arguments_line C1
    *line_arg C1
@@ -220,8 +225,9 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -240,6 +246,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |menu_directions:D[next->E13|prev->E3|up->E0]
  |menus:EC[E10]
  |node_directions:D[next->E13|prev->E3|up->E0]
+ |node_number:{4}
  |normalized:{unnumbered}
   *arguments_line C1
    *line_arg C1
@@ -257,6 +264,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |section_childs:EC[E12]
  |section_directions:D[next->E14|prev->E4|up->E1]
  |section_level:{1}
+ |section_number:{4}
  |toplevel_directions:D[next->E14|prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -304,6 +312,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[up->E8]
  |node_directions:D[up->E8]
+ |node_number:{5}
  |normalized:{section-in-unnumbered}
   *arguments_line C1
    *line_arg C1
@@ -320,6 +329,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |associated_node:[E11]
  |section_directions:D[up->E9]
  |section_level:{2}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -338,6 +348,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |menu_directions:D[next->E32|prev->E8|up->E0]
  |menus:EC[E15]
  |node_directions:D[next->E32|prev->E8|up->E0]
+ |node_number:{6}
  |normalized:{chapter-2}
   *arguments_line C1
    *line_arg C1
@@ -354,8 +365,9 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |associated_node:[E13]
  |section_childs:EC[E17|E28]
  |section_directions:D[next->E33|prev->E9|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{6}
  |toplevel_directions:D[next->E33|prev->E9|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -415,6 +427,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |menu_directions:D[next->E27|up->E13]
  |menus:EC[E18]
  |node_directions:D[next->E27|up->E13]
+ |node_number:{7}
  |normalized:{unnumberedsec-2}
   *arguments_line C1
    *line_arg C1
@@ -432,6 +445,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |section_childs:EC[E20|E22|E24|E26]
  |section_directions:D[next->E28|up->E14]
  |section_level:{2}
+ |section_number:{7}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -511,6 +525,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[next->E21|up->E16]
  |node_directions:D[next->E21|up->E16]
+ |node_number:{8}
  |normalized:{unnumbered-sub-2}
   *arguments_line C1
    *line_arg C1
@@ -527,6 +542,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |associated_node:[E19]
  |section_directions:D[next->E22|up->E17]
  |section_level:{3}
+ |section_number:{8}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -544,6 +560,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[next->E23|prev->E19|up->E16]
  |node_directions:D[next->E23|prev->E19|up->E16]
+ |node_number:{9}
  |normalized:{numbered-sub-2}
   *arguments_line C1
    *line_arg C1
@@ -560,6 +577,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |associated_node:[E21]
  |section_directions:D[next->E24|prev->E20|up->E17]
  |section_level:{3}
+ |section_number:{9}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -577,6 +595,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[next->E25|prev->E21|up->E16]
  |node_directions:D[next->E25|prev->E21|up->E16]
+ |node_number:{10}
  |normalized:{unnumbered-sub2-2}
   *arguments_line C1
    *line_arg C1
@@ -593,6 +612,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |associated_node:[E23]
  |section_directions:D[next->E26|prev->E22|up->E17]
  |section_level:{3}
+ |section_number:{10}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -610,6 +630,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[prev->E23|up->E16]
  |node_directions:D[prev->E23|up->E16]
+ |node_number:{11}
  |normalized:{numbered-sub2-2}
   *arguments_line C1
    *line_arg C1
@@ -626,6 +647,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |associated_node:[E25]
  |section_directions:D[prev->E24|up->E17]
  |section_level:{3}
+ |section_number:{11}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -644,6 +666,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |menu_directions:D[prev->E16|up->E13]
  |menus:EC[E29]
  |node_directions:D[prev->E16|up->E13]
+ |node_number:{12}
  |normalized:{unnumberedsec-2_002d1}
   *arguments_line C1
    *line_arg C1
@@ -661,6 +684,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |section_childs:EC[E31]
  |section_directions:D[prev->E17|up->E14]
  |section_level:{2}
+ |section_number:{12}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -707,6 +731,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[up->E27]
  |node_directions:D[up->E27]
+ |node_number:{13}
  |normalized:{numbered-sub-2_002d1}
   *arguments_line C1
    *line_arg C1
@@ -723,6 +748,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |associated_node:[E30]
  |section_directions:D[up->E28]
  |section_level:{3}
+ |section_number:{13}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -742,6 +768,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |menu_directions:D[next->E63|prev->E13|up->E0]
  |menus:EC[E34]
  |node_directions:D[next->E63|prev->E13|up->E0]
+ |node_number:{14}
  |normalized:{chapter-3}
   *arguments_line C1
    *line_arg C1
@@ -758,8 +785,9 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |associated_node:[E32]
  |section_childs:EC[E36|E47|E49|E54|E59]
  |section_directions:D[next->E64|prev->E14|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{14}
  |toplevel_directions:D[next->E64|prev->E14|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -852,6 +880,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |menu_directions:D[next->E46|up->E32]
  |menus:EC[E37]
  |node_directions:D[next->E46|up->E32]
+ |node_number:{15}
  |normalized:{unnumberedsec-3}
   *arguments_line C1
    *line_arg C1
@@ -869,6 +898,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |section_childs:EC[E39|E41|E43|E45]
  |section_directions:D[next->E47|up->E33]
  |section_level:{2}
+ |section_number:{15}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -948,6 +978,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[next->E40|up->E35]
  |node_directions:D[next->E40|up->E35]
+ |node_number:{16}
  |normalized:{unnumbered-sub-3}
   *arguments_line C1
    *line_arg C1
@@ -964,6 +995,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |associated_node:[E38]
  |section_directions:D[next->E41|up->E36]
  |section_level:{3}
+ |section_number:{16}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -981,6 +1013,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[next->E42|prev->E38|up->E35]
  |node_directions:D[next->E42|prev->E38|up->E35]
+ |node_number:{17}
  |normalized:{numbered-sub-3}
   *arguments_line C1
    *line_arg C1
@@ -997,6 +1030,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |associated_node:[E40]
  |section_directions:D[next->E43|prev->E39|up->E36]
  |section_level:{3}
+ |section_number:{17}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1014,6 +1048,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[next->E44|prev->E40|up->E35]
  |node_directions:D[next->E44|prev->E40|up->E35]
+ |node_number:{18}
  |normalized:{unnumbered-sub2-3}
   *arguments_line C1
    *line_arg C1
@@ -1030,6 +1065,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |associated_node:[E42]
  |section_directions:D[next->E45|prev->E41|up->E36]
  |section_level:{3}
+ |section_number:{18}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1047,6 +1083,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[prev->E42|up->E35]
  |node_directions:D[prev->E42|up->E35]
+ |node_number:{19}
  |normalized:{numbered-sub2-3}
   *arguments_line C1
    *line_arg C1
@@ -1063,6 +1100,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |associated_node:[E44]
  |section_directions:D[prev->E43|up->E36]
  |section_level:{3}
+ |section_number:{19}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1080,6 +1118,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[next->E48|prev->E35|up->E32]
  |node_directions:D[next->E48|prev->E35|up->E32]
+ |node_number:{20}
  |normalized:{section-3_002d1}
   *arguments_line C1
    *line_arg C1
@@ -1095,8 +1134,9 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |associated_anchor_command:[E46]
  |associated_node:[E46]
  |section_directions:D[next->E49|prev->E36|up->E33]
+ |section_heading_number:{3.1}
  |section_level:{2}
- |section_number:{3.1}
+ |section_number:{20}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1115,6 +1155,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |menu_directions:D[next->E53|prev->E46|up->E32]
  |menus:EC[E50]
  |node_directions:D[next->E53|prev->E46|up->E32]
+ |node_number:{21}
  |normalized:{unnumberedsec-3_002d2}
   *arguments_line C1
    *line_arg C1
@@ -1132,6 +1173,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |section_childs:EC[E52]
  |section_directions:D[next->E54|prev->E47|up->E33]
  |section_level:{2}
+ |section_number:{21}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1178,6 +1220,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[up->E48]
  |node_directions:D[up->E48]
+ |node_number:{22}
  |normalized:{numbered-sub-3_002d2}
   *arguments_line C1
    *line_arg C1
@@ -1194,6 +1237,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |associated_node:[E51]
  |section_directions:D[up->E49]
  |section_level:{3}
+ |section_number:{22}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1212,6 +1256,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |menu_directions:D[next->E58|prev->E48|up->E32]
  |menus:EC[E55]
  |node_directions:D[next->E58|prev->E48|up->E32]
+ |node_number:{23}
  |normalized:{section-3_002d3}
   *arguments_line C1
    *line_arg C1
@@ -1228,8 +1273,9 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |associated_node:[E53]
  |section_childs:EC[E57]
  |section_directions:D[next->E59|prev->E49|up->E33]
+ |section_heading_number:{3.2}
  |section_level:{2}
- |section_number:{3.2}
+ |section_number:{23}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1276,6 +1322,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[up->E53]
  |node_directions:D[up->E53]
+ |node_number:{24}
  |normalized:{subsection-3_002d3}
   *arguments_line C1
    *line_arg C1
@@ -1291,8 +1338,9 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |associated_anchor_command:[E56]
  |associated_node:[E56]
  |section_directions:D[up->E54]
+ |section_heading_number:{3.2.1}
  |section_level:{3}
- |section_number:{3.2.1}
+ |section_number:{24}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1311,6 +1359,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |menu_directions:D[prev->E53|up->E32]
  |menus:EC[E60]
  |node_directions:D[prev->E53|up->E32]
+ |node_number:{25}
  |normalized:{unnumberedsec-3_002d4}
   *arguments_line C1
    *line_arg C1
@@ -1328,6 +1377,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |section_childs:EC[E62]
  |section_directions:D[prev->E54|up->E33]
  |section_level:{2}
+ |section_number:{25}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1374,6 +1424,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[up->E58]
  |node_directions:D[up->E58]
+ |node_number:{26}
  |normalized:{numbered-sub-3_002d4}
   *arguments_line C1
    *line_arg C1
@@ -1390,6 +1441,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |associated_node:[E61]
  |section_directions:D[up->E59]
  |section_level:{3}
+ |section_number:{26}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1408,6 +1460,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |menu_directions:D[prev->E32|up->E0]
  |menus:EC[E65]
  |node_directions:D[prev->E32|up->E0]
+ |node_number:{27}
  |normalized:{unnumbered-4}
   *arguments_line C1
    *line_arg C1
@@ -1425,6 +1478,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |section_childs:EC[E67]
  |section_directions:D[prev->E33|up->E1]
  |section_level:{1}
+ |section_number:{27}
  |toplevel_directions:D[prev->E33|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -1473,6 +1527,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |menu_directions:D[up->E63]
  |menus:EC[E68]
  |node_directions:D[up->E63]
+ |node_number:{28}
  |normalized:{unnumberedsec-4}
   *arguments_line C1
    *line_arg C1
@@ -1490,6 +1545,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |section_childs:EC[E70|E72|E74|E76]
  |section_directions:D[up->E64]
  |section_level:{2}
+ |section_number:{28}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1569,6 +1625,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[next->E71|up->E66]
  |node_directions:D[next->E71|up->E66]
+ |node_number:{29}
  |normalized:{unnumbered-sub-4}
   *arguments_line C1
    *line_arg C1
@@ -1585,6 +1642,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |associated_node:[E69]
  |section_directions:D[next->E72|up->E67]
  |section_level:{3}
+ |section_number:{29}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1602,6 +1660,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[next->E73|prev->E69|up->E66]
  |node_directions:D[next->E73|prev->E69|up->E66]
+ |node_number:{30}
  |normalized:{numbered-sub-4}
   *arguments_line C1
    *line_arg C1
@@ -1618,6 +1677,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |associated_node:[E71]
  |section_directions:D[next->E74|prev->E70|up->E67]
  |section_level:{3}
+ |section_number:{30}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1635,6 +1695,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[next->E75|prev->E71|up->E66]
  |node_directions:D[next->E75|prev->E71|up->E66]
+ |node_number:{31}
  |normalized:{unnumbered-sub2-4}
   *arguments_line C1
    *line_arg C1
@@ -1651,6 +1712,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |associated_node:[E73]
  |section_directions:D[next->E76|prev->E72|up->E67]
  |section_level:{3}
+ |section_number:{31}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1668,6 +1730,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[prev->E73|up->E66]
  |node_directions:D[prev->E73|up->E66]
+ |node_number:{32}
  |normalized:{numbered-sub2-4}
   *arguments_line C1
    *line_arg C1
@@ -1684,6 +1747,7 @@ $result_tree_text{'section_in_unnumbered_info'} = 
'*document_root C65
  |associated_node:[E75]
  |section_directions:D[prev->E74|up->E67]
  |section_level:{3}
+ |section_number:{32}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git 
a/tta/perl/t/results/moresectioning/section_in_unnumbered_plaintext.pl 
b/tta/perl/t/results/moresectioning/section_in_unnumbered_plaintext.pl
index eaaa33d3e0..990c15c2ad 100644
--- a/tta/perl/t/results/moresectioning/section_in_unnumbered_plaintext.pl
+++ b/tta/perl/t/results/moresectioning/section_in_unnumbered_plaintext.pl
@@ -19,6 +19,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -35,6 +36,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |associated_node:[E0]
  |section_childs:EC[E4|E9|E14|E33|E64]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -140,6 +142,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |menu_directions:D[next->E8|up->E0]
  |menus:EC[E5]
  |node_directions:D[next->E8|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -156,8 +159,9 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[next->E9|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E9|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -205,6 +209,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[up->E3]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section-in-chapter}
   *arguments_line C1
    *line_arg C1
@@ -220,8 +225,9 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -240,6 +246,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |menu_directions:D[next->E13|prev->E3|up->E0]
  |menus:EC[E10]
  |node_directions:D[next->E13|prev->E3|up->E0]
+ |node_number:{4}
  |normalized:{unnumbered}
   *arguments_line C1
    *line_arg C1
@@ -257,6 +264,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |section_childs:EC[E12]
  |section_directions:D[next->E14|prev->E4|up->E1]
  |section_level:{1}
+ |section_number:{4}
  |toplevel_directions:D[next->E14|prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -304,6 +312,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[up->E8]
  |node_directions:D[up->E8]
+ |node_number:{5}
  |normalized:{section-in-unnumbered}
   *arguments_line C1
    *line_arg C1
@@ -320,6 +329,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |associated_node:[E11]
  |section_directions:D[up->E9]
  |section_level:{2}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -338,6 +348,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |menu_directions:D[next->E32|prev->E8|up->E0]
  |menus:EC[E15]
  |node_directions:D[next->E32|prev->E8|up->E0]
+ |node_number:{6}
  |normalized:{chapter-2}
   *arguments_line C1
    *line_arg C1
@@ -354,8 +365,9 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |associated_node:[E13]
  |section_childs:EC[E17|E28]
  |section_directions:D[next->E33|prev->E9|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{6}
  |toplevel_directions:D[next->E33|prev->E9|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -415,6 +427,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |menu_directions:D[next->E27|up->E13]
  |menus:EC[E18]
  |node_directions:D[next->E27|up->E13]
+ |node_number:{7}
  |normalized:{unnumberedsec-2}
   *arguments_line C1
    *line_arg C1
@@ -432,6 +445,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |section_childs:EC[E20|E22|E24|E26]
  |section_directions:D[next->E28|up->E14]
  |section_level:{2}
+ |section_number:{7}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -511,6 +525,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[next->E21|up->E16]
  |node_directions:D[next->E21|up->E16]
+ |node_number:{8}
  |normalized:{unnumbered-sub-2}
   *arguments_line C1
    *line_arg C1
@@ -527,6 +542,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |associated_node:[E19]
  |section_directions:D[next->E22|up->E17]
  |section_level:{3}
+ |section_number:{8}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -544,6 +560,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[next->E23|prev->E19|up->E16]
  |node_directions:D[next->E23|prev->E19|up->E16]
+ |node_number:{9}
  |normalized:{numbered-sub-2}
   *arguments_line C1
    *line_arg C1
@@ -560,6 +577,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |associated_node:[E21]
  |section_directions:D[next->E24|prev->E20|up->E17]
  |section_level:{3}
+ |section_number:{9}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -577,6 +595,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[next->E25|prev->E21|up->E16]
  |node_directions:D[next->E25|prev->E21|up->E16]
+ |node_number:{10}
  |normalized:{unnumbered-sub2-2}
   *arguments_line C1
    *line_arg C1
@@ -593,6 +612,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |associated_node:[E23]
  |section_directions:D[next->E26|prev->E22|up->E17]
  |section_level:{3}
+ |section_number:{10}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -610,6 +630,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[prev->E23|up->E16]
  |node_directions:D[prev->E23|up->E16]
+ |node_number:{11}
  |normalized:{numbered-sub2-2}
   *arguments_line C1
    *line_arg C1
@@ -626,6 +647,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |associated_node:[E25]
  |section_directions:D[prev->E24|up->E17]
  |section_level:{3}
+ |section_number:{11}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -644,6 +666,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |menu_directions:D[prev->E16|up->E13]
  |menus:EC[E29]
  |node_directions:D[prev->E16|up->E13]
+ |node_number:{12}
  |normalized:{unnumberedsec-2_002d1}
   *arguments_line C1
    *line_arg C1
@@ -661,6 +684,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |section_childs:EC[E31]
  |section_directions:D[prev->E17|up->E14]
  |section_level:{2}
+ |section_number:{12}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -707,6 +731,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[up->E27]
  |node_directions:D[up->E27]
+ |node_number:{13}
  |normalized:{numbered-sub-2_002d1}
   *arguments_line C1
    *line_arg C1
@@ -723,6 +748,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |associated_node:[E30]
  |section_directions:D[up->E28]
  |section_level:{3}
+ |section_number:{13}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -742,6 +768,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |menu_directions:D[next->E63|prev->E13|up->E0]
  |menus:EC[E34]
  |node_directions:D[next->E63|prev->E13|up->E0]
+ |node_number:{14}
  |normalized:{chapter-3}
   *arguments_line C1
    *line_arg C1
@@ -758,8 +785,9 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |associated_node:[E32]
  |section_childs:EC[E36|E47|E49|E54|E59]
  |section_directions:D[next->E64|prev->E14|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{14}
  |toplevel_directions:D[next->E64|prev->E14|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -852,6 +880,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |menu_directions:D[next->E46|up->E32]
  |menus:EC[E37]
  |node_directions:D[next->E46|up->E32]
+ |node_number:{15}
  |normalized:{unnumberedsec-3}
   *arguments_line C1
    *line_arg C1
@@ -869,6 +898,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |section_childs:EC[E39|E41|E43|E45]
  |section_directions:D[next->E47|up->E33]
  |section_level:{2}
+ |section_number:{15}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -948,6 +978,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[next->E40|up->E35]
  |node_directions:D[next->E40|up->E35]
+ |node_number:{16}
  |normalized:{unnumbered-sub-3}
   *arguments_line C1
    *line_arg C1
@@ -964,6 +995,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |associated_node:[E38]
  |section_directions:D[next->E41|up->E36]
  |section_level:{3}
+ |section_number:{16}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -981,6 +1013,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[next->E42|prev->E38|up->E35]
  |node_directions:D[next->E42|prev->E38|up->E35]
+ |node_number:{17}
  |normalized:{numbered-sub-3}
   *arguments_line C1
    *line_arg C1
@@ -997,6 +1030,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |associated_node:[E40]
  |section_directions:D[next->E43|prev->E39|up->E36]
  |section_level:{3}
+ |section_number:{17}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1014,6 +1048,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[next->E44|prev->E40|up->E35]
  |node_directions:D[next->E44|prev->E40|up->E35]
+ |node_number:{18}
  |normalized:{unnumbered-sub2-3}
   *arguments_line C1
    *line_arg C1
@@ -1030,6 +1065,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |associated_node:[E42]
  |section_directions:D[next->E45|prev->E41|up->E36]
  |section_level:{3}
+ |section_number:{18}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1047,6 +1083,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[prev->E42|up->E35]
  |node_directions:D[prev->E42|up->E35]
+ |node_number:{19}
  |normalized:{numbered-sub2-3}
   *arguments_line C1
    *line_arg C1
@@ -1063,6 +1100,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |associated_node:[E44]
  |section_directions:D[prev->E43|up->E36]
  |section_level:{3}
+ |section_number:{19}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1080,6 +1118,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[next->E48|prev->E35|up->E32]
  |node_directions:D[next->E48|prev->E35|up->E32]
+ |node_number:{20}
  |normalized:{section-3_002d1}
   *arguments_line C1
    *line_arg C1
@@ -1095,8 +1134,9 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |associated_anchor_command:[E46]
  |associated_node:[E46]
  |section_directions:D[next->E49|prev->E36|up->E33]
+ |section_heading_number:{3.1}
  |section_level:{2}
- |section_number:{3.1}
+ |section_number:{20}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1115,6 +1155,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |menu_directions:D[next->E53|prev->E46|up->E32]
  |menus:EC[E50]
  |node_directions:D[next->E53|prev->E46|up->E32]
+ |node_number:{21}
  |normalized:{unnumberedsec-3_002d2}
   *arguments_line C1
    *line_arg C1
@@ -1132,6 +1173,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |section_childs:EC[E52]
  |section_directions:D[next->E54|prev->E47|up->E33]
  |section_level:{2}
+ |section_number:{21}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1178,6 +1220,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[up->E48]
  |node_directions:D[up->E48]
+ |node_number:{22}
  |normalized:{numbered-sub-3_002d2}
   *arguments_line C1
    *line_arg C1
@@ -1194,6 +1237,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |associated_node:[E51]
  |section_directions:D[up->E49]
  |section_level:{3}
+ |section_number:{22}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1212,6 +1256,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |menu_directions:D[next->E58|prev->E48|up->E32]
  |menus:EC[E55]
  |node_directions:D[next->E58|prev->E48|up->E32]
+ |node_number:{23}
  |normalized:{section-3_002d3}
   *arguments_line C1
    *line_arg C1
@@ -1228,8 +1273,9 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |associated_node:[E53]
  |section_childs:EC[E57]
  |section_directions:D[next->E59|prev->E49|up->E33]
+ |section_heading_number:{3.2}
  |section_level:{2}
- |section_number:{3.2}
+ |section_number:{23}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1276,6 +1322,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[up->E53]
  |node_directions:D[up->E53]
+ |node_number:{24}
  |normalized:{subsection-3_002d3}
   *arguments_line C1
    *line_arg C1
@@ -1291,8 +1338,9 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |associated_anchor_command:[E56]
  |associated_node:[E56]
  |section_directions:D[up->E54]
+ |section_heading_number:{3.2.1}
  |section_level:{3}
- |section_number:{3.2.1}
+ |section_number:{24}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1311,6 +1359,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |menu_directions:D[prev->E53|up->E32]
  |menus:EC[E60]
  |node_directions:D[prev->E53|up->E32]
+ |node_number:{25}
  |normalized:{unnumberedsec-3_002d4}
   *arguments_line C1
    *line_arg C1
@@ -1328,6 +1377,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |section_childs:EC[E62]
  |section_directions:D[prev->E54|up->E33]
  |section_level:{2}
+ |section_number:{25}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1374,6 +1424,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[up->E58]
  |node_directions:D[up->E58]
+ |node_number:{26}
  |normalized:{numbered-sub-3_002d4}
   *arguments_line C1
    *line_arg C1
@@ -1390,6 +1441,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |associated_node:[E61]
  |section_directions:D[up->E59]
  |section_level:{3}
+ |section_number:{26}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1408,6 +1460,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |menu_directions:D[prev->E32|up->E0]
  |menus:EC[E65]
  |node_directions:D[prev->E32|up->E0]
+ |node_number:{27}
  |normalized:{unnumbered-4}
   *arguments_line C1
    *line_arg C1
@@ -1425,6 +1478,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |section_childs:EC[E67]
  |section_directions:D[prev->E33|up->E1]
  |section_level:{1}
+ |section_number:{27}
  |toplevel_directions:D[prev->E33|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -1473,6 +1527,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |menu_directions:D[up->E63]
  |menus:EC[E68]
  |node_directions:D[up->E63]
+ |node_number:{28}
  |normalized:{unnumberedsec-4}
   *arguments_line C1
    *line_arg C1
@@ -1490,6 +1545,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |section_childs:EC[E70|E72|E74|E76]
  |section_directions:D[up->E64]
  |section_level:{2}
+ |section_number:{28}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1569,6 +1625,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[next->E71|up->E66]
  |node_directions:D[next->E71|up->E66]
+ |node_number:{29}
  |normalized:{unnumbered-sub-4}
   *arguments_line C1
    *line_arg C1
@@ -1585,6 +1642,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |associated_node:[E69]
  |section_directions:D[next->E72|up->E67]
  |section_level:{3}
+ |section_number:{29}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1602,6 +1660,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[next->E73|prev->E69|up->E66]
  |node_directions:D[next->E73|prev->E69|up->E66]
+ |node_number:{30}
  |normalized:{numbered-sub-4}
   *arguments_line C1
    *line_arg C1
@@ -1618,6 +1677,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |associated_node:[E71]
  |section_directions:D[next->E74|prev->E70|up->E67]
  |section_level:{3}
+ |section_number:{30}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1635,6 +1695,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[next->E75|prev->E71|up->E66]
  |node_directions:D[next->E75|prev->E71|up->E66]
+ |node_number:{31}
  |normalized:{unnumbered-sub2-4}
   *arguments_line C1
    *line_arg C1
@@ -1651,6 +1712,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |associated_node:[E73]
  |section_directions:D[next->E76|prev->E72|up->E67]
  |section_level:{3}
+ |section_number:{31}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -1668,6 +1730,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |is_target:{1}
  |menu_directions:D[prev->E73|up->E66]
  |node_directions:D[prev->E73|up->E66]
+ |node_number:{32}
  |normalized:{numbered-sub2-4}
   *arguments_line C1
    *line_arg C1
@@ -1684,6 +1747,7 @@ $result_tree_text{'section_in_unnumbered_plaintext'} = 
'*document_root C65
  |associated_node:[E75]
  |section_directions:D[prev->E74|up->E67]
  |section_level:{3}
+ |section_number:{32}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/moresectioning/sectioning_part_appendix.pl 
b/tta/perl/t/results/moresectioning/sectioning_part_appendix.pl
index 769b827447..b0f3b3491e 100644
--- a/tta/perl/t/results/moresectioning/sectioning_part_appendix.pl
+++ b/tta/perl/t/results/moresectioning/sectioning_part_appendix.pl
@@ -20,6 +20,7 @@ Next: [U5]
  |section_childs:EC[E1]
  |section_directions:D[next->E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -49,8 +50,9 @@ Up: [U0]
  |EXTRA
  |section_childs:EC[E2]
  |section_directions:D[up->E0]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E0|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -75,8 +77,9 @@ Up: [U1]
  |EXTRA
  |section_childs:EC[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -100,8 +103,9 @@ Up: [U2]
  |EXTRA
  |section_childs:EC[E4]
  |section_directions:D[up->E2]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -124,8 +128,9 @@ Up: [U3]
   |{ }
  |EXTRA
  |section_directions:D[up->E3]
+ |section_heading_number:{1.1.1.1}
  |section_level:{4}
- |section_number:{1.1.1.1}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -152,6 +157,7 @@ Next: [U6]
  |section_childs:EC[E6|E7|E8]
  |section_directions:D[next->E9|prev->E0]
  |section_level:{0}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -166,8 +172,9 @@ Next: [U6]
  |EXTRA
  |associated_part:[E5]
  |section_directions:D[next->E7|up->E5]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{7}
  |toplevel_directions:D[next->E7|prev->E1|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -193,8 +200,9 @@ Up: [U5]
   |{ }
  |EXTRA
  |section_directions:D[next->E8|prev->E6|up->E5]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{8}
  |toplevel_directions:D[next->E8|prev->E6|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -220,6 +228,7 @@ Up: [U5]
  |EXTRA
  |section_directions:D[prev->E7|up->E5]
  |section_level:{1}
+ |section_number:{9}
  |toplevel_directions:D[next->E9|prev->E7|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -243,8 +252,9 @@ Prev: [U5]
  |EXTRA
  |section_childs:EC[E10]
  |section_directions:D[prev->E5]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{10}
  |toplevel_directions:D[prev->E8|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -266,8 +276,9 @@ Up: [U8]
   |{ }
  |EXTRA
  |section_directions:D[up->E9]
+ |section_heading_number:{A.1}
  |section_level:{2}
- |section_number:{A.1}
+ |section_number:{11}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git 
a/tta/perl/t/results/moresectioning/sectioning_part_appendix_no_top.pl 
b/tta/perl/t/results/moresectioning/sectioning_part_appendix_no_top.pl
index dc61419741..2b3f268c73 100644
--- a/tta/perl/t/results/moresectioning/sectioning_part_appendix_no_top.pl
+++ b/tta/perl/t/results/moresectioning/sectioning_part_appendix_no_top.pl
@@ -17,6 +17,7 @@ FastForward: [U4]
   |{ }
  |EXTRA
  |section_childs:EC[E1]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
@@ -48,8 +49,9 @@ Up: [U0]
  |EXTRA
  |section_childs:EC[E2]
  |section_directions:D[up->E0]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -73,8 +75,9 @@ Up: [U1]
  |EXTRA
  |section_childs:EC[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -97,8 +100,9 @@ Up: [U2]
   |{ }
  |EXTRA
  |section_directions:D[up->E2]
+ |section_heading_number:{1.1.1.1}
  |section_level:{4}
- |section_number:{1.1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -125,6 +129,7 @@ Next: [U5]
  |section_childs:EC[E5|E6|E7]
  |section_directions:D[next->E8]
  |section_level:{0}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -139,8 +144,9 @@ Next: [U5]
  |EXTRA
  |associated_part:[E4]
  |section_directions:D[next->E6|up->E4]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{6}
  |toplevel_directions:D[next->E6|prev->E0]
   *arguments_line C1
    *line_arg C1
@@ -166,8 +172,9 @@ Up: [U4]
   |{ }
  |EXTRA
  |section_directions:D[next->E7|prev->E5|up->E4]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{7}
  |toplevel_directions:D[next->E7|prev->E5]
   *arguments_line C1
    *line_arg C1
@@ -193,6 +200,7 @@ Up: [U4]
  |EXTRA
  |section_directions:D[prev->E6|up->E4]
  |section_level:{1}
+ |section_number:{8}
  |toplevel_directions:D[next->E8|prev->E6]
   *arguments_line C1
    *line_arg C1
@@ -216,8 +224,9 @@ Prev: [U4]
  |EXTRA
  |section_childs:EC[E9]
  |section_directions:D[prev->E4]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{9}
  |toplevel_directions:D[prev->E7]
   *arguments_line C1
    *line_arg C1
@@ -239,8 +248,9 @@ Up: [U7]
   |{ }
  |EXTRA
  |section_directions:D[up->E8]
+ |section_heading_number:{A.1}
  |section_level:{2}
- |section_number:{A.1}
+ |section_number:{10}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git 
a/tta/perl/t/results/moresectioning/sectioning_part_appendix_texi2html_chapter.pl
 
b/tta/perl/t/results/moresectioning/sectioning_part_appendix_texi2html_chapter.pl
index d89596b81b..506d8ca41a 100644
--- 
a/tta/perl/t/results/moresectioning/sectioning_part_appendix_texi2html_chapter.pl
+++ 
b/tta/perl/t/results/moresectioning/sectioning_part_appendix_texi2html_chapter.pl
@@ -15,6 +15,7 @@ 
$result_tree_text{'sectioning_part_appendix_texi2html_chapter'} = '*document_roo
  |section_childs:EC[E1]
  |section_directions:D[next->E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -35,8 +36,9 @@ 
$result_tree_text{'sectioning_part_appendix_texi2html_chapter'} = '*document_roo
  |EXTRA
  |section_childs:EC[E2]
  |section_directions:D[up->E0]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E0|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -52,8 +54,9 @@ 
$result_tree_text{'sectioning_part_appendix_texi2html_chapter'} = '*document_roo
  |EXTRA
  |section_childs:EC[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -68,8 +71,9 @@ 
$result_tree_text{'sectioning_part_appendix_texi2html_chapter'} = '*document_roo
  |EXTRA
  |section_childs:EC[E4]
  |section_directions:D[up->E2]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -83,8 +87,9 @@ 
$result_tree_text{'sectioning_part_appendix_texi2html_chapter'} = '*document_roo
   |{ }
  |EXTRA
  |section_directions:D[up->E3]
+ |section_heading_number:{1.1.1.1}
  |section_level:{4}
- |section_number:{1.1.1.1}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -102,6 +107,7 @@ 
$result_tree_text{'sectioning_part_appendix_texi2html_chapter'} = '*document_roo
  |section_childs:EC[E6|E7|E8]
  |section_directions:D[next->E9|prev->E0]
  |section_level:{0}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -116,8 +122,9 @@ 
$result_tree_text{'sectioning_part_appendix_texi2html_chapter'} = '*document_roo
  |EXTRA
  |associated_part:[E5]
  |section_directions:D[next->E7|up->E5]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{7}
  |toplevel_directions:D[next->E7|prev->E1|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -132,8 +139,9 @@ 
$result_tree_text{'sectioning_part_appendix_texi2html_chapter'} = '*document_roo
   |{ }
  |EXTRA
  |section_directions:D[next->E8|prev->E6|up->E5]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{8}
  |toplevel_directions:D[next->E8|prev->E6|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -149,6 +157,7 @@ 
$result_tree_text{'sectioning_part_appendix_texi2html_chapter'} = '*document_roo
  |EXTRA
  |section_directions:D[prev->E7|up->E5]
  |section_level:{1}
+ |section_number:{9}
  |toplevel_directions:D[next->E9|prev->E7|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -164,8 +173,9 @@ 
$result_tree_text{'sectioning_part_appendix_texi2html_chapter'} = '*document_roo
  |EXTRA
  |section_childs:EC[E10]
  |section_directions:D[prev->E5]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{10}
  |toplevel_directions:D[prev->E8|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -180,8 +190,9 @@ 
$result_tree_text{'sectioning_part_appendix_texi2html_chapter'} = '*document_roo
   |{ }
  |EXTRA
  |section_directions:D[up->E9]
+ |section_heading_number:{A.1}
  |section_level:{2}
- |section_number:{A.1}
+ |section_number:{11}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/moresectioning/sections_test.pl 
b/tta/perl/t/results/moresectioning/sections_test.pl
index c49cf2d1e4..66f09b1ce2 100644
--- a/tta/perl/t/results/moresectioning/sections_test.pl
+++ b/tta/perl/t/results/moresectioning/sections_test.pl
@@ -15,6 +15,7 @@ $result_tree_text{'sections_test'} = '*document_root C12
  |section_childs:EC[E1]
  |section_directions:D[next->E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -35,8 +36,9 @@ $result_tree_text{'sections_test'} = '*document_root C12
  |EXTRA
  |section_childs:EC[E2]
  |section_directions:D[up->E0]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E0|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -52,8 +54,9 @@ $result_tree_text{'sections_test'} = '*document_root C12
  |EXTRA
  |section_childs:EC[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -68,8 +71,9 @@ $result_tree_text{'sections_test'} = '*document_root C12
  |EXTRA
  |section_childs:EC[E4]
  |section_directions:D[up->E2]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -83,8 +87,9 @@ $result_tree_text{'sections_test'} = '*document_root C12
   |{ }
  |EXTRA
  |section_directions:D[up->E3]
+ |section_heading_number:{1.1.1.1}
  |section_level:{4}
- |section_number:{1.1.1.1}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -102,6 +107,7 @@ $result_tree_text{'sections_test'} = '*document_root C12
  |section_childs:EC[E6|E7|E8]
  |section_directions:D[next->E9|prev->E0]
  |section_level:{0}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -116,8 +122,9 @@ $result_tree_text{'sections_test'} = '*document_root C12
  |EXTRA
  |associated_part:[E5]
  |section_directions:D[next->E7|up->E5]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{7}
  |toplevel_directions:D[next->E7|prev->E1|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -132,8 +139,9 @@ $result_tree_text{'sections_test'} = '*document_root C12
   |{ }
  |EXTRA
  |section_directions:D[next->E8|prev->E6|up->E5]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{8}
  |toplevel_directions:D[next->E8|prev->E6|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -149,6 +157,7 @@ $result_tree_text{'sections_test'} = '*document_root C12
  |EXTRA
  |section_directions:D[prev->E7|up->E5]
  |section_level:{1}
+ |section_number:{9}
  |toplevel_directions:D[next->E9|prev->E7|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -164,8 +173,9 @@ $result_tree_text{'sections_test'} = '*document_root C12
  |EXTRA
  |section_childs:EC[E10]
  |section_directions:D[prev->E5]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{10}
  |toplevel_directions:D[prev->E8|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -180,8 +190,9 @@ $result_tree_text{'sections_test'} = '*document_root C12
   |{ }
  |EXTRA
  |section_directions:D[up->E9]
+ |section_heading_number:{A.1}
  |section_level:{2}
- |section_number:{A.1}
+ |section_number:{11}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/moresectioning/sections_test_no_use_nodes.pl 
b/tta/perl/t/results/moresectioning/sections_test_no_use_nodes.pl
index ea8eba8d47..ea8deadd5e 100644
--- a/tta/perl/t/results/moresectioning/sections_test_no_use_nodes.pl
+++ b/tta/perl/t/results/moresectioning/sections_test_no_use_nodes.pl
@@ -15,6 +15,7 @@ $result_tree_text{'sections_test_no_use_nodes'} = 
'*document_root C12
  |section_childs:EC[E1]
  |section_directions:D[next->E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -35,8 +36,9 @@ $result_tree_text{'sections_test_no_use_nodes'} = 
'*document_root C12
  |EXTRA
  |section_childs:EC[E2]
  |section_directions:D[up->E0]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E0|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -52,8 +54,9 @@ $result_tree_text{'sections_test_no_use_nodes'} = 
'*document_root C12
  |EXTRA
  |section_childs:EC[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -68,8 +71,9 @@ $result_tree_text{'sections_test_no_use_nodes'} = 
'*document_root C12
  |EXTRA
  |section_childs:EC[E4]
  |section_directions:D[up->E2]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -83,8 +87,9 @@ $result_tree_text{'sections_test_no_use_nodes'} = 
'*document_root C12
   |{ }
  |EXTRA
  |section_directions:D[up->E3]
+ |section_heading_number:{1.1.1.1}
  |section_level:{4}
- |section_number:{1.1.1.1}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -102,6 +107,7 @@ $result_tree_text{'sections_test_no_use_nodes'} = 
'*document_root C12
  |section_childs:EC[E6|E7|E8]
  |section_directions:D[next->E9|prev->E0]
  |section_level:{0}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -116,8 +122,9 @@ $result_tree_text{'sections_test_no_use_nodes'} = 
'*document_root C12
  |EXTRA
  |associated_part:[E5]
  |section_directions:D[next->E7|up->E5]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{7}
  |toplevel_directions:D[next->E7|prev->E1|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -132,8 +139,9 @@ $result_tree_text{'sections_test_no_use_nodes'} = 
'*document_root C12
   |{ }
  |EXTRA
  |section_directions:D[next->E8|prev->E6|up->E5]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{8}
  |toplevel_directions:D[next->E8|prev->E6|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -149,6 +157,7 @@ $result_tree_text{'sections_test_no_use_nodes'} = 
'*document_root C12
  |EXTRA
  |section_directions:D[prev->E7|up->E5]
  |section_level:{1}
+ |section_number:{9}
  |toplevel_directions:D[next->E9|prev->E7|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -164,8 +173,9 @@ $result_tree_text{'sections_test_no_use_nodes'} = 
'*document_root C12
  |EXTRA
  |section_childs:EC[E10]
  |section_directions:D[prev->E5]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{10}
  |toplevel_directions:D[prev->E8|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -180,8 +190,9 @@ $result_tree_text{'sections_test_no_use_nodes'} = 
'*document_root C12
   |{ }
  |EXTRA
  |section_directions:D[up->E9]
+ |section_heading_number:{A.1}
  |section_level:{2}
- |section_number:{A.1}
+ |section_number:{11}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git 
a/tta/perl/t/results/moresectioning/sections_test_no_use_nodes_use_node_directions.pl
 
b/tta/perl/t/results/moresectioning/sections_test_no_use_nodes_use_node_directions.pl
index c59b957f33..d6d72f9028 100644
--- 
a/tta/perl/t/results/moresectioning/sections_test_no_use_nodes_use_node_directions.pl
+++ 
b/tta/perl/t/results/moresectioning/sections_test_no_use_nodes_use_node_directions.pl
@@ -15,6 +15,7 @@ 
$result_tree_text{'sections_test_no_use_nodes_use_node_directions'} = '*document
  |section_childs:EC[E1]
  |section_directions:D[next->E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -35,8 +36,9 @@ 
$result_tree_text{'sections_test_no_use_nodes_use_node_directions'} = '*document
  |EXTRA
  |section_childs:EC[E2]
  |section_directions:D[up->E0]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E0|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -52,8 +54,9 @@ 
$result_tree_text{'sections_test_no_use_nodes_use_node_directions'} = '*document
  |EXTRA
  |section_childs:EC[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -68,8 +71,9 @@ 
$result_tree_text{'sections_test_no_use_nodes_use_node_directions'} = '*document
  |EXTRA
  |section_childs:EC[E4]
  |section_directions:D[up->E2]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -83,8 +87,9 @@ 
$result_tree_text{'sections_test_no_use_nodes_use_node_directions'} = '*document
   |{ }
  |EXTRA
  |section_directions:D[up->E3]
+ |section_heading_number:{1.1.1.1}
  |section_level:{4}
- |section_number:{1.1.1.1}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -102,6 +107,7 @@ 
$result_tree_text{'sections_test_no_use_nodes_use_node_directions'} = '*document
  |section_childs:EC[E6|E7|E8]
  |section_directions:D[next->E9|prev->E0]
  |section_level:{0}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -116,8 +122,9 @@ 
$result_tree_text{'sections_test_no_use_nodes_use_node_directions'} = '*document
  |EXTRA
  |associated_part:[E5]
  |section_directions:D[next->E7|up->E5]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{7}
  |toplevel_directions:D[next->E7|prev->E1|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -132,8 +139,9 @@ 
$result_tree_text{'sections_test_no_use_nodes_use_node_directions'} = '*document
   |{ }
  |EXTRA
  |section_directions:D[next->E8|prev->E6|up->E5]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{8}
  |toplevel_directions:D[next->E8|prev->E6|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -149,6 +157,7 @@ 
$result_tree_text{'sections_test_no_use_nodes_use_node_directions'} = '*document
  |EXTRA
  |section_directions:D[prev->E7|up->E5]
  |section_level:{1}
+ |section_number:{9}
  |toplevel_directions:D[next->E9|prev->E7|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -164,8 +173,9 @@ 
$result_tree_text{'sections_test_no_use_nodes_use_node_directions'} = '*document
  |EXTRA
  |section_childs:EC[E10]
  |section_directions:D[prev->E5]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{10}
  |toplevel_directions:D[prev->E8|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -180,8 +190,9 @@ 
$result_tree_text{'sections_test_no_use_nodes_use_node_directions'} = '*document
   |{ }
  |EXTRA
  |section_directions:D[up->E9]
+ |section_heading_number:{A.1}
  |section_level:{2}
- |section_number:{A.1}
+ |section_number:{11}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/moresectioning/shortcontents.pl 
b/tta/perl/t/results/moresectioning/shortcontents.pl
index b80a52d793..794f411d44 100644
--- a/tta/perl/t/results/moresectioning/shortcontents.pl
+++ b/tta/perl/t/results/moresectioning/shortcontents.pl
@@ -15,6 +15,7 @@ $result_tree_text{'shortcontents'} = '*document_root C12
  |section_childs:EC[E1]
  |section_directions:D[next->E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -35,8 +36,9 @@ $result_tree_text{'shortcontents'} = '*document_root C12
  |EXTRA
  |section_childs:EC[E2]
  |section_directions:D[up->E0]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E0|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -52,8 +54,9 @@ $result_tree_text{'shortcontents'} = '*document_root C12
  |EXTRA
  |section_childs:EC[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -68,8 +71,9 @@ $result_tree_text{'shortcontents'} = '*document_root C12
  |EXTRA
  |section_childs:EC[E4]
  |section_directions:D[up->E2]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -83,8 +87,9 @@ $result_tree_text{'shortcontents'} = '*document_root C12
   |{ }
  |EXTRA
  |section_directions:D[up->E3]
+ |section_heading_number:{1.1.1.1}
  |section_level:{4}
- |section_number:{1.1.1.1}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -102,6 +107,7 @@ $result_tree_text{'shortcontents'} = '*document_root C12
  |section_childs:EC[E6|E7|E8]
  |section_directions:D[next->E9|prev->E0]
  |section_level:{0}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -116,8 +122,9 @@ $result_tree_text{'shortcontents'} = '*document_root C12
  |EXTRA
  |associated_part:[E5]
  |section_directions:D[next->E7|up->E5]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{7}
  |toplevel_directions:D[next->E7|prev->E1|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -132,8 +139,9 @@ $result_tree_text{'shortcontents'} = '*document_root C12
   |{ }
  |EXTRA
  |section_directions:D[next->E8|prev->E6|up->E5]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{8}
  |toplevel_directions:D[next->E8|prev->E6|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -149,6 +157,7 @@ $result_tree_text{'shortcontents'} = '*document_root C12
  |EXTRA
  |section_directions:D[prev->E7|up->E5]
  |section_level:{1}
+ |section_number:{9}
  |toplevel_directions:D[next->E9|prev->E7|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -164,8 +173,9 @@ $result_tree_text{'shortcontents'} = '*document_root C12
  |EXTRA
  |section_childs:EC[E10]
  |section_directions:D[prev->E5]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{10}
  |toplevel_directions:D[prev->E8|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -180,8 +190,9 @@ $result_tree_text{'shortcontents'} = '*document_root C12
   |{ }
  |EXTRA
  |section_directions:D[up->E9]
+ |section_heading_number:{A.1}
  |section_level:{2}
- |section_number:{A.1}
+ |section_number:{11}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/moresectioning/special_spaces_in_nodes.pl 
b/tta/perl/t/results/moresectioning/special_spaces_in_nodes.pl
index 0ec5b5a09e..467bb5b9de 100644
--- a/tta/perl/t/results/moresectioning/special_spaces_in_nodes.pl
+++ b/tta/perl/t/results/moresectioning/special_spaces_in_nodes.pl
@@ -18,6 +18,7 @@ $result_tree_text{'special_spaces_in_nodes'} = 
'*document_root C14
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top_2002}
   *arguments_line C1
    *line_arg C1
@@ -34,6 +35,7 @@ $result_tree_text{'special_spaces_in_nodes'} = 
'*document_root C14
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -57,6 +59,7 @@ $result_tree_text{'special_spaces_in_nodes'} = 
'*document_root C14
  |is_target:{1}
  |menus:EC[E4]
  |node_directions:D[up->E0]
+ |node_number:{2}
  
|normalized:{EN-QUAD_007c_2002_007c-EM-QUAD_007c_2003_007c-EN-SPACE_007c_2002_007c}
   *arguments_line C1
    *line_arg C1
@@ -72,8 +75,9 @@ $result_tree_text{'special_spaces_in_nodes'} = 
'*document_root C14
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -197,6 +201,7 @@ $result_tree_text{'special_spaces_in_nodes'} = 
'*document_root C14
  |is_target:{1}
  |menu_directions:D[next->E6|up->E2]
  |node_directions:D[next->E6|up->E2]
+ |node_number:{3}
  
|normalized:{CHARACTER-TABULATION_007c-_007c-FORM-FEED_007c-_007c-LINE-TABULATION_007c-_007c}
   *arguments_line C1
    *line_arg C1
@@ -213,6 +218,7 @@ $result_tree_text{'special_spaces_in_nodes'} = 
'*document_root C14
  |is_target:{1}
  |menu_directions:D[next->E7|prev->E5|up->E2]
  |node_directions:D[next->E7|prev->E5|up->E2]
+ |node_number:{4}
  |normalized:{CARRIAGE-RETURN_007c-_007c}
   *arguments_line C1
    *line_arg C1
@@ -229,6 +235,7 @@ $result_tree_text{'special_spaces_in_nodes'} = 
'*document_root C14
  |is_target:{1}
  |menu_directions:D[next->E8|prev->E6|up->E2]
  |node_directions:D[next->E8|prev->E6|up->E2]
+ |node_number:{5}
  
|normalized:{NEXT-LINE-_0028NEL_0029_007c_0085_007c-NO_002dBREAK-SPACE_007c_00a0_007c-OGHAM-SPACE-MARK_007c_1680_007c}
   *arguments_line C1
    *line_arg C1
@@ -245,6 +252,7 @@ $result_tree_text{'special_spaces_in_nodes'} = 
'*document_root C14
  |is_target:{1}
  |menu_directions:D[next->E9|prev->E7|up->E2]
  |node_directions:D[next->E9|prev->E7|up->E2]
+ |node_number:{6}
  |normalized:{MONGOLIAN-VOWEL-SEPARATOR_007c_180e_007c-EM-SPACE_007c_2003_007c}
   *arguments_line C1
    *line_arg C1
@@ -261,6 +269,7 @@ $result_tree_text{'special_spaces_in_nodes'} = 
'*document_root C14
  |is_target:{1}
  |menu_directions:D[next->E10|prev->E8|up->E2]
  |node_directions:D[next->E10|prev->E8|up->E2]
+ |node_number:{7}
  
|normalized:{THREE_002dPER_002dEM-SPACE_007c_2004_007c-FOUR_002dPER_002dEM-SPACE_007c_2005_007c-SIX_002dPER_002dEM-SPACE_007c_2006_007c}
   *arguments_line C1
    *line_arg C1
@@ -277,6 +286,7 @@ $result_tree_text{'special_spaces_in_nodes'} = 
'*document_root C14
  |is_target:{1}
  |menu_directions:D[next->E11|prev->E9|up->E2]
  |node_directions:D[next->E11|prev->E9|up->E2]
+ |node_number:{8}
  
|normalized:{FIGURE-SPACE_007c_2007_007c-PUNCTUATION-SPACE_007c_2008_007c-THIN-SPACE_007c_2009_007c}
   *arguments_line C1
    *line_arg C1
@@ -293,6 +303,7 @@ $result_tree_text{'special_spaces_in_nodes'} = 
'*document_root C14
  |is_target:{1}
  |menu_directions:D[next->E12|prev->E10|up->E2]
  |node_directions:D[next->E12|prev->E10|up->E2]
+ |node_number:{9}
  
|normalized:{HAIR-SPACE_007c_200a_007c-LINE-SEPARATOR_007c_2028_007c-PARAGRAPH-SEPARATOR_007c_2029_007c}
   *arguments_line C1
    *line_arg C1
@@ -309,6 +320,7 @@ $result_tree_text{'special_spaces_in_nodes'} = 
'*document_root C14
  |is_target:{1}
  |menu_directions:D[prev->E11|up->E2]
  |node_directions:D[prev->E11|up->E2]
+ |node_number:{10}
  
|normalized:{NARROW-NO_002dBREAK-SPACE_007c_202f_007c-MEDIUM-MATHEMATICAL-SPACE_007c_205f_007c-IDEOGRAPHIC-SPACE_007c_3000_007c}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/moresectioning/top_chapter_sections.pl 
b/tta/perl/t/results/moresectioning/top_chapter_sections.pl
index 9950228170..76e772df1b 100644
--- a/tta/perl/t/results/moresectioning/top_chapter_sections.pl
+++ b/tta/perl/t/results/moresectioning/top_chapter_sections.pl
@@ -18,6 +18,7 @@ FastForward: [U1]
  |EXTRA
  |section_childs:EC[E1|E2|E4|E8]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -48,6 +49,7 @@ Up: [U0]
  |EXTRA
  |section_directions:D[next->E2|up->E0]
  |section_level:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E2|prev->E0|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -74,8 +76,9 @@ Up: [U0]
  |EXTRA
  |section_childs:EC[E3]
  |section_directions:D[next->E4|prev->E1|up->E0]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{3}
  |toplevel_directions:D[next->E4|prev->E1|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -99,8 +102,9 @@ Up: [U2]
   |{ }
  |EXTRA
  |section_directions:D[up->E2]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -126,8 +130,9 @@ Up: [U0]
  |EXTRA
  |section_childs:EC[E5]
  |section_directions:D[next->E8|prev->E2|up->E0]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{5}
  |toplevel_directions:D[next->E8|prev->E2|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -152,8 +157,9 @@ Up: [U4]
  |EXTRA
  |section_childs:EC[E6|E7]
  |section_directions:D[up->E4]
+ |section_heading_number:{2.1}
  |section_level:{2}
- |section_number:{2.1}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -177,8 +183,9 @@ Up: [U5]
   |{ }
  |EXTRA
  |section_directions:D[next->E7|up->E5]
+ |section_heading_number:{2.1.1}
  |section_level:{3}
- |section_number:{2.1.1}
+ |section_number:{7}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -202,8 +209,9 @@ Up: [U5]
   |{ }
  |EXTRA
  |section_directions:D[prev->E6|up->E5]
+ |section_heading_number:{2.1.2}
  |section_level:{3}
- |section_number:{2.1.2}
+ |section_number:{8}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -225,8 +233,9 @@ Up: [U0]
   |{ }
  |EXTRA
  |section_directions:D[prev->E4|up->E0]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{9}
  |toplevel_directions:D[prev->E4|up->E0]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/moresectioning/top_node_up_url.pl 
b/tta/perl/t/results/moresectioning/top_node_up_url.pl
index cc1b73f933..370e38e204 100644
--- a/tta/perl/t/results/moresectioning/top_node_up_url.pl
+++ b/tta/perl/t/results/moresectioning/top_node_up_url.pl
@@ -22,6 +22,7 @@ NodeForward: [U1]
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -37,6 +38,7 @@ NodeForward: [U1]
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -95,6 +97,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/moresectioning/topic_guide.pl 
b/tta/perl/t/results/moresectioning/topic_guide.pl
index ea22c541db..61ae076564 100644
--- a/tta/perl/t/results/moresectioning/topic_guide.pl
+++ b/tta/perl/t/results/moresectioning/topic_guide.pl
@@ -20,6 +20,7 @@ $result_tree_text{'topic_guide'} = '*document_root C13
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'topic_guide'} = '*document_root C13
  |associated_node:[E0]
  |section_childs:EC[E4|E17]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -104,6 +106,7 @@ $result_tree_text{'topic_guide'} = '*document_root C13
  |menu_directions:D[next->E16|up->E14]
  |menus:EC[E5]
  |node_directions:D[next->E16|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{guide1}
   *arguments_line C1
    *line_arg C1
@@ -119,8 +122,9 @@ $result_tree_text{'topic_guide'} = '*document_root C13
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E17|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E17|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -192,6 +196,7 @@ $result_tree_text{'topic_guide'} = '*document_root C13
  |menu_directions:D[next->E8|up->E3]
  |menus:EC[E7]
  |node_directions:D[next->E8]
+ |node_number:{3}
  |normalized:{topic1}
   *arguments_line C2
    *line_arg C1
@@ -252,6 +257,7 @@ $result_tree_text{'topic_guide'} = '*document_root C13
  |menu_directions:D[next->E14|prev->E6|up->E3]
  |menus:EC[E9]
  |node_directions:D[next->E10|prev->E6]
+ |node_number:{4}
  |normalized:{topic2}
   *arguments_line C3
    *line_arg C1
@@ -319,6 +325,7 @@ $result_tree_text{'topic_guide'} = '*document_root C13
  |is_target:{1}
  |menus:EC[E11]
  |node_directions:D[next->E14|prev->E8]
+ |node_number:{5}
  |normalized:{topic3}
   *arguments_line C3
    *line_arg C1
@@ -376,6 +383,7 @@ $result_tree_text{'topic_guide'} = '*document_root C13
  |menu_directions:D[prev->E14|up->E16]
  |menus:EC[E13]
  |node_directions:D[prev->E14|up->E16]
+ |node_number:{6}
  |normalized:{topic4}
   *arguments_line C1
    *line_arg C1
@@ -429,6 +437,7 @@ $result_tree_text{'topic_guide'} = '*document_root C13
  |menu_directions:D[next->E12|prev->E8|up->E16]
  |menus:EC[E15]
  |node_directions:D[prev->E10]
+ |node_number:{7}
  |normalized:{topic5}
   *arguments_line C3
    *line_arg C1
@@ -506,6 +515,7 @@ $result_tree_text{'topic_guide'} = '*document_root C13
  |menu_directions:D[prev->E3|up->E14]
  |menus:EC[E18]
  |node_directions:D[prev->E3|up->E0]
+ |node_number:{8}
  |normalized:{guide2}
   *arguments_line C1
    *line_arg C1
@@ -521,8 +531,9 @@ $result_tree_text{'topic_guide'} = '*document_root C13
  |associated_anchor_command:[E16]
  |associated_node:[E16]
  |section_directions:D[prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/no_structure_test/one/res_html/test_struct.html 
b/tta/perl/t/results/no_structure_test/one/res_html/test_struct.html
index 487b01092c..c5f947bd2a 100644
--- a/tta/perl/t/results/no_structure_test/one/res_html/test_struct.html
+++ b/tta/perl/t/results/no_structure_test/one/res_html/test_struct.html
@@ -13,6 +13,7 @@
 
 <link href="#Top" rel="start" title="Top">
 <link href="#results" rel="index" title="results">
+<link href="#SEC_Contents" rel="contents" title="Table of Contents">
 <style type="text/css">
 <!--
 a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em}
@@ -32,19 +33,21 @@ th.index-letter-header-printindex {text-align: left; 
font-size: 150%; padding-bo
 
 <body lang="">
 
-<div class="top-level-extent">
+<div class="top-level-extent" id="First-File">
 <div class="nav-panel">
 <p>
-[<a href="#results" title="Index" rel="index">Index</a>]</p>
+[<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>][<a href="#results" title="Index" 
rel="index">Index</a>]</p>
 </div>
+<h1 class="top"><span>First File<a class="copiable-link" href="#First-File"> 
&para;</a></span></h1>
 <h1 class="node" id="Top"><span>Top<a class="copiable-link" href="#Top"> 
&para;</a></span></h1>
 
 <hr>
 <div class="chapter-level-extent" id="chap">
 <div class="nav-panel">
 <p>
-[<a href="#results" title="Index" rel="index">Index</a>]</p>
+[<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>][<a href="#results" title="Index" 
rel="index">Index</a>]</p>
 </div>
+<h2 class="chapter" id="Chap"><span>Chap<a class="copiable-link" href="#Chap"> 
&para;</a></span></h2>
 
 <a class="anchor" id="point"></a>
 <a class="index-entry-id" id="index-c"></a>
@@ -54,8 +57,9 @@ th.index-letter-header-printindex {text-align: left; 
font-size: 150%; padding-bo
 <div class="appendix-level-extent" id="results">
 <div class="nav-panel">
 <p>
-[<a href="#results" title="Index" rel="index">Index</a>]</p>
+[<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>][<a href="#results" title="Index" 
rel="index">Index</a>]</p>
 </div>
+<h2 class="appendix" id="Results"><span>Results<a class="copiable-link" 
href="#Results"> &para;</a></span></h2>
 
 <p>See &lsquo;point&rsquo;.
 </p>
@@ -64,7 +68,8 @@ th.index-letter-header-printindex {text-align: left; 
font-size: 150%; padding-bo
 </td></tr>
 </table>
 
-<div class="subsection-level-extent">
+<div class="subsection-level-extent" id="subsec">
+<h4 class="subsection"><span>subsec<a class="copiable-link" href="#subsec"> 
&para;</a></span></h4>
 <div class="printindex cp-printindex">
 <table class="index-entries-printindex cp-entries-printindex">
 <tr><th class="index-letter-header-printindex cp-letter-header-printindex" 
colspan="2" id="results_cp_letter-C">C</th></tr>
diff --git a/tta/perl/t/results/plaintext_tests/all_spaces.pl 
b/tta/perl/t/results/plaintext_tests/all_spaces.pl
index 32b3a3bb23..7451e8f9d1 100644
--- a/tta/perl/t/results/plaintext_tests/all_spaces.pl
+++ b/tta/perl/t/results/plaintext_tests/all_spaces.pl
@@ -28,6 +28,7 @@ $result_tree_text{'all_spaces'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -42,6 +43,7 @@ $result_tree_text{'all_spaces'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/plaintext_tests/cartouche_and_paragraph_indentation.pl 
b/tta/perl/t/results/plaintext_tests/cartouche_and_paragraph_indentation.pl
index 3cd43a9227..88773bbffa 100644
--- a/tta/perl/t/results/plaintext_tests/cartouche_and_paragraph_indentation.pl
+++ b/tta/perl/t/results/plaintext_tests/cartouche_and_paragraph_indentation.pl
@@ -15,6 +15,7 @@ $result_tree_text{'cartouche_and_paragraph_indentation'} = 
'*document_root C7
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'cartouche_and_paragraph_indentation'} = 
'*document_root C7
  |associated_node:[E0]
  |section_childs:EC[E3|E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -53,6 +55,7 @@ $result_tree_text{'cartouche_and_paragraph_indentation'} = 
'*document_root C7
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -68,8 +71,9 @@ $result_tree_text{'cartouche_and_paragraph_indentation'} = 
'*document_root C7
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -122,6 +126,7 @@ $result_tree_text{'cartouche_and_paragraph_indentation'} = 
'*document_root C7
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{chap2}
   *arguments_line C1
    *line_arg C1
@@ -137,8 +142,9 @@ $result_tree_text{'cartouche_and_paragraph_indentation'} = 
'*document_root C7
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/plaintext_tests/chinese_mixed_with_en.pl 
b/tta/perl/t/results/plaintext_tests/chinese_mixed_with_en.pl
index ccc7b5a137..2b58fbac4c 100644
--- a/tta/perl/t/results/plaintext_tests/chinese_mixed_with_en.pl
+++ b/tta/perl/t/results/plaintext_tests/chinese_mixed_with_en.pl
@@ -41,6 +41,7 @@ $result_tree_text{'chinese_mixed_with_en'} = '*document_root 
C6
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -57,6 +58,7 @@ $result_tree_text{'chinese_mixed_with_en'} = '*document_root 
C6
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -82,6 +84,7 @@ $result_tree_text{'chinese_mixed_with_en'} = '*document_root 
C6
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Mixed-english-and-chinese}
   *arguments_line C1
    *line_arg C1
@@ -97,8 +100,9 @@ $result_tree_text{'chinese_mixed_with_en'} = '*document_root 
C6
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/plaintext_tests/japanese_utf8.pl 
b/tta/perl/t/results/plaintext_tests/japanese_utf8.pl
index bb1d36bc30..d053c14b55 100644
--- a/tta/perl/t/results/plaintext_tests/japanese_utf8.pl
+++ b/tta/perl/t/results/plaintext_tests/japanese_utf8.pl
@@ -67,6 +67,7 @@ $result_tree_text{'japanese_utf8'} = '*document_root C8
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -83,6 +84,7 @@ $result_tree_text{'japanese_utf8'} = '*document_root C8
  |associated_node:[E0]
  |section_childs:EC[E4|E6]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -188,6 +190,7 @@ $result_tree_text{'japanese_utf8'} = '*document_root C8
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Preface}
   *arguments_line C1
    *line_arg C1
@@ -203,8 +206,9 @@ $result_tree_text{'japanese_utf8'} = '*document_root C8
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -227,6 +231,7 @@ $result_tree_text{'japanese_utf8'} = '*document_root C8
  |is_target:{1}
  |menu_directions:D[prev->E3|up->E0]
  |node_directions:D[prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{Introduction}
   *arguments_line C1
    *line_arg C1
@@ -242,8 +247,9 @@ $result_tree_text{'japanese_utf8'} = '*document_root C8
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/plaintext_tests/line_passed_and_formats.pl 
b/tta/perl/t/results/plaintext_tests/line_passed_and_formats.pl
index 64cda155e7..c593a8f7ac 100644
--- a/tta/perl/t/results/plaintext_tests/line_passed_and_formats.pl
+++ b/tta/perl/t/results/plaintext_tests/line_passed_and_formats.pl
@@ -14,6 +14,7 @@ $result_tree_text{'line_passed_and_formats'} = 
'*document_root C2
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->MISSING: (menu_entry_node)[C4]]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/plaintext_tests/no_empty_line_after_section.pl 
b/tta/perl/t/results/plaintext_tests/no_empty_line_after_section.pl
index 2eccab5bf6..5fabf06084 100644
--- a/tta/perl/t/results/plaintext_tests/no_empty_line_after_section.pl
+++ b/tta/perl/t/results/plaintext_tests/no_empty_line_after_section.pl
@@ -15,6 +15,7 @@ $result_tree_text{'no_empty_line_after_section'} = 
'*document_root C5
  |EXTRA
  |section_childs:EC[E1]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -37,8 +38,9 @@ $result_tree_text{'no_empty_line_after_section'} = 
'*document_root C5
  |EXTRA
  |section_childs:EC[E2|E3]
  |section_directions:D[up->E0]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E0|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -59,8 +61,9 @@ $result_tree_text{'no_empty_line_after_section'} = 
'*document_root C5
   |{ }
  |EXTRA
  |section_directions:D[next->E3|up->E1]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -90,8 +93,9 @@ $result_tree_text{'no_empty_line_after_section'} = 
'*document_root C5
   |{ }
  |EXTRA
  |section_directions:D[prev->E2|up->E1]
+ |section_heading_number:{1.2}
  |section_level:{2}
- |section_number:{1.2}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/plaintext_tests/non_break_spaces.pl 
b/tta/perl/t/results/plaintext_tests/non_break_spaces.pl
index 369cae3cc8..29ccbf6a49 100644
--- a/tta/perl/t/results/plaintext_tests/non_break_spaces.pl
+++ b/tta/perl/t/results/plaintext_tests/non_break_spaces.pl
@@ -27,6 +27,7 @@ $result_tree_text{'non_break_spaces'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph.pl 
b/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph.pl
index a7410da9d6..56e61238c9 100644
--- a/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph.pl
+++ b/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph.pl
@@ -19,6 +19,7 @@ $result_tree_text{'punctuation_sc_accents_ascii_glyph'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -35,6 +36,7 @@ $result_tree_text{'punctuation_sc_accents_ascii_glyph'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -57,6 +59,7 @@ $result_tree_text{'punctuation_sc_accents_ascii_glyph'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node-chap}
   *arguments_line C1
    *line_arg C1
@@ -72,8 +75,9 @@ $result_tree_text{'punctuation_sc_accents_ascii_glyph'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph_latin1.pl
 
b/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph_latin1.pl
index 9522b5a4eb..0b2f8f3699 100644
--- 
a/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph_latin1.pl
+++ 
b/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph_latin1.pl
@@ -33,6 +33,7 @@ 
$result_tree_text{'punctuation_sc_accents_ascii_glyph_latin1'} = '*document_root
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -49,6 +50,7 @@ 
$result_tree_text{'punctuation_sc_accents_ascii_glyph_latin1'} = '*document_root
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -71,6 +73,7 @@ 
$result_tree_text{'punctuation_sc_accents_ascii_glyph_latin1'} = '*document_root
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node-chap}
   *arguments_line C1
    *line_arg C1
@@ -86,8 +89,9 @@ 
$result_tree_text{'punctuation_sc_accents_ascii_glyph_latin1'} = '*document_root
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph_usascii.pl
 
b/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph_usascii.pl
index f215d647cb..b2b4dd0a81 100644
--- 
a/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph_usascii.pl
+++ 
b/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_ascii_glyph_usascii.pl
@@ -33,6 +33,7 @@ 
$result_tree_text{'punctuation_sc_accents_ascii_glyph_usascii'} = '*document_roo
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -49,6 +50,7 @@ 
$result_tree_text{'punctuation_sc_accents_ascii_glyph_usascii'} = '*document_roo
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -71,6 +73,7 @@ 
$result_tree_text{'punctuation_sc_accents_ascii_glyph_usascii'} = '*document_roo
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node-chap}
   *arguments_line C1
    *line_arg C1
@@ -86,8 +89,9 @@ 
$result_tree_text{'punctuation_sc_accents_ascii_glyph_usascii'} = '*document_roo
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_default.pl 
b/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_default.pl
index b9c19a54c6..0ab652cb8a 100644
--- a/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_default.pl
+++ b/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_default.pl
@@ -19,6 +19,7 @@ $result_tree_text{'punctuation_sc_accents_default'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -35,6 +36,7 @@ $result_tree_text{'punctuation_sc_accents_default'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -57,6 +59,7 @@ $result_tree_text{'punctuation_sc_accents_default'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node-chap}
   *arguments_line C1
    *line_arg C1
@@ -72,8 +75,9 @@ $result_tree_text{'punctuation_sc_accents_default'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_default_latin1.pl 
b/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_default_latin1.pl
index 9350c38196..48f37f61e9 100644
--- 
a/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_default_latin1.pl
+++ 
b/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_default_latin1.pl
@@ -33,6 +33,7 @@ $result_tree_text{'punctuation_sc_accents_default_latin1'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -49,6 +50,7 @@ $result_tree_text{'punctuation_sc_accents_default_latin1'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -71,6 +73,7 @@ $result_tree_text{'punctuation_sc_accents_default_latin1'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node-chap}
   *arguments_line C1
    *line_arg C1
@@ -86,8 +89,9 @@ $result_tree_text{'punctuation_sc_accents_default_latin1'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_default_usascii.pl 
b/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_default_usascii.pl
index 1c621057db..8bc041a811 100644
--- 
a/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_default_usascii.pl
+++ 
b/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_default_usascii.pl
@@ -33,6 +33,7 @@ $result_tree_text{'punctuation_sc_accents_default_usascii'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -49,6 +50,7 @@ $result_tree_text{'punctuation_sc_accents_default_usascii'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -71,6 +73,7 @@ $result_tree_text{'punctuation_sc_accents_default_usascii'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node-chap}
   *arguments_line C1
    *line_arg C1
@@ -86,8 +89,9 @@ $result_tree_text{'punctuation_sc_accents_default_usascii'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding.pl 
b/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding.pl
index c5024a295c..d1de9b2f0f 100644
--- 
a/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding.pl
+++ 
b/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding.pl
@@ -19,6 +19,7 @@ $result_tree_text{'punctuation_sc_accents_disable_encoding'} 
= '*document_root C
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -35,6 +36,7 @@ $result_tree_text{'punctuation_sc_accents_disable_encoding'} 
= '*document_root C
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -57,6 +59,7 @@ $result_tree_text{'punctuation_sc_accents_disable_encoding'} 
= '*document_root C
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node-chap}
   *arguments_line C1
    *line_arg C1
@@ -72,8 +75,9 @@ $result_tree_text{'punctuation_sc_accents_disable_encoding'} 
= '*document_root C
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_latin1.pl
 
b/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_latin1.pl
index e8cbb306d7..f780f8ffb4 100644
--- 
a/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_latin1.pl
+++ 
b/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_latin1.pl
@@ -33,6 +33,7 @@ 
$result_tree_text{'punctuation_sc_accents_disable_encoding_latin1'} = '*document
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -49,6 +50,7 @@ 
$result_tree_text{'punctuation_sc_accents_disable_encoding_latin1'} = '*document
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -71,6 +73,7 @@ 
$result_tree_text{'punctuation_sc_accents_disable_encoding_latin1'} = '*document
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node-chap}
   *arguments_line C1
    *line_arg C1
@@ -86,8 +89,9 @@ 
$result_tree_text{'punctuation_sc_accents_disable_encoding_latin1'} = '*document
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_usascii.pl
 
b/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_usascii.pl
index a425f872a7..eb1ffde7cf 100644
--- 
a/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_usascii.pl
+++ 
b/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_disable_encoding_usascii.pl
@@ -33,6 +33,7 @@ 
$result_tree_text{'punctuation_sc_accents_disable_encoding_usascii'} = '*documen
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -49,6 +50,7 @@ 
$result_tree_text{'punctuation_sc_accents_disable_encoding_usascii'} = '*documen
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -71,6 +73,7 @@ 
$result_tree_text{'punctuation_sc_accents_disable_encoding_usascii'} = '*documen
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node-chap}
   *arguments_line C1
    *line_arg C1
@@ -86,8 +89,9 @@ 
$result_tree_text{'punctuation_sc_accents_disable_encoding_usascii'} = '*documen
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_glyph_latin1.pl
 
b/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_glyph_latin1.pl
index b70abfb45f..3be04ecbd6 100644
--- 
a/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_glyph_latin1.pl
+++ 
b/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_glyph_latin1.pl
@@ -33,6 +33,7 @@ 
$result_tree_text{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = '*docum
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -49,6 +50,7 @@ 
$result_tree_text{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = '*docum
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -71,6 +73,7 @@ 
$result_tree_text{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = '*docum
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node-chap}
   *arguments_line C1
    *line_arg C1
@@ -86,8 +89,9 @@ 
$result_tree_text{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = '*docum
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_glyph_usascii.pl
 
b/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_glyph_usascii.pl
index 93d40a0d12..827c81a98e 100644
--- 
a/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_glyph_usascii.pl
+++ 
b/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_ascii_glyph_usascii.pl
@@ -33,6 +33,7 @@ 
$result_tree_text{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = '*docu
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -49,6 +50,7 @@ 
$result_tree_text{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = '*docu
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -71,6 +73,7 @@ 
$result_tree_text{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = '*docu
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node-chap}
   *arguments_line C1
    *line_arg C1
@@ -86,8 +89,9 @@ 
$result_tree_text{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = '*docu
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_latin1.pl 
b/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_latin1.pl
index 17f8cb3150..c6a2d77e69 100644
--- 
a/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_latin1.pl
+++ 
b/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_latin1.pl
@@ -33,6 +33,7 @@ $result_tree_text{'punctuation_sc_accents_to_utf8_latin1'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -49,6 +50,7 @@ $result_tree_text{'punctuation_sc_accents_to_utf8_latin1'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -71,6 +73,7 @@ $result_tree_text{'punctuation_sc_accents_to_utf8_latin1'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node-chap}
   *arguments_line C1
    *line_arg C1
@@ -86,8 +89,9 @@ $result_tree_text{'punctuation_sc_accents_to_utf8_latin1'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_usascii.pl 
b/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_usascii.pl
index da9c539166..5d45b1a58d 100644
--- 
a/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_usascii.pl
+++ 
b/tta/perl/t/results/plaintext_tests/punctuation_sc_accents_to_utf8_usascii.pl
@@ -33,6 +33,7 @@ $result_tree_text{'punctuation_sc_accents_to_utf8_usascii'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -49,6 +50,7 @@ $result_tree_text{'punctuation_sc_accents_to_utf8_usascii'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -71,6 +73,7 @@ $result_tree_text{'punctuation_sc_accents_to_utf8_usascii'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node-chap}
   *arguments_line C1
    *line_arg C1
@@ -86,8 +89,9 @@ $result_tree_text{'punctuation_sc_accents_to_utf8_usascii'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/plaintext_tests/quote_node_names.pl 
b/tta/perl/t/results/plaintext_tests/quote_node_names.pl
index e7af67a768..f2e36b4053 100644
--- a/tta/perl/t/results/plaintext_tests/quote_node_names.pl
+++ b/tta/perl/t/results/plaintext_tests/quote_node_names.pl
@@ -17,6 +17,7 @@ $result_tree_text{'quote_node_names'} = '*document_root C12
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -30,6 +31,7 @@ $result_tree_text{'quote_node_names'} = '*document_root C12
  |associated_node:[E0]
  |section_childs:EC[E4|E6|E8|E10]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -399,6 +401,7 @@ $result_tree_text{'quote_node_names'} = '*document_root C12
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{blah_003ablah}
   *arguments_line C1
    *line_arg C1
@@ -414,8 +417,9 @@ $result_tree_text{'quote_node_names'} = '*document_root C12
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -437,6 +441,7 @@ $result_tree_text{'quote_node_names'} = '*document_root C12
  |is_target:{1}
  |menu_directions:D[next->E7|prev->E3|up->E0]
  |node_directions:D[next->E7|prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{blumpty_002efump}
   *arguments_line C1
    *line_arg C1
@@ -452,8 +457,9 @@ $result_tree_text{'quote_node_names'} = '*document_root C12
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[next->E8|prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E8|prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -472,6 +478,7 @@ $result_tree_text{'quote_node_names'} = '*document_root C12
  |is_target:{1}
  |menu_directions:D[next->E9|prev->E5|up->E0]
  |node_directions:D[next->MISSING: (line_arg)[C6]|prev->MISSING: 
(line_arg)[C6]|up->MISSING: (line_arg)[C4]]
+ |node_number:{4}
  |normalized:{normal-node}
   *arguments_line C4
    *line_arg C1
@@ -528,8 +535,9 @@ $result_tree_text{'quote_node_names'} = '*document_root C12
  |associated_anchor_command:[E7]
  |associated_node:[E7]
  |section_directions:D[next->E10|prev->E6|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{4}
  |toplevel_directions:D[next->E10|prev->E6|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -548,6 +556,7 @@ $result_tree_text{'quote_node_names'} = '*document_root C12
  |is_target:{1}
  |menu_directions:D[prev->E7|up->E0]
  |node_directions:D[prev->E7|up->E0]
+ |node_number:{5}
  |normalized:{secret_002cnode}
   *arguments_line C1
    *line_arg C1
@@ -565,8 +574,9 @@ $result_tree_text{'quote_node_names'} = '*document_root C12
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[prev->E8|up->E1]
+ |section_heading_number:{4}
  |section_level:{1}
- |section_number:{4}
+ |section_number:{5}
  |toplevel_directions:D[prev->E8|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -583,6 +593,7 @@ $result_tree_text{'quote_node_names'} = '*document_root C12
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{6}
  |normalized:{top-secret-node}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/plaintext_tests/settitle_and_empty_top.pl 
b/tta/perl/t/results/plaintext_tests/settitle_and_empty_top.pl
index b74b4652b5..52a28992c9 100644
--- a/tta/perl/t/results/plaintext_tests/settitle_and_empty_top.pl
+++ b/tta/perl/t/results/plaintext_tests/settitle_and_empty_top.pl
@@ -19,6 +19,7 @@ $result_tree_text{'settitle_and_empty_top'} = '*document_root 
C2
  *0 @top C2 l3
  |EXTRA
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/raw/inlineraw_not_closed.pl 
b/tta/perl/t/results/raw/inlineraw_not_closed.pl
index 989a98e307..43572674d3 100644
--- a/tta/perl/t/results/raw/inlineraw_not_closed.pl
+++ b/tta/perl/t/results/raw/inlineraw_not_closed.pl
@@ -23,6 +23,7 @@ $result_tree_text{'inlineraw_not_closed'} = '*document_root C2
  |spaces_before_argument:
   |{ }
  |EXTRA
+ |section_heading_number:{1}
  |section_level:{2}
  |section_number:{1}
  |sectioning_root:
diff --git a/tta/perl/t/results/regions/anchor_in_copying.pl 
b/tta/perl/t/results/regions/anchor_in_copying.pl
index 33214c6dea..158e69ef34 100644
--- a/tta/perl/t/results/regions/anchor_in_copying.pl
+++ b/tta/perl/t/results/regions/anchor_in_copying.pl
@@ -47,6 +47,7 @@ $result_tree_text{'anchor_in_copying'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -62,6 +63,7 @@ $result_tree_text{'anchor_in_copying'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E1]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/regions/anchor_in_copying_in_footnote.pl 
b/tta/perl/t/results/regions/anchor_in_copying_in_footnote.pl
index f3796b747c..da38e0982a 100644
--- a/tta/perl/t/results/regions/anchor_in_copying_in_footnote.pl
+++ b/tta/perl/t/results/regions/anchor_in_copying_in_footnote.pl
@@ -55,6 +55,7 @@ $result_tree_text{'anchor_in_copying_in_footnote'} = 
'*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -70,6 +71,7 @@ $result_tree_text{'anchor_in_copying_in_footnote'} = 
'*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E1]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/regions/anchor_in_titlepage.pl 
b/tta/perl/t/results/regions/anchor_in_titlepage.pl
index d80b62f2ff..d6aeb6e7eb 100644
--- a/tta/perl/t/results/regions/anchor_in_titlepage.pl
+++ b/tta/perl/t/results/regions/anchor_in_titlepage.pl
@@ -42,6 +42,7 @@ $result_tree_text{'anchor_in_titlepage'} = '*document_root C5
  |EXTRA
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -63,6 +64,7 @@ $result_tree_text{'anchor_in_titlepage'} = '*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -79,8 +81,9 @@ $result_tree_text{'anchor_in_titlepage'} = '*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -95,6 +98,7 @@ $result_tree_text{'anchor_in_titlepage'} = '*document_root C5
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E2]
+ |node_number:{2}
  |normalized:{nchap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/regions/anchor_in_titlepage_titlepage.pl 
b/tta/perl/t/results/regions/anchor_in_titlepage_titlepage.pl
index a2ee8d61aa..42363d55d8 100644
--- a/tta/perl/t/results/regions/anchor_in_titlepage_titlepage.pl
+++ b/tta/perl/t/results/regions/anchor_in_titlepage_titlepage.pl
@@ -42,6 +42,7 @@ $result_tree_text{'anchor_in_titlepage_titlepage'} = 
'*document_root C5
  |EXTRA
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -63,6 +64,7 @@ $result_tree_text{'anchor_in_titlepage_titlepage'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -79,8 +81,9 @@ $result_tree_text{'anchor_in_titlepage_titlepage'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -95,6 +98,7 @@ $result_tree_text{'anchor_in_titlepage_titlepage'} = 
'*document_root C5
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E2]
+ |node_number:{2}
  |normalized:{nchap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/regions/format_in_titlepage.pl 
b/tta/perl/t/results/regions/format_in_titlepage.pl
index ef3a10c2dd..cc79b8ba99 100644
--- a/tta/perl/t/results/regions/format_in_titlepage.pl
+++ b/tta/perl/t/results/regions/format_in_titlepage.pl
@@ -53,6 +53,7 @@ $result_tree_text{'format_in_titlepage'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -67,6 +68,7 @@ $result_tree_text{'format_in_titlepage'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/regions/format_in_titlepage_titlepage.pl 
b/tta/perl/t/results/regions/format_in_titlepage_titlepage.pl
index 17760a2001..33ce69d2d5 100644
--- a/tta/perl/t/results/regions/format_in_titlepage_titlepage.pl
+++ b/tta/perl/t/results/regions/format_in_titlepage_titlepage.pl
@@ -53,6 +53,7 @@ $result_tree_text{'format_in_titlepage_titlepage'} = 
'*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -67,6 +68,7 @@ $result_tree_text{'format_in_titlepage_titlepage'} = 
'*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/regions/ref_in_copying.pl 
b/tta/perl/t/results/regions/ref_in_copying.pl
index 73dfd2fd28..6f89fb4709 100644
--- a/tta/perl/t/results/regions/ref_in_copying.pl
+++ b/tta/perl/t/results/regions/ref_in_copying.pl
@@ -43,6 +43,7 @@ $result_tree_text{'ref_in_copying'} = '*document_root C5
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -59,6 +60,7 @@ $result_tree_text{'ref_in_copying'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -116,6 +118,7 @@ $result_tree_text{'ref_in_copying'} = '*document_root C5
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{GFDL}
   *arguments_line C1
    *line_arg C1
@@ -131,8 +134,9 @@ $result_tree_text{'ref_in_copying'} = '*document_root C5
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/regions/ref_in_copying_insert_in_chapter.pl 
b/tta/perl/t/results/regions/ref_in_copying_insert_in_chapter.pl
index 85463863a7..27dec767e3 100644
--- a/tta/perl/t/results/regions/ref_in_copying_insert_in_chapter.pl
+++ b/tta/perl/t/results/regions/ref_in_copying_insert_in_chapter.pl
@@ -42,6 +42,7 @@ $result_tree_text{'ref_in_copying_insert_in_chapter'} = 
'*document_root C7
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -58,6 +59,7 @@ $result_tree_text{'ref_in_copying_insert_in_chapter'} = 
'*document_root C7
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -81,6 +83,7 @@ $result_tree_text{'ref_in_copying_insert_in_chapter'} = 
'*document_root C7
  |is_target:{1}
  |menus:EC[E4]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Intro}
   *arguments_line C1
    *line_arg C1
@@ -97,8 +100,9 @@ $result_tree_text{'ref_in_copying_insert_in_chapter'} = 
'*document_root C7
  |associated_node:[E2]
  |section_childs:EC[E6]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -151,6 +155,7 @@ $result_tree_text{'ref_in_copying_insert_in_chapter'} = 
'*document_root C7
  |is_target:{1}
  |menu_directions:D[up->E2]
  |node_directions:D[up->E2]
+ |node_number:{3}
  |normalized:{GFDL}
   *arguments_line C1
    *line_arg C1
@@ -166,8 +171,9 @@ $result_tree_text{'ref_in_copying_insert_in_chapter'} = 
'*document_root C7
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[up->E3]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/regions/today_in_copying.pl 
b/tta/perl/t/results/regions/today_in_copying.pl
index 43308a86cd..94a36dc4f8 100644
--- a/tta/perl/t/results/regions/today_in_copying.pl
+++ b/tta/perl/t/results/regions/today_in_copying.pl
@@ -38,6 +38,7 @@ $result_tree_text{'today_in_copying'} = '*document_root C4
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -53,6 +54,7 @@ $result_tree_text{'today_in_copying'} = '*document_root C4
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -72,6 +74,7 @@ $result_tree_text{'today_in_copying'} = '*document_root C4
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/same_parser_multiple_files/three_files_first_file_same_parser/res_html/chap.html
 
b/tta/perl/t/results/same_parser_multiple_files/three_files_first_file_same_parser/res_html/chap.html
index 33d2abf032..264e77ef0e 100644
--- 
a/tta/perl/t/results/same_parser_multiple_files/three_files_first_file_same_parser/res_html/chap.html
+++ 
b/tta/perl/t/results/same_parser_multiple_files/three_files_first_file_same_parser/res_html/chap.html
@@ -13,6 +13,13 @@
 
 <link href="index.html" rel="start" title="Top">
 <link href="results.html" rel="index" title="results">
+<link href="index.html#SEC_Contents" rel="contents" title="Table des 
mati&egrave;res">
+<style type="text/css">
+<!--
+a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em}
+span:hover a.copiable-link {visibility: visible}
+-->
+</style>
 
 
 </head>
@@ -21,9 +28,10 @@
 <div class="chapter-level-extent" id="chap">
 <div class="nav-panel">
 <p>
-[<a href="results.html" title="Index" rel="index">Index</a>]</p>
+[<a href="index.html#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>][<a href="results.html" title="Index" 
rel="index">Index</a>]</p>
 </div>
 <hr>
+<h2 class="chapter" id="Chap"><span>Chap<a class="copiable-link" href="#Chap"> 
&para;</a></span></h2>
 
 
 <p><abbr class="abbr" title="Abr Because Casual mlo">ABC</abbr> (Abr Because 
Casual mlo).
diff --git 
a/tta/perl/t/results/same_parser_multiple_files/three_files_first_file_same_parser/res_html/index.html
 
b/tta/perl/t/results/same_parser_multiple_files/three_files_first_file_same_parser/res_html/index.html
index 1b5938ab14..663d61b0b2 100644
--- 
a/tta/perl/t/results/same_parser_multiple_files/three_files_first_file_same_parser/res_html/index.html
+++ 
b/tta/perl/t/results/same_parser_multiple_files/three_files_first_file_same_parser/res_html/index.html
@@ -13,6 +13,7 @@
 
 <link href="#Top" rel="start" title="Top">
 <link href="results.html" rel="index" title="results">
+<link href="#SEC_Contents" rel="contents" title="Table of Contents">
 <style type="text/css">
 <!--
 a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em}
@@ -26,19 +27,20 @@ span:hover a.copiable-link {visibility: visible}
 <body lang="">
 
 
-<div class="top-level-extent">
+<div class="top-level-extent" id="First-File">
 <div class="nav-panel">
 <p>
-[<a href="results.html" title="Index" rel="index">Index</a>]</p>
+[<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>][<a href="results.html" title="Index" 
rel="index">Index</a>]</p>
 </div>
 <hr>
+<h1 class="top"><span>First File<a class="copiable-link" href="#First-File"> 
&para;</a></span></h1>
 <h1 class="node" id="Top"><span>Top<a class="copiable-link" href="#Top"> 
&para;</a></span></h1>
 
 </div>
 <hr>
 <div class="nav-panel">
 <p>
-[<a href="results.html" title="Index" rel="index">Index</a>]</p>
+[<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>][<a href="results.html" title="Index" 
rel="index">Index</a>]</p>
 </div>
 
 
diff --git 
a/tta/perl/t/results/same_parser_multiple_files/three_files_first_file_same_parser/res_html/results.html
 
b/tta/perl/t/results/same_parser_multiple_files/three_files_first_file_same_parser/res_html/results.html
index 7299762b2b..3690b470a2 100644
--- 
a/tta/perl/t/results/same_parser_multiple_files/three_files_first_file_same_parser/res_html/results.html
+++ 
b/tta/perl/t/results/same_parser_multiple_files/three_files_first_file_same_parser/res_html/results.html
@@ -13,6 +13,7 @@
 
 <link href="index.html" rel="start" title="Top">
 <link href="#results" rel="index" title="results">
+<link href="index.html#SEC_Contents" rel="contents" title="Table des 
mati&egrave;res">
 <style type="text/css">
 <!--
 a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em}
@@ -33,9 +34,10 @@ th.index-letter-header-printindex {text-align: left; 
font-size: 150%; padding-bo
 <div class="appendix-level-extent" id="results">
 <div class="nav-panel">
 <p>
-[<a href="#results" title="Index" rel="index">Index</a>]</p>
+[<a href="index.html#SEC_Contents" title="Table des mati&egrave;res" 
rel="contents">Contenu</a>][<a href="#results" title="Index" 
rel="index">Index</a>]</p>
 </div>
 <hr>
+<h2 class="appendix" id="Results"><span>Results<a class="copiable-link" 
href="#Results"> &para;</a></span></h2>
 
 
 <dl class="first-deftypeop def-block">
diff --git 
a/tta/perl/t/results/same_parser_multiple_files/three_files_next_file_same_parser/res_html/chap-for-next.html
 
b/tta/perl/t/results/same_parser_multiple_files/three_files_next_file_same_parser/res_html/chap-for-next.html
index c564947cee..101bac704d 100644
--- 
a/tta/perl/t/results/same_parser_multiple_files/three_files_next_file_same_parser/res_html/chap-for-next.html
+++ 
b/tta/perl/t/results/same_parser_multiple_files/three_files_next_file_same_parser/res_html/chap-for-next.html
@@ -13,6 +13,12 @@
 
 <link href="index.html" rel="start" title="Top">
 <link href="#chap-for-next" rel="index" title="chap for next">
+<style type="text/css">
+<!--
+a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em}
+span:hover a.copiable-link {visibility: visible}
+-->
+</style>
 
 
 </head>
@@ -24,6 +30,7 @@
 [<a href="#chap-for-next" title="Index" rel="index">Index</a>]</p>
 </div>
 <hr>
+<h2 class="chapter" id="Chap-for-Next"><span>Chap for Next<a 
class="copiable-link" href="#Chap-for-Next"> &para;</a></span></h2>
 
 
 
diff --git 
a/tta/perl/t/results/same_parser_multiple_files/three_files_next_file_same_parser/res_html/index.html
 
b/tta/perl/t/results/same_parser_multiple_files/three_files_next_file_same_parser/res_html/index.html
index 98dfbe8c33..f3074aa774 100644
--- 
a/tta/perl/t/results/same_parser_multiple_files/three_files_next_file_same_parser/res_html/index.html
+++ 
b/tta/perl/t/results/same_parser_multiple_files/three_files_next_file_same_parser/res_html/index.html
@@ -13,6 +13,12 @@
 
 <link href="#Top" rel="start" title="Top">
 <link href="chap-for-next.html" rel="index" title="chap for next">
+<style type="text/css">
+<!--
+a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em}
+span:hover a.copiable-link {visibility: visible}
+-->
+</style>
 
 
 </head>
@@ -24,6 +30,7 @@
 [<a href="chap-for-next.html" title="Index" rel="index">Index</a>]</p>
 </div>
 <hr>
+<h1 class="top" id="Next-File"><span>Next File<a class="copiable-link" 
href="#Next-File"> &para;</a></span></h1>
 
 </div>
 <hr>
diff --git a/tta/perl/t/results/sectioning/a_comma_after_node.pl 
b/tta/perl/t/results/sectioning/a_comma_after_node.pl
index d4b3e53bd5..d1b89f374a 100644
--- a/tta/perl/t/results/sectioning/a_comma_after_node.pl
+++ b/tta/perl/t/results/sectioning/a_comma_after_node.pl
@@ -12,6 +12,7 @@ $result_tree_text{'a_comma_after_node'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Commands}
   *arguments_line C3
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/anchor_zero.pl 
b/tta/perl/t/results/sectioning/anchor_zero.pl
index 3fcf948a46..e65a36566b 100644
--- a/tta/perl/t/results/sectioning/anchor_zero.pl
+++ b/tta/perl/t/results/sectioning/anchor_zero.pl
@@ -12,6 +12,7 @@ $result_tree_text{'anchor_zero'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/at_commands_in_node.pl 
b/tta/perl/t/results/sectioning/at_commands_in_node.pl
index 85d9ce45e7..427ad28cb6 100644
--- a/tta/perl/t/results/sectioning/at_commands_in_node.pl
+++ b/tta/perl/t/results/sectioning/at_commands_in_node.pl
@@ -12,6 +12,7 @@ $result_tree_text{'at_commands_in_node'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{A-sc-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1}
   *arguments_line C1
    *line_arg C14
diff --git a/tta/perl/t/results/sectioning/automatic_menu_referencing_node.pl 
b/tta/perl/t/results/sectioning/automatic_menu_referencing_node.pl
index 0a8a8ef137..94baa0a1bc 100644
--- a/tta/perl/t/results/sectioning/automatic_menu_referencing_node.pl
+++ b/tta/perl/t/results/sectioning/automatic_menu_referencing_node.pl
@@ -15,6 +15,7 @@ $result_tree_text{'automatic_menu_referencing_node'} = 
'*document_root C7
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'automatic_menu_referencing_node'} = 
'*document_root C7
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -53,6 +55,7 @@ $result_tree_text{'automatic_menu_referencing_node'} = 
'*document_root C7
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Chapter}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'automatic_menu_referencing_node'} = 
'*document_root C7
  |associated_node:[E2]
  |section_childs:EC[E5]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -88,6 +92,7 @@ $result_tree_text{'automatic_menu_referencing_node'} = 
'*document_root C7
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[up->E2]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -103,8 +108,9 @@ $result_tree_text{'automatic_menu_referencing_node'} = 
'*document_root C7
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[up->E3]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/sectioning/automatic_menu_with_heading.pl 
b/tta/perl/t/results/sectioning/automatic_menu_with_heading.pl
index 5023b786bd..5fbe89c3f0 100644
--- a/tta/perl/t/results/sectioning/automatic_menu_with_heading.pl
+++ b/tta/perl/t/results/sectioning/automatic_menu_with_heading.pl
@@ -15,6 +15,7 @@ $result_tree_text{'automatic_menu_with_heading'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'automatic_menu_with_heading'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -75,6 +77,7 @@ $result_tree_text{'automatic_menu_with_heading'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{heading-or-chapter}
   *arguments_line C1
    *line_arg C1
@@ -89,6 +92,7 @@ $result_tree_text{'automatic_menu_with_heading'} = 
'*document_root C5
   |EXTRA
   |associated_anchor_command:[E2]
   |global_command_number:{1}
+  |heading_number:{1}
    *line_arg C1
    |INFO
    |spaces_after_argument:
@@ -102,8 +106,9 @@ $result_tree_text{'automatic_menu_with_heading'} = 
'*document_root C5
  |EXTRA
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/chapter_before_and_after_part.pl 
b/tta/perl/t/results/sectioning/chapter_before_and_after_part.pl
index 05e6cde715..dcc3b00bba 100644
--- a/tta/perl/t/results/sectioning/chapter_before_and_after_part.pl
+++ b/tta/perl/t/results/sectioning/chapter_before_and_after_part.pl
@@ -17,6 +17,7 @@ FastForward: [U1]
  |spaces_before_argument:
   |{ }
  |EXTRA
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
@@ -47,6 +48,7 @@ FastBack: [U0]
  |part_associated_section:[E2]
  |section_childs:EC[E2]
  |section_level:{0}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -61,8 +63,9 @@ FastBack: [U0]
  |EXTRA
  |associated_part:[E1]
  |section_directions:D[up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E0]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/chapter_before_part.pl 
b/tta/perl/t/results/sectioning/chapter_before_part.pl
index f7ef9dbc52..57bad74972 100644
--- a/tta/perl/t/results/sectioning/chapter_before_part.pl
+++ b/tta/perl/t/results/sectioning/chapter_before_part.pl
@@ -16,6 +16,7 @@ Forward: [U1]
  |spaces_before_argument:
   |{ }
  |EXTRA
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
@@ -42,6 +43,7 @@ Back: [U0]
  |EXTRA
  |global_command_number:{1}
  |section_level:{0}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/sectioning/chapter_between_nodes.pl 
b/tta/perl/t/results/sectioning/chapter_between_nodes.pl
index 757ff1b104..ebfe9d4b50 100644
--- a/tta/perl/t/results/sectioning/chapter_between_nodes.pl
+++ b/tta/perl/t/results/sectioning/chapter_between_nodes.pl
@@ -17,6 +17,7 @@ $result_tree_text{'chapter_between_nodes'} = '*document_root 
C6
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E4]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -33,6 +34,7 @@ $result_tree_text{'chapter_between_nodes'} = '*document_root 
C6
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -84,8 +86,9 @@ $result_tree_text{'chapter_between_nodes'} = '*document_root 
C6
  |EXTRA
  |section_childs:EC[E5]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -107,6 +110,7 @@ $result_tree_text{'chapter_between_nodes'} = 
'*document_root C6
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[up->E0]
+ |node_number:{2}
  |normalized:{section-node}
   *arguments_line C4
    *line_arg C1
@@ -129,8 +133,9 @@ $result_tree_text{'chapter_between_nodes'} = 
'*document_root C6
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[up->E3]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/sectioning/chapter_between_nodes_texi2html.pl 
b/tta/perl/t/results/sectioning/chapter_between_nodes_texi2html.pl
index 06b51ed88f..92f0aa945d 100644
--- a/tta/perl/t/results/sectioning/chapter_between_nodes_texi2html.pl
+++ b/tta/perl/t/results/sectioning/chapter_between_nodes_texi2html.pl
@@ -16,6 +16,7 @@ $result_tree_text{'chapter_between_nodes_texi2html'} = 
'*document_root C6
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E4]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'chapter_between_nodes_texi2html'} = 
'*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -83,8 +85,9 @@ $result_tree_text{'chapter_between_nodes_texi2html'} = 
'*document_root C6
  |EXTRA
  |section_childs:EC[E5]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -106,6 +109,7 @@ $result_tree_text{'chapter_between_nodes_texi2html'} = 
'*document_root C6
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[up->E0]
+ |node_number:{2}
  |normalized:{section-node}
   *arguments_line C4
    *line_arg C1
@@ -128,8 +132,9 @@ $result_tree_text{'chapter_between_nodes_texi2html'} = 
'*document_root C6
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[up->E3]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git 
a/tta/perl/t/results/sectioning/chapter_between_nodes_with_appendix.pl 
b/tta/perl/t/results/sectioning/chapter_between_nodes_with_appendix.pl
index c4cee5eacc..6ab5975238 100644
--- a/tta/perl/t/results/sectioning/chapter_between_nodes_with_appendix.pl
+++ b/tta/perl/t/results/sectioning/chapter_between_nodes_with_appendix.pl
@@ -16,6 +16,7 @@ $result_tree_text{'chapter_between_nodes_with_appendix'} = 
'*document_root C6
  |is_target:{1}
  |menus:EC[E3]
  |node_directions:D[next->E4]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'chapter_between_nodes_with_appendix'} = 
'*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E2|E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -50,8 +52,9 @@ $result_tree_text{'chapter_between_nodes_with_appendix'} = 
'*document_root C6
   |{ }
  |EXTRA
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -101,6 +104,7 @@ $result_tree_text{'chapter_between_nodes_with_appendix'} = 
'*document_root C6
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Additional}
   *arguments_line C1
    *line_arg C1
@@ -116,8 +120,9 @@ $result_tree_text{'chapter_between_nodes_with_appendix'} = 
'*document_root C6
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[prev->E2|up->E1]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{3}
  |toplevel_directions:D[prev->E2|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/sectioning/chapter_between_nodes_with_appendix_nomenu.pl 
b/tta/perl/t/results/sectioning/chapter_between_nodes_with_appendix_nomenu.pl
index 1248da2327..2b502ed6d3 100644
--- 
a/tta/perl/t/results/sectioning/chapter_between_nodes_with_appendix_nomenu.pl
+++ 
b/tta/perl/t/results/sectioning/chapter_between_nodes_with_appendix_nomenu.pl
@@ -15,6 +15,7 @@ 
$result_tree_text{'chapter_between_nodes_with_appendix_nomenu'} = '*document_roo
  |associated_title_command:[E1]
  |is_target:{1}
  |menus:EC[E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ 
$result_tree_text{'chapter_between_nodes_with_appendix_nomenu'} = '*document_roo
  |associated_node:[E0]
  |section_childs:EC[E2|E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -49,8 +51,9 @@ 
$result_tree_text{'chapter_between_nodes_with_appendix_nomenu'} = '*document_roo
   |{ }
  |EXTRA
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -100,6 +103,7 @@ 
$result_tree_text{'chapter_between_nodes_with_appendix_nomenu'} = '*document_roo
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[up->E0]
+ |node_number:{2}
  |normalized:{Additional}
   *arguments_line C1
    *line_arg C1
@@ -115,8 +119,9 @@ 
$result_tree_text{'chapter_between_nodes_with_appendix_nomenu'} = '*document_roo
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[prev->E2|up->E1]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{3}
  |toplevel_directions:D[prev->E2|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/sectioning/chapter_node_before_and_after_part.pl 
b/tta/perl/t/results/sectioning/chapter_node_before_and_after_part.pl
index cfb60fa5fb..ef00a37f1f 100644
--- a/tta/perl/t/results/sectioning/chapter_node_before_and_after_part.pl
+++ b/tta/perl/t/results/sectioning/chapter_node_before_and_after_part.pl
@@ -17,6 +17,7 @@ $result_tree_text{'chapter_node_before_and_after_part'} = 
'*document_root C6
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E4]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'chapter_node_before_and_after_part'} = 
'*document_root C6
  |EXTRA
  |associated_anchor_command:[E0]
  |associated_node:[E0]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
@@ -85,6 +87,7 @@ $result_tree_text{'chapter_node_before_and_after_part'} = 
'*document_root C6
  |part_following_node:[E4]
  |section_childs:EC[E5]
  |section_level:{0}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -102,6 +105,7 @@ $result_tree_text{'chapter_node_before_and_after_part'} = 
'*document_root C6
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |node_preceding_part:[E3]
  |normalized:{after}
   *arguments_line C1
@@ -119,8 +123,9 @@ $result_tree_text{'chapter_node_before_and_after_part'} = 
'*document_root C6
  |associated_node:[E4]
  |associated_part:[E3]
  |section_directions:D[up->E3]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/character_and_spaces_in_node.pl 
b/tta/perl/t/results/sectioning/character_and_spaces_in_node.pl
index 8236149e76..25ee138901 100644
--- a/tta/perl/t/results/sectioning/character_and_spaces_in_node.pl
+++ b/tta/perl/t/results/sectioning/character_and_spaces_in_node.pl
@@ -14,6 +14,7 @@ $result_tree_text{'character_and_spaces_in_node'} = 
'*document_root C6
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -28,6 +29,7 @@ $result_tree_text{'character_and_spaces_in_node'} = 
'*document_root C6
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E2|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap-nodes}
   *arguments_line C4
    *line_arg C1
@@ -65,6 +67,7 @@ $result_tree_text{'character_and_spaces_in_node'} = 
'*document_root C6
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E3|prev->E1|up->E1]
+ |node_number:{3}
  
|normalized:{_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e}
   *arguments_line C4
    *line_arg C1
@@ -102,6 +105,7 @@ $result_tree_text{'character_and_spaces_in_node'} = 
'*document_root C6
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E4|prev->E2|up->E1]
+ |node_number:{4}
  
|normalized:{_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e}
   *arguments_line C4
    *line_arg C1
@@ -133,6 +137,7 @@ $result_tree_text{'character_and_spaces_in_node'} = 
'*document_root C6
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E3|up->E1]
+ |node_number:{5}
  |normalized:{local-node}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/contents_and_parts.pl 
b/tta/perl/t/results/sectioning/contents_and_parts.pl
index 2073fb13a8..6e20a8f3d5 100644
--- a/tta/perl/t/results/sectioning/contents_and_parts.pl
+++ b/tta/perl/t/results/sectioning/contents_and_parts.pl
@@ -17,6 +17,7 @@ $result_tree_text{'contents_and_parts'} = '*document_root C11
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E4]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -33,6 +34,7 @@ $result_tree_text{'contents_and_parts'} = '*document_root C11
  |associated_node:[E0]
  |section_directions:D[next->E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -108,6 +110,7 @@ $result_tree_text{'contents_and_parts'} = '*document_root 
C11
  |section_childs:EC[E5|E7]
  |section_directions:D[next->E8|prev->E1]
  |section_level:{0}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -125,6 +128,7 @@ $result_tree_text{'contents_and_parts'} = '*document_root 
C11
  |is_target:{1}
  |menu_directions:D[next->E6|up->E0]
  |node_directions:D[next->E6|prev->E0|up->E0]
+ |node_number:{2}
  |node_preceding_part:[E3]
  |normalized:{chapter-1-node}
   *arguments_line C1
@@ -142,8 +146,9 @@ $result_tree_text{'contents_and_parts'} = '*document_root 
C11
  |associated_node:[E4]
  |associated_part:[E3]
  |section_directions:D[next->E7|up->E3]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{3}
  |toplevel_directions:D[next->E7|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -162,6 +167,7 @@ $result_tree_text{'contents_and_parts'} = '*document_root 
C11
  |is_target:{1}
  |menu_directions:D[next->E9|prev->E4|up->E0]
  |node_directions:D[next->E9|prev->E4|up->E0]
+ |node_number:{3}
  |normalized:{chapter-2-node}
   *arguments_line C1
    *line_arg C1
@@ -177,8 +183,9 @@ $result_tree_text{'contents_and_parts'} = '*document_root 
C11
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[prev->E5|up->E3]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{4}
  |toplevel_directions:D[next->E10|prev->E5|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -198,6 +205,7 @@ $result_tree_text{'contents_and_parts'} = '*document_root 
C11
  |section_childs:EC[E10]
  |section_directions:D[prev->E3]
  |section_level:{0}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -215,6 +223,7 @@ $result_tree_text{'contents_and_parts'} = '*document_root 
C11
  |is_target:{1}
  |menu_directions:D[prev->E6|up->E0]
  |node_directions:D[prev->E6|up->E0]
+ |node_number:{4}
  |node_preceding_part:[E8]
  |normalized:{chapter-3-node}
   *arguments_line C1
@@ -232,8 +241,9 @@ $result_tree_text{'contents_and_parts'} = '*document_root 
C11
  |associated_node:[E9]
  |associated_part:[E8]
  |section_directions:D[up->E8]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{6}
  |toplevel_directions:D[prev->E7|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/contents_in_html_text.pl 
b/tta/perl/t/results/sectioning/contents_in_html_text.pl
index 2181986312..923ac3bd00 100644
--- a/tta/perl/t/results/sectioning/contents_in_html_text.pl
+++ b/tta/perl/t/results/sectioning/contents_in_html_text.pl
@@ -13,6 +13,7 @@ $result_tree_text{'contents_in_html_text'} = '*document_root 
C5
  |EXTRA
  |section_childs:EC[E1|E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -33,8 +34,9 @@ $result_tree_text{'contents_in_html_text'} = '*document_root 
C5
  |EXTRA
  |section_childs:EC[E2]
  |section_directions:D[next->E3|up->E0]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E3|prev->E0|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -49,8 +51,9 @@ $result_tree_text{'contents_in_html_text'} = '*document_root 
C5
   |{ }
  |EXTRA
  |section_directions:D[up->E1]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -64,8 +67,9 @@ $result_tree_text{'contents_in_html_text'} = '*document_root 
C5
   |{ }
  |EXTRA
  |section_directions:D[prev->E1|up->E0]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{4}
  |toplevel_directions:D[prev->E1|up->E0]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/contents_with_only_top_node.pl 
b/tta/perl/t/results/sectioning/contents_with_only_top_node.pl
index 8de7191e9f..2f58ae7b20 100644
--- a/tta/perl/t/results/sectioning/contents_with_only_top_node.pl
+++ b/tta/perl/t/results/sectioning/contents_with_only_top_node.pl
@@ -15,6 +15,7 @@ $result_tree_text{'contents_with_only_top_node'} = 
'*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/double_node_anchor_float.pl 
b/tta/perl/t/results/sectioning/double_node_anchor_float.pl
index 3601983ee6..e1c8af8257 100644
--- a/tta/perl/t/results/sectioning/double_node_anchor_float.pl
+++ b/tta/perl/t/results/sectioning/double_node_anchor_float.pl
@@ -12,6 +12,7 @@ $result_tree_text{'double_node_anchor_float'} = 
'*document_root C5
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{node1}
   *arguments_line C1
    *line_arg C1
@@ -25,6 +26,7 @@ $result_tree_text{'double_node_anchor_float'} = 
'*document_root C5
  |spaces_before_argument:
   |{ }
  |EXTRA
+ |node_number:{2}
  |normalized:{node1}
   *arguments_line C1
    *line_arg C1
@@ -53,6 +55,7 @@ $result_tree_text{'double_node_anchor_float'} = 
'*document_root C5
  |spaces_before_argument:
   |{ }
  |EXTRA
+ |node_number:{3}
  |normalized:{anchor1}
   *arguments_line C1
    *line_arg C1
@@ -160,6 +163,7 @@ $result_tree_text{'double_node_anchor_float'} = 
'*document_root C5
  |spaces_before_argument:
   |{ }
  |EXTRA
+ |node_number:{4}
  |normalized:{float1}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/double_part.pl 
b/tta/perl/t/results/sectioning/double_part.pl
index 176f9d4b72..f3dc366454 100644
--- a/tta/perl/t/results/sectioning/double_part.pl
+++ b/tta/perl/t/results/sectioning/double_part.pl
@@ -25,6 +25,7 @@ NodeForward: [U2]
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E5]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -41,6 +42,7 @@ NodeForward: [U2]
  |associated_node:[E0]
  |section_directions:D[next->E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -100,6 +102,7 @@ Prev: [U0]
  |global_command_number:{1}
  |section_directions:D[next->E4|prev->E1]
  |section_level:{0}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -129,6 +132,7 @@ NodeBack: [U0]
  |section_childs:EC[E6]
  |section_directions:D[prev->E3]
  |section_level:{0}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -148,6 +152,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |node_preceding_part:[E4]
  |normalized:{node-chapter}
   *arguments_line C1
@@ -165,8 +170,9 @@ NodeBack: [U0]
  |associated_node:[E5]
  |associated_part:[E4]
  |section_directions:D[up->E4]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{4}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/sectioning/double_recursive_self_section_node_reference.pl 
b/tta/perl/t/results/sectioning/double_recursive_self_section_node_reference.pl
index cf6a475201..7f5fcf3e3d 100644
--- 
a/tta/perl/t/results/sectioning/double_recursive_self_section_node_reference.pl
+++ 
b/tta/perl/t/results/sectioning/double_recursive_self_section_node_reference.pl
@@ -16,6 +16,7 @@ 
$result_tree_text{'double_recursive_self_section_node_reference'} = '*document_r
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ 
$result_tree_text{'double_recursive_self_section_node_reference'} = '*document_r
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ 
$result_tree_text{'double_recursive_self_section_node_reference'} = '*document_r
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node1}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ 
$result_tree_text{'double_recursive_self_section_node_reference'} = '*document_r
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -90,6 +94,7 @@ 
$result_tree_text{'double_recursive_self_section_node_reference'} = '*document_r
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{3}
  |normalized:{to-node1}
   *arguments_line C1
    *line_arg C2
diff --git 
a/tta/perl/t/results/sectioning/double_recursive_self_section_node_reference_no_use_node.pl
 
b/tta/perl/t/results/sectioning/double_recursive_self_section_node_reference_no_use_node.pl
index 8d95bcc832..8405525c9b 100644
--- 
a/tta/perl/t/results/sectioning/double_recursive_self_section_node_reference_no_use_node.pl
+++ 
b/tta/perl/t/results/sectioning/double_recursive_self_section_node_reference_no_use_node.pl
@@ -16,6 +16,7 @@ 
$result_tree_text{'double_recursive_self_section_node_reference_no_use_node'} =
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ 
$result_tree_text{'double_recursive_self_section_node_reference_no_use_node'} =
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ 
$result_tree_text{'double_recursive_self_section_node_reference_no_use_node'} =
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node1}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ 
$result_tree_text{'double_recursive_self_section_node_reference_no_use_node'} =
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -90,6 +94,7 @@ 
$result_tree_text{'double_recursive_self_section_node_reference_no_use_node'} =
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{3}
  |normalized:{to-node1}
   *arguments_line C1
    *line_arg C2
diff --git 
a/tta/perl/t/results/sectioning/double_recursive_self_section_reference.pl 
b/tta/perl/t/results/sectioning/double_recursive_self_section_reference.pl
index bce05a5b86..3406a75039 100644
--- a/tta/perl/t/results/sectioning/double_recursive_self_section_reference.pl
+++ b/tta/perl/t/results/sectioning/double_recursive_self_section_reference.pl
@@ -16,6 +16,7 @@ $result_tree_text{'double_recursive_self_section_reference'} 
= '*document_root C
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{n1}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'double_recursive_self_section_reference'} 
= '*document_root C
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_directions:D[next->E3]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
@@ -60,6 +62,7 @@ $result_tree_text{'double_recursive_self_section_reference'} 
= '*document_root C
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{n2}
   *arguments_line C1
    *line_arg C1
@@ -75,6 +78,7 @@ $result_tree_text{'double_recursive_self_section_reference'} 
= '*document_root C
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[prev->E1]
+ |section_heading_number:{2}
  |section_level:{1}
  |section_number:{2}
  |toplevel_directions:D[prev->E1]
diff --git a/tta/perl/t/results/sectioning/double_top.pl 
b/tta/perl/t/results/sectioning/double_top.pl
index 8cac78d7bc..2e80356465 100644
--- a/tta/perl/t/results/sectioning/double_top.pl
+++ b/tta/perl/t/results/sectioning/double_top.pl
@@ -13,6 +13,7 @@ $result_tree_text{'double_top'} = '*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E0]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C2
    *line_arg C1
@@ -34,6 +35,7 @@ $result_tree_text{'double_top'} = '*document_root C3
   |{ }
  |EXTRA
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Top}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/double_top_in_menu.pl 
b/tta/perl/t/results/sectioning/double_top_in_menu.pl
index f0055faaa1..bdf1a9b2e6 100644
--- a/tta/perl/t/results/sectioning/double_top_in_menu.pl
+++ b/tta/perl/t/results/sectioning/double_top_in_menu.pl
@@ -15,6 +15,7 @@ $result_tree_text{'double_top_in_menu'} = '*document_root C3
  |menu_directions:D[next->E0|prev->E0|up->E0]
  |menus:EC[E1]
  |node_directions:D[next->E0]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C2
    *line_arg C1
@@ -78,6 +79,7 @@ $result_tree_text{'double_top_in_menu'} = '*document_root C3
   |{ }
  |EXTRA
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Top}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/double_top_section.pl 
b/tta/perl/t/results/sectioning/double_top_section.pl
index 7888522540..05a2fb8267 100644
--- a/tta/perl/t/results/sectioning/double_top_section.pl
+++ b/tta/perl/t/results/sectioning/double_top_section.pl
@@ -13,6 +13,7 @@ $result_tree_text{'double_top_section'} = '*document_root C3
  |EXTRA
  |section_directions:D[next->E1]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -36,6 +37,7 @@ $result_tree_text{'double_top_section'} = '*document_root C3
  |EXTRA
  |section_directions:D[prev->E0]
  |section_level:{0}
+ |section_number:{2}
  |toplevel_directions:D[prev->E0|up->E0]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/email_in_node.pl 
b/tta/perl/t/results/sectioning/email_in_node.pl
index 0d1e348e15..bf3b7eb15f 100644
--- a/tta/perl/t/results/sectioning/email_in_node.pl
+++ b/tta/perl/t/results/sectioning/email_in_node.pl
@@ -12,6 +12,7 @@ $result_tree_text{'email_in_node'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{a-c-}
   *arguments_line C1
    *line_arg C5
diff --git a/tta/perl/t/results/sectioning/empty_ref_arg.pl 
b/tta/perl/t/results/sectioning/empty_ref_arg.pl
index b851a96bd0..ccbdd29e8a 100644
--- a/tta/perl/t/results/sectioning/empty_ref_arg.pl
+++ b/tta/perl/t/results/sectioning/empty_ref_arg.pl
@@ -12,6 +12,7 @@ $result_tree_text{'empty_ref_arg'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/empty_section_in_chapter.pl 
b/tta/perl/t/results/sectioning/empty_section_in_chapter.pl
index 94f1bc7ef6..e7693ca325 100644
--- a/tta/perl/t/results/sectioning/empty_section_in_chapter.pl
+++ b/tta/perl/t/results/sectioning/empty_section_in_chapter.pl
@@ -13,6 +13,7 @@ $result_tree_text{'empty_section_in_chapter'} = 
'*document_root C3
   |{ }
  |EXTRA
  |section_childs:EC[E1]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
@@ -30,8 +31,9 @@ $result_tree_text{'empty_section_in_chapter'} = 
'*document_root C3
  *1 @section C1 l3
  |EXTRA
  |section_directions:D[up->E0]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{2}
   *arguments_line C1
    *line_arg
    |INFO
diff --git a/tta/perl/t/results/sectioning/equivalent_labels.pl 
b/tta/perl/t/results/sectioning/equivalent_labels.pl
index 91ee403764..174ee49a9f 100644
--- a/tta/perl/t/results/sectioning/equivalent_labels.pl
+++ b/tta/perl/t/results/sectioning/equivalent_labels.pl
@@ -13,6 +13,7 @@ $result_tree_text{'equivalent_labels'} = '*document_root C2
  |EXTRA
  |is_target:{1}
  |menus:EC[E3]
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/equivalent_nodes.pl 
b/tta/perl/t/results/sectioning/equivalent_nodes.pl
index 9f72e7fcbe..bffc1eede5 100644
--- a/tta/perl/t/results/sectioning/equivalent_nodes.pl
+++ b/tta/perl/t/results/sectioning/equivalent_nodes.pl
@@ -14,6 +14,7 @@ $result_tree_text{'equivalent_nodes'} = '*document_root C3
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C2
    *line_arg C1
@@ -70,6 +71,7 @@ $result_tree_text{'equivalent_nodes'} = '*document_root C3
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[up->E0]
+ |node_number:{2}
  |normalized:{node}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/equivalent_nodes_novalidate.pl 
b/tta/perl/t/results/sectioning/equivalent_nodes_novalidate.pl
index 872d08bc3a..b0a0e850a4 100644
--- a/tta/perl/t/results/sectioning/equivalent_nodes_novalidate.pl
+++ b/tta/perl/t/results/sectioning/equivalent_nodes_novalidate.pl
@@ -17,6 +17,7 @@ $result_tree_text{'equivalent_nodes_novalidate'} = 
'*document_root C3
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C2
    *line_arg C1
@@ -73,6 +74,7 @@ $result_tree_text{'equivalent_nodes_novalidate'} = 
'*document_root C3
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[up->E0]
+ |node_number:{2}
  |normalized:{node}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/explicit_node_directions.pl 
b/tta/perl/t/results/sectioning/explicit_node_directions.pl
index 5239cceb6f..feddb2fa71 100644
--- a/tta/perl/t/results/sectioning/explicit_node_directions.pl
+++ b/tta/perl/t/results/sectioning/explicit_node_directions.pl
@@ -20,6 +20,7 @@ NodeForward: [U1]
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -88,6 +89,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[next->E3|up->E0]
  |node_directions:D[next->E3|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap-node}
   *arguments_line C4
    *line_arg C1
@@ -133,6 +135,7 @@ NodeBack: [U1]
  |is_target:{1}
  |menu_directions:D[prev->E2|up->E0]
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{third-node}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/external_node_in_menu.pl 
b/tta/perl/t/results/sectioning/external_node_in_menu.pl
index 0754c2ba48..676d54efdf 100644
--- a/tta/perl/t/results/sectioning/external_node_in_menu.pl
+++ b/tta/perl/t/results/sectioning/external_node_in_menu.pl
@@ -16,6 +16,7 @@ $result_tree_text{'external_node_in_menu'} = '*document_root 
C7
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'external_node_in_menu'} = '*document_root 
C7
  |associated_node:[E0]
  |section_childs:EC[E4|E6]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -110,6 +112,7 @@ $result_tree_text{'external_node_in_menu'} = 
'*document_root C7
  |is_target:{1}
  |menu_directions:D[next->MISSING: (menu_entry_node)[C4]|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{nchapter1}
   *arguments_line C1
    *line_arg C1
@@ -125,8 +128,9 @@ $result_tree_text{'external_node_in_menu'} = 
'*document_root C7
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -145,6 +149,7 @@ $result_tree_text{'external_node_in_menu'} = 
'*document_root C7
  |is_target:{1}
  |menu_directions:D[prev->MISSING: (menu_entry_node)[C4]|up->E0]
  |node_directions:D[prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{nchapter2}
   *arguments_line C1
    *line_arg C1
@@ -160,8 +165,9 @@ $result_tree_text{'external_node_in_menu'} = 
'*document_root C7
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/hole_in_sectioning.pl 
b/tta/perl/t/results/sectioning/hole_in_sectioning.pl
index 42f9de412d..2c63356ea1 100644
--- a/tta/perl/t/results/sectioning/hole_in_sectioning.pl
+++ b/tta/perl/t/results/sectioning/hole_in_sectioning.pl
@@ -13,6 +13,7 @@ $result_tree_text{'hole_in_sectioning'} = '*document_root C6
  |EXTRA
  |section_childs:EC[E1]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -33,8 +34,9 @@ $result_tree_text{'hole_in_sectioning'} = '*document_root C6
  |EXTRA
  |section_childs:EC[E2]
  |section_directions:D[up->E0]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E0|up->E0]
   *arguments_line C1
    *line_arg C1
@@ -50,8 +52,9 @@ $result_tree_text{'hole_in_sectioning'} = '*document_root C6
  |EXTRA
  |section_childs:EC[E3|E4]
  |section_directions:D[up->E1]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -65,8 +68,9 @@ $result_tree_text{'hole_in_sectioning'} = '*document_root C6
   |{ }
  |EXTRA
  |section_directions:D[next->E4|up->E2]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -80,8 +84,9 @@ $result_tree_text{'hole_in_sectioning'} = '*document_root C6
   |{ }
  |EXTRA
  |section_directions:D[prev->E3|up->E2]
+ |section_heading_number:{1.1.2}
  |section_level:{3}
- |section_number:{1.1.2}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git 
a/tta/perl/t/results/sectioning/in_menu_only_special_ascii_spaces_node.pl 
b/tta/perl/t/results/sectioning/in_menu_only_special_ascii_spaces_node.pl
index 66bc8c5fe4..196964eeb0 100644
--- a/tta/perl/t/results/sectioning/in_menu_only_special_ascii_spaces_node.pl
+++ b/tta/perl/t/results/sectioning/in_menu_only_special_ascii_spaces_node.pl
@@ -17,6 +17,7 @@ $result_tree_text{'in_menu_only_special_ascii_spaces_node'} = 
'*document_root C7
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -33,6 +34,7 @@ $result_tree_text{'in_menu_only_special_ascii_spaces_node'} = 
'*document_root C7
  |associated_node:[E0]
  |section_childs:EC[E4|E6]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -95,8 +97,9 @@ $result_tree_text{'in_menu_only_special_ascii_spaces_node'} = 
'*document_root C7
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -122,8 +125,9 @@ $result_tree_text{'in_menu_only_special_ascii_spaces_node'} 
= '*document_root C7
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/sectioning/in_menu_only_special_ascii_spaces_node_menu.pl 
b/tta/perl/t/results/sectioning/in_menu_only_special_ascii_spaces_node_menu.pl
index a8ac10e73e..f9e14cb0cc 100644
--- 
a/tta/perl/t/results/sectioning/in_menu_only_special_ascii_spaces_node_menu.pl
+++ 
b/tta/perl/t/results/sectioning/in_menu_only_special_ascii_spaces_node_menu.pl
@@ -17,6 +17,7 @@ 
$result_tree_text{'in_menu_only_special_ascii_spaces_node_menu'} = '*document_ro
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -33,6 +34,7 @@ 
$result_tree_text{'in_menu_only_special_ascii_spaces_node_menu'} = '*document_ro
  |associated_node:[E0]
  |section_childs:EC[E4|E6]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -95,8 +97,9 @@ 
$result_tree_text{'in_menu_only_special_ascii_spaces_node_menu'} = '*document_ro
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -122,8 +125,9 @@ 
$result_tree_text{'in_menu_only_special_ascii_spaces_node_menu'} = '*document_ro
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/in_menu_only_special_spaces_node.pl 
b/tta/perl/t/results/sectioning/in_menu_only_special_spaces_node.pl
index 4397661cb6..baaba5cc9e 100644
--- a/tta/perl/t/results/sectioning/in_menu_only_special_spaces_node.pl
+++ b/tta/perl/t/results/sectioning/in_menu_only_special_spaces_node.pl
@@ -19,6 +19,7 @@ $result_tree_text{'in_menu_only_special_spaces_node'} = 
'*document_root C16
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -35,6 +36,7 @@ $result_tree_text{'in_menu_only_special_spaces_node'} = 
'*document_root C16
  |associated_node:[E0]
  |section_childs:EC[E4|E6|E8|E10|E12|E14]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -137,6 +139,7 @@ $result_tree_text{'in_menu_only_special_spaces_node'} = 
'*document_root C16
  |is_target:{1}
  |menu_directions:D[next->E9|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{_2002_2003_2002}
   *arguments_line C1
    *line_arg C1
@@ -152,8 +155,9 @@ $result_tree_text{'in_menu_only_special_spaces_node'} = 
'*document_root C16
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -179,8 +183,9 @@ $result_tree_text{'in_menu_only_special_spaces_node'} = 
'*document_root C16
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[next->E8|prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E8|prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -206,8 +211,9 @@ $result_tree_text{'in_menu_only_special_spaces_node'} = 
'*document_root C16
  |associated_anchor_command:[E7]
  |associated_node:[E7]
  |section_directions:D[next->E10|prev->E6|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{4}
  |toplevel_directions:D[next->E10|prev->E6|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -226,6 +232,7 @@ $result_tree_text{'in_menu_only_special_spaces_node'} = 
'*document_root C16
  |is_target:{1}
  |menu_directions:D[next->E11|prev->E3|up->E0]
  |node_directions:D[next->E11|prev->E7|up->E0]
+ |node_number:{3}
  |normalized:{_0085_00a0_1680}
   *arguments_line C1
    *line_arg C1
@@ -241,8 +248,9 @@ $result_tree_text{'in_menu_only_special_spaces_node'} = 
'*document_root C16
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[next->E12|prev->E8|up->E1]
+ |section_heading_number:{4}
  |section_level:{1}
- |section_number:{4}
+ |section_number:{5}
  |toplevel_directions:D[next->E12|prev->E8|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -261,6 +269,7 @@ $result_tree_text{'in_menu_only_special_spaces_node'} = 
'*document_root C16
  |is_target:{1}
  |menu_directions:D[next->E13|prev->E9|up->E0]
  |node_directions:D[next->E13|prev->E9|up->E0]
+ |node_number:{4}
  |normalized:{_180e_2003}
   *arguments_line C1
    *line_arg C1
@@ -276,8 +285,9 @@ $result_tree_text{'in_menu_only_special_spaces_node'} = 
'*document_root C16
  |associated_anchor_command:[E11]
  |associated_node:[E11]
  |section_directions:D[next->E14|prev->E10|up->E1]
+ |section_heading_number:{5}
  |section_level:{1}
- |section_number:{5}
+ |section_number:{6}
  |toplevel_directions:D[next->E14|prev->E10|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -296,6 +306,7 @@ $result_tree_text{'in_menu_only_special_spaces_node'} = 
'*document_root C16
  |is_target:{1}
  |menu_directions:D[prev->E11|up->E0]
  |node_directions:D[prev->E11|up->E0]
+ |node_number:{5}
  |normalized:{_2004_2005_2006_2007_2008_2009_200a_202f_205f_3000}
   *arguments_line C1
    *line_arg C1
@@ -311,8 +322,9 @@ $result_tree_text{'in_menu_only_special_spaces_node'} = 
'*document_root C16
  |associated_anchor_command:[E13]
  |associated_node:[E13]
  |section_directions:D[prev->E12|up->E1]
+ |section_heading_number:{6}
  |section_level:{1}
- |section_number:{6}
+ |section_number:{7}
  |toplevel_directions:D[prev->E12|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/sectioning/in_menu_only_special_spaces_node_menu.pl 
b/tta/perl/t/results/sectioning/in_menu_only_special_spaces_node_menu.pl
index f15de5a6be..f71c123f98 100644
--- a/tta/perl/t/results/sectioning/in_menu_only_special_spaces_node_menu.pl
+++ b/tta/perl/t/results/sectioning/in_menu_only_special_spaces_node_menu.pl
@@ -19,6 +19,7 @@ $result_tree_text{'in_menu_only_special_spaces_node_menu'} = 
'*document_root C16
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -35,6 +36,7 @@ $result_tree_text{'in_menu_only_special_spaces_node_menu'} = 
'*document_root C16
  |associated_node:[E0]
  |section_childs:EC[E4|E6|E8|E10|E12|E14]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -137,6 +139,7 @@ $result_tree_text{'in_menu_only_special_spaces_node_menu'} 
= '*document_root C16
  |is_target:{1}
  |menu_directions:D[next->E9|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{_2002_2003_2002}
   *arguments_line C1
    *line_arg C1
@@ -152,8 +155,9 @@ $result_tree_text{'in_menu_only_special_spaces_node_menu'} 
= '*document_root C16
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -179,8 +183,9 @@ $result_tree_text{'in_menu_only_special_spaces_node_menu'} 
= '*document_root C16
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[next->E8|prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E8|prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -206,8 +211,9 @@ $result_tree_text{'in_menu_only_special_spaces_node_menu'} 
= '*document_root C16
  |associated_anchor_command:[E7]
  |associated_node:[E7]
  |section_directions:D[next->E10|prev->E6|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{4}
  |toplevel_directions:D[next->E10|prev->E6|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -226,6 +232,7 @@ $result_tree_text{'in_menu_only_special_spaces_node_menu'} 
= '*document_root C16
  |is_target:{1}
  |menu_directions:D[next->E11|prev->E3|up->E0]
  |node_directions:D[next->E11|prev->E7|up->E0]
+ |node_number:{3}
  |normalized:{_0085_00a0_1680}
   *arguments_line C1
    *line_arg C1
@@ -241,8 +248,9 @@ $result_tree_text{'in_menu_only_special_spaces_node_menu'} 
= '*document_root C16
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[next->E12|prev->E8|up->E1]
+ |section_heading_number:{4}
  |section_level:{1}
- |section_number:{4}
+ |section_number:{5}
  |toplevel_directions:D[next->E12|prev->E8|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -261,6 +269,7 @@ $result_tree_text{'in_menu_only_special_spaces_node_menu'} 
= '*document_root C16
  |is_target:{1}
  |menu_directions:D[next->E13|prev->E9|up->E0]
  |node_directions:D[next->E13|prev->E9|up->E0]
+ |node_number:{4}
  |normalized:{_180e_2003}
   *arguments_line C1
    *line_arg C1
@@ -276,8 +285,9 @@ $result_tree_text{'in_menu_only_special_spaces_node_menu'} 
= '*document_root C16
  |associated_anchor_command:[E11]
  |associated_node:[E11]
  |section_directions:D[next->E14|prev->E10|up->E1]
+ |section_heading_number:{5}
  |section_level:{1}
- |section_number:{5}
+ |section_number:{6}
  |toplevel_directions:D[next->E14|prev->E10|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -296,6 +306,7 @@ $result_tree_text{'in_menu_only_special_spaces_node_menu'} 
= '*document_root C16
  |is_target:{1}
  |menu_directions:D[prev->E11|up->E0]
  |node_directions:D[prev->E11|up->E0]
+ |node_number:{5}
  |normalized:{_2004_2005_2006_2007_2008_2009_200a_202f_205f_3000}
   *arguments_line C1
    *line_arg C1
@@ -311,8 +322,9 @@ $result_tree_text{'in_menu_only_special_spaces_node_menu'} 
= '*document_root C16
  |associated_anchor_command:[E13]
  |associated_node:[E13]
  |section_directions:D[prev->E12|up->E1]
+ |section_heading_number:{6}
  |section_level:{1}
- |section_number:{6}
+ |section_number:{7}
  |toplevel_directions:D[prev->E12|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/lone_Top_node.pl 
b/tta/perl/t/results/sectioning/lone_Top_node.pl
index a579c7e95d..bc6ec260f6 100644
--- a/tta/perl/t/results/sectioning/lone_Top_node.pl
+++ b/tta/perl/t/results/sectioning/lone_Top_node.pl
@@ -19,6 +19,7 @@ NodeUp: [U0]
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -66,6 +67,7 @@ NodeUp: [U0]
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{First}
   *arguments_line C1
    *line_arg C1
@@ -80,6 +82,7 @@ NodeUp: [U0]
  |EXTRA
  |associated_anchor_command:[E2]
  |associated_node:[E2]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
diff --git a/tta/perl/t/results/sectioning/loop_nodes.pl 
b/tta/perl/t/results/sectioning/loop_nodes.pl
index e64ced166c..b551e319e9 100644
--- a/tta/perl/t/results/sectioning/loop_nodes.pl
+++ b/tta/perl/t/results/sectioning/loop_nodes.pl
@@ -17,6 +17,7 @@ $result_tree_text{'loop_nodes'} = '*document_root C6
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'loop_nodes'} = '*document_root C6
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -82,6 +84,7 @@ $result_tree_text{'loop_nodes'} = '*document_root C6
  |menu_directions:D[up->E0]
  |menus:EC[E4]
  |node_directions:D[up->E7]
+ |node_number:{2}
  |normalized:{chap-node-up}
   *arguments_line C4
    *line_arg C1
@@ -135,6 +138,7 @@ $result_tree_text{'loop_nodes'} = '*document_root C6
  |menu_directions:D[up->E3]
  |menus:EC[E6]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{node-middle}
   *arguments_line C4
    *line_arg C1
@@ -187,6 +191,7 @@ $result_tree_text{'loop_nodes'} = '*document_root C6
  |is_target:{1}
  |menu_directions:D[up->E5]
  |node_directions:D[up->E5]
+ |node_number:{4}
  |normalized:{node-down}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/menutextorder.pl 
b/tta/perl/t/results/sectioning/menutextorder.pl
index 6bf8d19175..60f48d16e0 100644
--- a/tta/perl/t/results/sectioning/menutextorder.pl
+++ b/tta/perl/t/results/sectioning/menutextorder.pl
@@ -56,6 +56,7 @@ $result_tree_text{'menutextorder'} = '*document_root C15
  |is_target:{1}
  |menus:EC[E3]
  |node_directions:D[next->E8]
+ |node_number:{1}
  |normalized:{bar}
   *arguments_line C1
    *line_arg C1
@@ -72,6 +73,7 @@ $result_tree_text{'menutextorder'} = '*document_root C15
  |associated_node:[E1]
  |section_childs:EC[E5|E7]
  |section_directions:D[next->E9]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
@@ -125,6 +127,7 @@ $result_tree_text{'menutextorder'} = '*document_root C15
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[next->E6|up->E1]
+ |node_number:{2}
  |normalized:{onesub1}
   *arguments_line C1
    *line_arg C1
@@ -140,8 +143,9 @@ $result_tree_text{'menutextorder'} = '*document_root C15
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[next->E7|up->E2]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -159,6 +163,7 @@ $result_tree_text{'menutextorder'} = '*document_root C15
  |is_target:{1}
  |menu_directions:D[up->E1]
  |node_directions:D[prev->E4|up->E1]
+ |node_number:{3}
  |normalized:{onesub2}
   *arguments_line C1
    *line_arg C1
@@ -174,8 +179,9 @@ $result_tree_text{'menutextorder'} = '*document_root C15
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[prev->E5|up->E2]
+ |section_heading_number:{1.2}
  |section_level:{2}
- |section_number:{1.2}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -194,6 +200,7 @@ $result_tree_text{'menutextorder'} = '*document_root C15
  |is_target:{1}
  |menus:EC[E10]
  |node_directions:D[prev->E1]
+ |node_number:{4}
  |normalized:{foo}
   *arguments_line C1
    *line_arg C1
@@ -210,8 +217,9 @@ $result_tree_text{'menutextorder'} = '*document_root C15
  |associated_node:[E8]
  |section_childs:EC[E12|E14|E16]
  |section_directions:D[prev->E2]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{4}
  |toplevel_directions:D[prev->E2]
   *arguments_line C1
    *line_arg C1
@@ -281,6 +289,7 @@ $result_tree_text{'menutextorder'} = '*document_root C15
  |is_target:{1}
  |menu_directions:D[next->E15|up->E8]
  |node_directions:D[next->E13|up->E8]
+ |node_number:{5}
  |normalized:{sub1}
   *arguments_line C1
    *line_arg C1
@@ -296,8 +305,9 @@ $result_tree_text{'menutextorder'} = '*document_root C15
  |associated_anchor_command:[E11]
  |associated_node:[E11]
  |section_directions:D[next->E14|up->E9]
+ |section_heading_number:{2.1}
  |section_level:{2}
- |section_number:{2.1}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -315,6 +325,7 @@ $result_tree_text{'menutextorder'} = '*document_root C15
  |is_target:{1}
  |menu_directions:D[prev->E15|up->E8]
  |node_directions:D[next->E15|prev->E11|up->E8]
+ |node_number:{6}
  |normalized:{sub2}
   *arguments_line C1
    *line_arg C1
@@ -330,8 +341,9 @@ $result_tree_text{'menutextorder'} = '*document_root C15
  |associated_anchor_command:[E13]
  |associated_node:[E13]
  |section_directions:D[next->E16|prev->E12|up->E9]
+ |section_heading_number:{2.2}
  |section_level:{2}
- |section_number:{2.2}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -349,6 +361,7 @@ $result_tree_text{'menutextorder'} = '*document_root C15
  |is_target:{1}
  |menu_directions:D[next->E13|prev->E11|up->E8]
  |node_directions:D[next->E13|prev->E13|up->E8]
+ |node_number:{7}
  |normalized:{sub3}
   *arguments_line C1
    *line_arg C1
@@ -364,8 +377,9 @@ $result_tree_text{'menutextorder'} = '*document_root C15
  |associated_anchor_command:[E15]
  |associated_node:[E15]
  |section_directions:D[prev->E14|up->E9]
+ |section_heading_number:{2.3}
  |section_level:{2}
- |section_number:{2.3}
+ |section_number:{7}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/sectioning/next_in_menu_is_below.pl 
b/tta/perl/t/results/sectioning/next_in_menu_is_below.pl
index c46a23c19d..8b46b70170 100644
--- a/tta/perl/t/results/sectioning/next_in_menu_is_below.pl
+++ b/tta/perl/t/results/sectioning/next_in_menu_is_below.pl
@@ -16,6 +16,7 @@ $result_tree_text{'next_in_menu_is_below'} = '*document_root 
C9
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'next_in_menu_is_below'} = '*document_root 
C9
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -85,6 +87,7 @@ $result_tree_text{'next_in_menu_is_below'} = '*document_root 
C9
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -101,8 +104,9 @@ $result_tree_text{'next_in_menu_is_below'} = 
'*document_root C9
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -162,6 +166,7 @@ $result_tree_text{'next_in_menu_is_below'} = 
'*document_root C9
  |menu_directions:D[next->E9|up->E3]
  |menus:EC[E8]
  |node_directions:D[next->E9|up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -178,8 +183,9 @@ $result_tree_text{'next_in_menu_is_below'} = 
'*document_root C9
  |associated_node:[E6]
  |section_childs:EC[E10]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -226,6 +232,7 @@ $result_tree_text{'next_in_menu_is_below'} = 
'*document_root C9
  |is_target:{1}
  |menu_directions:D[prev->E6|up->E6]
  |node_directions:D[prev->E6|up->E6]
+ |node_number:{4}
  |normalized:{subsection}
   *arguments_line C1
    *line_arg C1
@@ -241,8 +248,9 @@ $result_tree_text{'next_in_menu_is_below'} = 
'*document_root C9
  |associated_anchor_command:[E9]
  |associated_node:[E9]
  |section_directions:D[up->E7]
+ |section_heading_number:{1.1.1}
  |section_level:{3}
- |section_number:{1.1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/sectioning/next_no_prev_to_node.pl 
b/tta/perl/t/results/sectioning/next_no_prev_to_node.pl
index 0ea1cc0598..842641c787 100644
--- a/tta/perl/t/results/sectioning/next_no_prev_to_node.pl
+++ b/tta/perl/t/results/sectioning/next_no_prev_to_node.pl
@@ -14,6 +14,7 @@ $result_tree_text{'next_no_prev_to_node'} = '*document_root C4
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -70,6 +71,7 @@ $result_tree_text{'next_no_prev_to_node'} = '*document_root C4
  |is_target:{1}
  |menu_directions:D[next->E3|up->E0]
  |node_directions:D[next->E3|up->E0]
+ |node_number:{2}
  |normalized:{chap-first-node}
   *arguments_line C4
    *line_arg C1
@@ -102,6 +104,7 @@ $result_tree_text{'next_no_prev_to_node'} = '*document_root 
C4
  |is_target:{1}
  |menu_directions:D[prev->E2|up->E0]
  |node_directions:D[up->E0]
+ |node_number:{3}
  |normalized:{no-return}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/no_argument_and_contents.pl 
b/tta/perl/t/results/sectioning/no_argument_and_contents.pl
index 85df3c33dc..1e067a2baf 100644
--- a/tta/perl/t/results/sectioning/no_argument_and_contents.pl
+++ b/tta/perl/t/results/sectioning/no_argument_and_contents.pl
@@ -19,6 +19,7 @@ $result_tree_text{'no_argument_and_contents'} = 
'*document_root C3
  |EXTRA
  |section_childs:EC[E1]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -38,8 +39,9 @@ $result_tree_text{'no_argument_and_contents'} = 
'*document_root C3
   |{ }
  |EXTRA
  |section_directions:D[up->E0]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E0|up->E0]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/no_menu.pl 
b/tta/perl/t/results/sectioning/no_menu.pl
index 819099e799..0b87535598 100644
--- a/tta/perl/t/results/sectioning/no_menu.pl
+++ b/tta/perl/t/results/sectioning/no_menu.pl
@@ -15,6 +15,7 @@ $result_tree_text{'no_menu'} = '*document_root C9
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -28,6 +29,7 @@ $result_tree_text{'no_menu'} = '*document_root C9
  |associated_node:[E0]
  |section_childs:EC[E3|E5|E7]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -49,6 +51,7 @@ $result_tree_text{'no_menu'} = '*document_root C9
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{c1}
   *arguments_line C1
    *line_arg C1
@@ -64,8 +67,9 @@ $result_tree_text{'no_menu'} = '*document_root C9
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -83,6 +87,7 @@ $result_tree_text{'no_menu'} = '*document_root C9
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[next->E6|prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{c2}
   *arguments_line C1
    *line_arg C1
@@ -98,8 +103,9 @@ $result_tree_text{'no_menu'} = '*document_root C9
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[next->E7|prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E7|prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -117,6 +123,7 @@ $result_tree_text{'no_menu'} = '*document_root C9
  |associated_title_command:[E7]
  |is_target:{1}
  |node_directions:D[prev->E4|up->E0]
+ |node_number:{4}
  |normalized:{c3}
   *arguments_line C1
    *line_arg C1
@@ -132,8 +139,9 @@ $result_tree_text{'no_menu'} = '*document_root C9
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[prev->E5|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{4}
  |toplevel_directions:D[prev->E5|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/node_empty_direction.pl 
b/tta/perl/t/results/sectioning/node_empty_direction.pl
index c188f1f558..f768ef6c25 100644
--- a/tta/perl/t/results/sectioning/node_empty_direction.pl
+++ b/tta/perl/t/results/sectioning/node_empty_direction.pl
@@ -12,6 +12,7 @@ $result_tree_text{'node_empty_direction'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{name}
   *arguments_line C2
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/node_line_arguments.pl 
b/tta/perl/t/results/sectioning/node_line_arguments.pl
index 536bca024b..ff79fc8a06 100644
--- a/tta/perl/t/results/sectioning/node_line_arguments.pl
+++ b/tta/perl/t/results/sectioning/node_line_arguments.pl
@@ -13,6 +13,7 @@ $result_tree_text{'node_line_arguments'} = '*document_root C8
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{one-arg1}
   *arguments_line C1
    *line_arg C1
@@ -26,6 +27,7 @@ $result_tree_text{'node_line_arguments'} = '*document_root C8
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{2}
  |normalized:{one-arg2}
   *arguments_line C2
    *line_arg C1
@@ -46,6 +48,7 @@ $result_tree_text{'node_line_arguments'} = '*document_root C8
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{3}
  |normalized:{one-arg3}
   *arguments_line C3
    *line_arg C1
@@ -74,6 +77,7 @@ $result_tree_text{'node_line_arguments'} = '*document_root C8
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{4}
  |normalized:{one-arg4}
   *arguments_line C4
    *line_arg C1
@@ -110,6 +114,7 @@ $result_tree_text{'node_line_arguments'} = '*document_root 
C8
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{5}
  |normalized:{one-arg5}
   *arguments_line C4
    *line_arg C1
@@ -147,6 +152,7 @@ $result_tree_text{'node_line_arguments'} = '*document_root 
C8
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{6}
  |normalized:{comment}
   *arguments_line C1
    *line_arg C1
@@ -164,6 +170,7 @@ $result_tree_text{'node_line_arguments'} = '*document_root 
C8
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{7}
  |normalized:{arg1-_002c-arg2}
   *arguments_line C3
    *line_arg C3
diff --git a/tta/perl/t/results/sectioning/node_nested_parentheses.pl 
b/tta/perl/t/results/sectioning/node_nested_parentheses.pl
index cfa5dd225f..ee677208e4 100644
--- a/tta/perl/t/results/sectioning/node_nested_parentheses.pl
+++ b/tta/perl/t/results/sectioning/node_nested_parentheses.pl
@@ -13,6 +13,7 @@ $result_tree_text{'node_nested_parentheses'} = 
'*document_root C2
  |EXTRA
  |is_target:{1}
  |menus:EC[E1]
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/node_part_chapter_after_chapter.pl 
b/tta/perl/t/results/sectioning/node_part_chapter_after_chapter.pl
index e070c51d15..a992cf7092 100644
--- a/tta/perl/t/results/sectioning/node_part_chapter_after_chapter.pl
+++ b/tta/perl/t/results/sectioning/node_part_chapter_after_chapter.pl
@@ -24,6 +24,7 @@ NodeForward: [U1]
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -41,6 +42,7 @@ NodeForward: [U1]
  |section_childs:EC[E4]
  |section_directions:D[next->E6]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -118,6 +120,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter-node}
   *arguments_line C1
    *line_arg C1
@@ -134,8 +137,9 @@ NodeBack: [U0]
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E7|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -163,6 +167,7 @@ NodeBack: [U1]
  |is_target:{1}
  |menu_directions:D[prev->E3|up->E0]
  |node_directions:D[prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{part-chapter-node}
   *arguments_line C1
    *line_arg C1
@@ -180,6 +185,7 @@ NodeBack: [U1]
  |section_childs:EC[E7]
  |section_directions:D[prev->E1]
  |section_level:{0}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -196,8 +202,9 @@ NodeBack: [U1]
  |associated_node:[E5]
  |associated_part:[E6]
  |section_directions:D[up->E6]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{4}
  |toplevel_directions:D[prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/node_part_chapter_after_top.pl 
b/tta/perl/t/results/sectioning/node_part_chapter_after_top.pl
index 8e6ace9bdb..50fc791eca 100644
--- a/tta/perl/t/results/sectioning/node_part_chapter_after_top.pl
+++ b/tta/perl/t/results/sectioning/node_part_chapter_after_top.pl
@@ -24,6 +24,7 @@ NodeForward: [U1]
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -40,6 +41,7 @@ NodeForward: [U1]
  |associated_node:[E0]
  |section_directions:D[next->E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -101,6 +103,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter-node}
   *arguments_line C1
    *line_arg C1
@@ -118,6 +121,7 @@ NodeBack: [U0]
  |section_childs:EC[E5]
  |section_directions:D[prev->E1]
  |section_level:{0}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -134,8 +138,9 @@ NodeBack: [U0]
  |associated_node:[E3]
  |associated_part:[E4]
  |section_directions:D[up->E4]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{3}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/node_referenced_in_ref.pl 
b/tta/perl/t/results/sectioning/node_referenced_in_ref.pl
index 9bbe77d30c..77f241b9ab 100644
--- a/tta/perl/t/results/sectioning/node_referenced_in_ref.pl
+++ b/tta/perl/t/results/sectioning/node_referenced_in_ref.pl
@@ -14,6 +14,7 @@ $result_tree_text{'node_referenced_in_ref'} = '*document_root 
C4
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -68,6 +69,7 @@ $result_tree_text{'node_referenced_in_ref'} = '*document_root 
C4
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap-first-level-node}
   *arguments_line C1
    *line_arg C1
@@ -82,6 +84,7 @@ $result_tree_text{'node_referenced_in_ref'} = '*document_root 
C4
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{3}
  |normalized:{second-level-node}
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/sectioning/node_sectop_before_chapter_no_node.pl 
b/tta/perl/t/results/sectioning/node_sectop_before_chapter_no_node.pl
index 018d5d1487..9e2b08318e 100644
--- a/tta/perl/t/results/sectioning/node_sectop_before_chapter_no_node.pl
+++ b/tta/perl/t/results/sectioning/node_sectop_before_chapter_no_node.pl
@@ -15,6 +15,7 @@ $result_tree_text{'node_sectop_before_chapter_no_node'} = 
'*document_root C4
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'node_sectop_before_chapter_no_node'} = 
'*document_root C4
  |associated_node:[E0]
  |section_childs:EC[E2]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -50,8 +52,9 @@ $result_tree_text{'node_sectop_before_chapter_no_node'} = 
'*document_root C4
   |{ }
  |EXTRA
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/node_sectop_before_lone_node_Top.pl 
b/tta/perl/t/results/sectioning/node_sectop_before_lone_node_Top.pl
index 8d8b3c2146..2a65e67a4c 100644
--- a/tta/perl/t/results/sectioning/node_sectop_before_lone_node_Top.pl
+++ b/tta/perl/t/results/sectioning/node_sectop_before_lone_node_Top.pl
@@ -16,6 +16,7 @@ $result_tree_text{'node_sectop_before_lone_node_Top'} = 
'*document_root C6
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{node-before}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'node_sectop_before_lone_node_Top'} = 
'*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -55,6 +57,7 @@ $result_tree_text{'node_sectop_before_lone_node_Top'} = 
'*document_root C6
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E0]
+ |node_number:{2}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -75,6 +78,7 @@ $result_tree_text{'node_sectop_before_lone_node_Top'} = 
'*document_root C6
  |associated_title_command:[E4]
  |is_target:{1}
  |node_directions:D[up->E0]
+ |node_number:{3}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -90,8 +94,9 @@ $result_tree_text{'node_sectop_before_lone_node_Top'} = 
'*document_root C6
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/node_simple.pl 
b/tta/perl/t/results/sectioning/node_simple.pl
index 246d821f5b..a36b2e9ae0 100644
--- a/tta/perl/t/results/sectioning/node_simple.pl
+++ b/tta/perl/t/results/sectioning/node_simple.pl
@@ -12,6 +12,7 @@ $result_tree_text{'node_simple'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/node_too_much_args.pl 
b/tta/perl/t/results/sectioning/node_too_much_args.pl
index e494775bcc..0ba7d1dff7 100644
--- a/tta/perl/t/results/sectioning/node_too_much_args.pl
+++ b/tta/perl/t/results/sectioning/node_too_much_args.pl
@@ -13,6 +13,7 @@ $result_tree_text{'node_too_much_args'} = '*document_root C2
  |EXTRA
  |is_target:{1}
  |node_directions:D[up->MISSING: (line_arg)[C3]]
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C4
    *line_arg C1
diff --git 
a/tta/perl/t/results/sectioning/node_up_direction_for_top_with_manual.pl 
b/tta/perl/t/results/sectioning/node_up_direction_for_top_with_manual.pl
index f874a4d8f2..2d796e5178 100644
--- a/tta/perl/t/results/sectioning/node_up_direction_for_top_with_manual.pl
+++ b/tta/perl/t/results/sectioning/node_up_direction_for_top_with_manual.pl
@@ -13,6 +13,7 @@ $result_tree_text{'node_up_direction_for_top_with_manual'} = 
'*document_root C2
  |EXTRA
  |is_target:{1}
  |node_directions:D[up->MISSING: (line_arg)[C4]]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/node_up_external_node.pl 
b/tta/perl/t/results/sectioning/node_up_external_node.pl
index 2b62df8723..741b797307 100644
--- a/tta/perl/t/results/sectioning/node_up_external_node.pl
+++ b/tta/perl/t/results/sectioning/node_up_external_node.pl
@@ -21,6 +21,7 @@ NodeForward: [U1]
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -76,6 +77,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[next->MISSING: (line_arg)[C3]|prev->MISSING: 
(line_arg)[C3]|up->MISSING: (line_arg)[C3]]
+ |node_number:{2}
  |normalized:{chap-first}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/nodename_parentheses.pl 
b/tta/perl/t/results/sectioning/nodename_parentheses.pl
index aaa93a2d9e..00c39329a2 100644
--- a/tta/perl/t/results/sectioning/nodename_parentheses.pl
+++ b/tta/perl/t/results/sectioning/nodename_parentheses.pl
@@ -16,6 +16,7 @@ $result_tree_text{'nodename_parentheses'} = '*document_root C9
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'nodename_parentheses'} = '*document_root C9
  |associated_node:[E0]
  |section_childs:EC[E4|E6|E8]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -110,6 +112,7 @@ $result_tree_text{'nodename_parentheses'} = '*document_root 
C9
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Node-_0028with-parentheses_0029}
   *arguments_line C1
    *line_arg C1
@@ -125,8 +128,9 @@ $result_tree_text{'nodename_parentheses'} = '*document_root 
C9
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E6|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -148,6 +152,7 @@ $result_tree_text{'nodename_parentheses'} = '*document_root 
C9
  |is_target:{1}
  |menu_directions:D[next->MISSING: (menu_entry_node)[C4]|prev->E3|up->E0]
  |node_directions:D[next->E7|prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{Other-node}
   *arguments_line C1
    *line_arg C1
@@ -163,8 +168,9 @@ $result_tree_text{'nodename_parentheses'} = '*document_root 
C9
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[next->E8|prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[next->E8|prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -205,6 +211,7 @@ $result_tree_text{'nodename_parentheses'} = '*document_root 
C9
  |associated_title_command:[E8]
  |is_target:{1}
  |node_directions:D[prev->E5|up->E0]
+ |node_number:{4}
  |normalized:{_0028manual_0029node}
   *arguments_line C1
    *line_arg C1
@@ -220,8 +227,9 @@ $result_tree_text{'nodename_parentheses'} = '*document_root 
C9
  |associated_anchor_command:[E7]
  |associated_node:[E7]
  |section_directions:D[prev->E6|up->E1]
+ |section_heading_number:{3}
  |section_level:{1}
- |section_number:{3}
+ |section_number:{4}
  |toplevel_directions:D[prev->E6|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/sectioning/nodes_after_top_before_chapter_no_use_nodes_chapter.pl
 
b/tta/perl/t/results/sectioning/nodes_after_top_before_chapter_no_use_nodes_chapter.pl
index 7e2ae2189c..166a648251 100644
--- 
a/tta/perl/t/results/sectioning/nodes_after_top_before_chapter_no_use_nodes_chapter.pl
+++ 
b/tta/perl/t/results/sectioning/nodes_after_top_before_chapter_no_use_nodes_chapter.pl
@@ -15,6 +15,7 @@ 
$result_tree_text{'nodes_after_top_before_chapter_no_use_nodes_chapter'} = '*doc
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -72,6 +73,7 @@ 
$result_tree_text{'nodes_after_top_before_chapter_no_use_nodes_chapter'} = '*doc
  |is_target:{1}
  |menu_directions:D[next->E3|up->E0]
  |node_directions:D[next->E3|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{second-node}
   *arguments_line C4
    *line_arg C1
@@ -111,6 +113,7 @@ 
$result_tree_text{'nodes_after_top_before_chapter_no_use_nodes_chapter'} = '*doc
  |is_target:{1}
  |menu_directions:D[prev->E2|up->E0]
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{third-node}
   *arguments_line C4
    *line_arg C1
@@ -136,6 +139,7 @@ 
$result_tree_text{'nodes_after_top_before_chapter_no_use_nodes_chapter'} = '*doc
  |EXTRA
  |associated_anchor_command:[E3]
  |associated_node:[E3]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
diff --git 
a/tta/perl/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl 
b/tta/perl/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
index ffc89215af..94ba9c0460 100644
--- a/tta/perl/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
+++ b/tta/perl/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
@@ -20,6 +20,7 @@ NodeForward: [U1]
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -88,6 +89,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[next->E3|up->E0]
  |node_directions:D[next->E3|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{second-node}
   *arguments_line C4
    *line_arg C1
@@ -135,6 +137,7 @@ NodeBack: [U1]
  |is_target:{1}
  |menu_directions:D[prev->E2|up->E0]
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{third-node}
   *arguments_line C4
    *line_arg C1
@@ -160,6 +163,7 @@ NodeBack: [U1]
  |EXTRA
  |associated_anchor_command:[E3]
  |associated_node:[E3]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
diff --git 
a/tta/perl/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl 
b/tta/perl/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl
index a1daee368b..5c608b3d36 100644
--- a/tta/perl/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl
+++ b/tta/perl/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl
@@ -15,6 +15,7 @@ $result_tree_text{'nodes_after_top_before_chapter_not_split'} 
= '*document_root
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -72,6 +73,7 @@ $result_tree_text{'nodes_after_top_before_chapter_not_split'} 
= '*document_root
  |is_target:{1}
  |menu_directions:D[next->E3|up->E0]
  |node_directions:D[next->E3|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{second-node}
   *arguments_line C4
    *line_arg C1
@@ -111,6 +113,7 @@ 
$result_tree_text{'nodes_after_top_before_chapter_not_split'} = '*document_root
  |is_target:{1}
  |menu_directions:D[prev->E2|up->E0]
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{third-node}
   *arguments_line C4
    *line_arg C1
@@ -136,6 +139,7 @@ 
$result_tree_text{'nodes_after_top_before_chapter_not_split'} = '*document_root
  |EXTRA
  |associated_anchor_command:[E3]
  |associated_node:[E3]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
diff --git 
a/tta/perl/t/results/sectioning/nodes_after_top_before_chapter_not_split_no_use_node_directions.pl
 
b/tta/perl/t/results/sectioning/nodes_after_top_before_chapter_not_split_no_use_node_directions.pl
index 1fad4211bd..825a666a06 100644
--- 
a/tta/perl/t/results/sectioning/nodes_after_top_before_chapter_not_split_no_use_node_directions.pl
+++ 
b/tta/perl/t/results/sectioning/nodes_after_top_before_chapter_not_split_no_use_node_directions.pl
@@ -15,6 +15,7 @@ 
$result_tree_text{'nodes_after_top_before_chapter_not_split_no_use_node_directio
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -72,6 +73,7 @@ 
$result_tree_text{'nodes_after_top_before_chapter_not_split_no_use_node_directio
  |is_target:{1}
  |menu_directions:D[next->E3|up->E0]
  |node_directions:D[next->E3|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{second-node}
   *arguments_line C4
    *line_arg C1
@@ -111,6 +113,7 @@ 
$result_tree_text{'nodes_after_top_before_chapter_not_split_no_use_node_directio
  |is_target:{1}
  |menu_directions:D[prev->E2|up->E0]
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{third-node}
   *arguments_line C4
    *line_arg C1
@@ -136,6 +139,7 @@ 
$result_tree_text{'nodes_after_top_before_chapter_not_split_no_use_node_directio
  |EXTRA
  |associated_anchor_command:[E3]
  |associated_node:[E3]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
diff --git 
a/tta/perl/t/results/sectioning/nodes_after_top_before_chapter_sections.pl 
b/tta/perl/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
index 99e01ccf70..67894c5d81 100644
--- a/tta/perl/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
+++ b/tta/perl/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
@@ -18,6 +18,7 @@ NodeUp: [U0]
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -75,6 +76,7 @@ NodeUp: [U0]
  |is_target:{1}
  |menu_directions:D[next->E3|up->E0]
  |node_directions:D[next->E3|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{second-node}
   *arguments_line C4
    *line_arg C1
@@ -114,6 +116,7 @@ NodeUp: [U0]
  |is_target:{1}
  |menu_directions:D[prev->E2|up->E0]
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{third-node}
   *arguments_line C4
    *line_arg C1
@@ -139,6 +142,7 @@ NodeUp: [U0]
  |EXTRA
  |associated_anchor_command:[E3]
  |associated_node:[E3]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
diff --git 
a/tta/perl/t/results/sectioning/nodes_after_top_before_chapter_texi2html.pl 
b/tta/perl/t/results/sectioning/nodes_after_top_before_chapter_texi2html.pl
index c368a1f3f4..a670c08204 100644
--- a/tta/perl/t/results/sectioning/nodes_after_top_before_chapter_texi2html.pl
+++ b/tta/perl/t/results/sectioning/nodes_after_top_before_chapter_texi2html.pl
@@ -15,6 +15,7 @@ $result_tree_text{'nodes_after_top_before_chapter_texi2html'} 
= '*document_root
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -72,6 +73,7 @@ $result_tree_text{'nodes_after_top_before_chapter_texi2html'} 
= '*document_root
  |is_target:{1}
  |menu_directions:D[next->E3|up->E0]
  |node_directions:D[next->E3|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{second-node}
   *arguments_line C4
    *line_arg C1
@@ -111,6 +113,7 @@ 
$result_tree_text{'nodes_after_top_before_chapter_texi2html'} = '*document_root
  |is_target:{1}
  |menu_directions:D[prev->E2|up->E0]
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{third-node}
   *arguments_line C4
    *line_arg C1
@@ -136,6 +139,7 @@ 
$result_tree_text{'nodes_after_top_before_chapter_texi2html'} = '*document_root
  |EXTRA
  |associated_anchor_command:[E3]
  |associated_node:[E3]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
diff --git 
a/tta/perl/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter.pl
 
b/tta/perl/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter.pl
index 0f441a49df..78a749d9ba 100644
--- 
a/tta/perl/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter.pl
+++ 
b/tta/perl/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter.pl
@@ -15,6 +15,7 @@ 
$result_tree_text{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -72,6 +73,7 @@ 
$result_tree_text{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}
  |is_target:{1}
  |menu_directions:D[next->E3|up->E0]
  |node_directions:D[next->E3|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{second-node}
   *arguments_line C4
    *line_arg C1
@@ -111,6 +113,7 @@ 
$result_tree_text{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}
  |is_target:{1}
  |menu_directions:D[prev->E2|up->E0]
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{third-node}
   *arguments_line C4
    *line_arg C1
@@ -136,6 +139,7 @@ 
$result_tree_text{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}
  |EXTRA
  |associated_anchor_command:[E3]
  |associated_node:[E3]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
diff --git 
a/tta/perl/t/results/sectioning/nodes_after_top_before_section_nodes.pl 
b/tta/perl/t/results/sectioning/nodes_after_top_before_section_nodes.pl
index 7c53e4e9e7..32969adbd4 100644
--- a/tta/perl/t/results/sectioning/nodes_after_top_before_section_nodes.pl
+++ b/tta/perl/t/results/sectioning/nodes_after_top_before_section_nodes.pl
@@ -20,6 +20,7 @@ NodeForward: [U1]
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -88,6 +89,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[next->E3|up->E0]
  |node_directions:D[next->E3|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap-node}
   *arguments_line C4
    *line_arg C1
@@ -135,6 +137,7 @@ NodeBack: [U1]
  |is_target:{1}
  |menu_directions:D[prev->E2|up->E0]
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{third-node}
   *arguments_line C4
    *line_arg C1
@@ -160,6 +163,7 @@ NodeBack: [U1]
  |EXTRA
  |associated_anchor_command:[E3]
  |associated_node:[E3]
+ |section_heading_number:{1}
  |section_level:{3}
  |section_number:{1}
  |sectioning_root:
diff --git 
a/tta/perl/t/results/sectioning/nodes_after_top_before_section_sections.pl 
b/tta/perl/t/results/sectioning/nodes_after_top_before_section_sections.pl
index 0ae8e5c31d..5d26c9295b 100644
--- a/tta/perl/t/results/sectioning/nodes_after_top_before_section_sections.pl
+++ b/tta/perl/t/results/sectioning/nodes_after_top_before_section_sections.pl
@@ -18,6 +18,7 @@ NodeUp: [U0]
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -75,6 +76,7 @@ NodeUp: [U0]
  |is_target:{1}
  |menu_directions:D[next->E3|up->E0]
  |node_directions:D[next->E3|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap-node}
   *arguments_line C4
    *line_arg C1
@@ -114,6 +116,7 @@ NodeUp: [U0]
  |is_target:{1}
  |menu_directions:D[prev->E2|up->E0]
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{third-node}
   *arguments_line C4
    *line_arg C1
@@ -139,6 +142,7 @@ NodeUp: [U0]
  |EXTRA
  |associated_anchor_command:[E3]
  |associated_node:[E3]
+ |section_heading_number:{1}
  |section_level:{3}
  |section_number:{1}
  |sectioning_root:
diff --git 
a/tta/perl/t/results/sectioning/nodes_after_top_before_section_texi2html_chapter.pl
 
b/tta/perl/t/results/sectioning/nodes_after_top_before_section_texi2html_chapter.pl
index 8b80c1b6f5..d7d924c67d 100644
--- 
a/tta/perl/t/results/sectioning/nodes_after_top_before_section_texi2html_chapter.pl
+++ 
b/tta/perl/t/results/sectioning/nodes_after_top_before_section_texi2html_chapter.pl
@@ -15,6 +15,7 @@ 
$result_tree_text{'nodes_after_top_before_section_texi2html_chapter'} = '*docume
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -72,6 +73,7 @@ 
$result_tree_text{'nodes_after_top_before_section_texi2html_chapter'} = '*docume
  |is_target:{1}
  |menu_directions:D[next->E3|up->E0]
  |node_directions:D[next->E3|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap-node}
   *arguments_line C4
    *line_arg C1
@@ -111,6 +113,7 @@ 
$result_tree_text{'nodes_after_top_before_section_texi2html_chapter'} = '*docume
  |is_target:{1}
  |menu_directions:D[prev->E2|up->E0]
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{third-node}
   *arguments_line C4
    *line_arg C1
@@ -136,6 +139,7 @@ 
$result_tree_text{'nodes_after_top_before_section_texi2html_chapter'} = '*docume
  |EXTRA
  |associated_anchor_command:[E3]
  |associated_node:[E3]
+ |section_heading_number:{1}
  |section_level:{3}
  |section_number:{1}
  |sectioning_root:
diff --git 
a/tta/perl/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes.pl
 
b/tta/perl/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes.pl
index 77417b73fd..381bda999d 100644
--- 
a/tta/perl/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes.pl
+++ 
b/tta/perl/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes.pl
@@ -15,6 +15,7 @@ 
$result_tree_text{'nodes_after_top_before_section_texi2html_use_nodes'} = '*docu
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -72,6 +73,7 @@ 
$result_tree_text{'nodes_after_top_before_section_texi2html_use_nodes'} = '*docu
  |is_target:{1}
  |menu_directions:D[next->E3|up->E0]
  |node_directions:D[next->E3|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap-node}
   *arguments_line C4
    *line_arg C1
@@ -111,6 +113,7 @@ 
$result_tree_text{'nodes_after_top_before_section_texi2html_use_nodes'} = '*docu
  |is_target:{1}
  |menu_directions:D[prev->E2|up->E0]
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{third-node}
   *arguments_line C4
    *line_arg C1
@@ -136,6 +139,7 @@ 
$result_tree_text{'nodes_after_top_before_section_texi2html_use_nodes'} = '*docu
  |EXTRA
  |associated_anchor_command:[E3]
  |associated_node:[E3]
+ |section_heading_number:{1}
  |section_level:{3}
  |section_number:{1}
  |sectioning_root:
diff --git 
a/tta/perl/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter.pl
 
b/tta/perl/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter.pl
index 3b2ba74497..69d25b7996 100644
--- 
a/tta/perl/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter.pl
+++ 
b/tta/perl/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter.pl
@@ -15,6 +15,7 @@ 
$result_tree_text{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -72,6 +73,7 @@ 
$result_tree_text{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}
  |is_target:{1}
  |menu_directions:D[next->E3|up->E0]
  |node_directions:D[next->E3|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap-node}
   *arguments_line C4
    *line_arg C1
@@ -111,6 +113,7 @@ 
$result_tree_text{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}
  |is_target:{1}
  |menu_directions:D[prev->E2|up->E0]
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{third-node}
   *arguments_line C4
    *line_arg C1
@@ -136,6 +139,7 @@ 
$result_tree_text{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}
  |EXTRA
  |associated_anchor_command:[E3]
  |associated_node:[E3]
+ |section_heading_number:{1}
  |section_level:{3}
  |section_number:{1}
  |sectioning_root:
diff --git a/tta/perl/t/results/sectioning/nodes_before_after_top.pl 
b/tta/perl/t/results/sectioning/nodes_before_after_top.pl
index 5b77c813ea..63ac4c948b 100644
--- a/tta/perl/t/results/sectioning/nodes_before_after_top.pl
+++ b/tta/perl/t/results/sectioning/nodes_before_after_top.pl
@@ -13,6 +13,7 @@ $result_tree_text{'nodes_before_after_top'} = '*document_root 
C7
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{node-before}
   *arguments_line C1
    *line_arg C1
@@ -33,6 +34,7 @@ $result_tree_text{'nodes_before_after_top'} = '*document_root 
C7
  |associated_title_command:[E2]
  |is_target:{1}
  |node_directions:D[next->E4]
+ |node_number:{2}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -49,6 +51,7 @@ $result_tree_text{'nodes_before_after_top'} = '*document_root 
C7
  |associated_node:[E1]
  |section_childs:EC[E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -71,6 +74,7 @@ $result_tree_text{'nodes_before_after_top'} = '*document_root 
C7
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{3}
  |normalized:{after}
   *arguments_line C1
    *line_arg C1
@@ -91,6 +95,7 @@ $result_tree_text{'nodes_before_after_top'} = '*document_root 
C7
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[prev->E1|up->E1]
+ |node_number:{4}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -106,8 +111,9 @@ $result_tree_text{'nodes_before_after_top'} = 
'*document_root C7
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[up->E2]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E2|up->E2]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/nodes_before_top.pl 
b/tta/perl/t/results/sectioning/nodes_before_top.pl
index 894f0c24fb..088a08b681 100644
--- a/tta/perl/t/results/sectioning/nodes_before_top.pl
+++ b/tta/perl/t/results/sectioning/nodes_before_top.pl
@@ -15,6 +15,7 @@ $result_tree_text{'nodes_before_top'} = '*document_root C7
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E3|up->MISSING: (line_arg)[C3]]
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C4
    *line_arg C1
@@ -78,6 +79,7 @@ $result_tree_text{'nodes_before_top'} = '*document_root C7
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[up->E0]
+ |node_number:{2}
  |normalized:{node-in-menu-before-top}
   *arguments_line C4
    *line_arg C1
@@ -103,6 +105,7 @@ $result_tree_text{'nodes_before_top'} = '*document_root C7
  |is_target:{1}
  |menus:EC[E5]
  |node_directions:D[prev->E0]
+ |node_number:{3}
  |normalized:{Top}
   *arguments_line C3
    *line_arg C1
@@ -125,6 +128,7 @@ $result_tree_text{'nodes_before_top'} = '*document_root C7
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -177,6 +181,7 @@ $result_tree_text{'nodes_before_top'} = '*document_root C7
  |is_target:{1}
  |menu_directions:D[up->E3]
  |node_directions:D[up->E3]
+ |node_number:{4}
  |normalized:{second-node}
   *arguments_line C1
    *line_arg C1
@@ -192,8 +197,9 @@ $result_tree_text{'nodes_before_top'} = '*document_root C7
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E4]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E4|up->E4]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/sectioning/nodes_no_node_top_explicit_directions.pl 
b/tta/perl/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
index e9e9e468f8..2a67bf90d3 100644
--- a/tta/perl/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
+++ b/tta/perl/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
@@ -20,6 +20,7 @@ NodeForward: [U1]
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[up->MISSING: (line_arg)[C3]]
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C4
    *line_arg C1
@@ -83,6 +84,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{second-node}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/novalidate.pl 
b/tta/perl/t/results/sectioning/novalidate.pl
index 0cb8136dbd..f48646a5c3 100644
--- a/tta/perl/t/results/sectioning/novalidate.pl
+++ b/tta/perl/t/results/sectioning/novalidate.pl
@@ -17,6 +17,7 @@ $result_tree_text{'novalidate'} = '*document_root C2
  |EXTRA
  |is_target:{1}
  |menus:EC[E1]
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C2
    *line_arg C1
diff --git 
a/tta/perl/t/results/sectioning/one_node_explicit_directions_anchor.pl 
b/tta/perl/t/results/sectioning/one_node_explicit_directions_anchor.pl
index 4a3a6549c6..97ea8d79e1 100644
--- a/tta/perl/t/results/sectioning/one_node_explicit_directions_anchor.pl
+++ b/tta/perl/t/results/sectioning/one_node_explicit_directions_anchor.pl
@@ -13,6 +13,7 @@ $result_tree_text{'one_node_explicit_directions_anchor'} = 
'*document_root C2
  |EXTRA
  |is_target:{1}
  |node_directions:D[up->MISSING: (line_arg)[C3]]
+ |node_number:{1}
  |normalized:{one-node}
   *arguments_line C4
    *line_arg C1
diff --git 
a/tta/perl/t/results/sectioning/one_node_explicit_directions_anchor_no_use_node.pl
 
b/tta/perl/t/results/sectioning/one_node_explicit_directions_anchor_no_use_node.pl
index b40d556f3d..f95d783ba9 100644
--- 
a/tta/perl/t/results/sectioning/one_node_explicit_directions_anchor_no_use_node.pl
+++ 
b/tta/perl/t/results/sectioning/one_node_explicit_directions_anchor_no_use_node.pl
@@ -13,6 +13,7 @@ 
$result_tree_text{'one_node_explicit_directions_anchor_no_use_node'} = '*documen
  |EXTRA
  |is_target:{1}
  |node_directions:D[up->MISSING: (line_arg)[C3]]
+ |node_number:{1}
  |normalized:{one-node}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/one_subsection.pl 
b/tta/perl/t/results/sectioning/one_subsection.pl
index d7abc638f6..7d8cb4115a 100644
--- a/tta/perl/t/results/sectioning/one_subsection.pl
+++ b/tta/perl/t/results/sectioning/one_subsection.pl
@@ -12,6 +12,7 @@ $result_tree_text{'one_subsection'} = '*document_root C2
  |spaces_before_argument:
   |{ }
  |EXTRA
+ |section_heading_number:{1}
  |section_level:{3}
  |section_number:{1}
  |sectioning_root:
diff --git a/tta/perl/t/results/sectioning/one_subsection_and_node.pl 
b/tta/perl/t/results/sectioning/one_subsection_and_node.pl
index ca821b47a8..ccef0be71a 100644
--- a/tta/perl/t/results/sectioning/one_subsection_and_node.pl
+++ b/tta/perl/t/results/sectioning/one_subsection_and_node.pl
@@ -14,6 +14,7 @@ $result_tree_text{'one_subsection_and_node'} = 
'*document_root C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{one-node}
   *arguments_line C1
    *line_arg C1
@@ -28,6 +29,7 @@ $result_tree_text{'one_subsection_and_node'} = 
'*document_root C3
  |EXTRA
  |associated_anchor_command:[E0]
  |associated_node:[E0]
+ |section_heading_number:{1}
  |section_level:{3}
  |section_number:{1}
  |sectioning_root:
diff --git a/tta/perl/t/results/sectioning/part_before_chapter.pl 
b/tta/perl/t/results/sectioning/part_before_chapter.pl
index 394377170c..9f1dc22914 100644
--- a/tta/perl/t/results/sectioning/part_before_chapter.pl
+++ b/tta/perl/t/results/sectioning/part_before_chapter.pl
@@ -18,6 +18,7 @@ This: [U0]
  |part_associated_section:[E1]
  |section_childs:EC[E1]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -37,8 +38,9 @@ This: [U0]
  |EXTRA
  |associated_part:[E0]
  |section_directions:D[up->E0]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/sectioning/part_before_section.pl 
b/tta/perl/t/results/sectioning/part_before_section.pl
index 68f5fca33a..ed297bca4c 100644
--- a/tta/perl/t/results/sectioning/part_before_section.pl
+++ b/tta/perl/t/results/sectioning/part_before_section.pl
@@ -17,6 +17,7 @@ This: [U0]
  |part_associated_section:[E1]
  |section_childs:EC[E1]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -36,8 +37,9 @@ This: [U0]
  |EXTRA
  |associated_part:[E0]
  |section_directions:D[up->E0]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/sectioning/part_before_top.pl 
b/tta/perl/t/results/sectioning/part_before_top.pl
index a8cba8f35c..c35bdf7b22 100644
--- a/tta/perl/t/results/sectioning/part_before_top.pl
+++ b/tta/perl/t/results/sectioning/part_before_top.pl
@@ -18,6 +18,7 @@ This: [U0]
  |part_associated_section:[E1]
  |section_directions:D[next->E1]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -38,6 +39,7 @@ This: [U0]
  |associated_part:[E0]
  |section_directions:D[prev->E0]
  |section_level:{0}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/sectioning/part_chapter_after_top.pl 
b/tta/perl/t/results/sectioning/part_chapter_after_top.pl
index 62b03def9f..32ab72eeb8 100644
--- a/tta/perl/t/results/sectioning/part_chapter_after_top.pl
+++ b/tta/perl/t/results/sectioning/part_chapter_after_top.pl
@@ -24,6 +24,7 @@ NodeForward: [U1]
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E4]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -40,6 +41,7 @@ NodeForward: [U1]
  |associated_node:[E0]
  |section_directions:D[next->E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -102,6 +104,7 @@ NodeBack: [U0]
  |section_childs:EC[E5]
  |section_directions:D[prev->E1]
  |section_level:{0}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -119,6 +122,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |node_preceding_part:[E3]
  |normalized:{chapter}
   *arguments_line C1
@@ -136,8 +140,9 @@ NodeBack: [U0]
  |associated_node:[E4]
  |associated_part:[E3]
  |section_directions:D[up->E3]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{3}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/part_chapter_appendix.pl 
b/tta/perl/t/results/sectioning/part_chapter_appendix.pl
index 3c7851bf32..8a0d62feb0 100644
--- a/tta/perl/t/results/sectioning/part_chapter_appendix.pl
+++ b/tta/perl/t/results/sectioning/part_chapter_appendix.pl
@@ -17,6 +17,7 @@ $result_tree_text{'part_chapter_appendix'} = '*document_root 
C4
  |section_childs:EC[E1]
  |section_directions:D[next->E2]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -36,8 +37,9 @@ $result_tree_text{'part_chapter_appendix'} = '*document_root 
C4
  |EXTRA
  |associated_part:[E0]
  |section_directions:D[up->E0]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E2]
   *arguments_line C1
    *line_arg C1
@@ -52,8 +54,9 @@ $result_tree_text{'part_chapter_appendix'} = '*document_root 
C4
   |{ }
  |EXTRA
  |section_directions:D[prev->E0]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{3}
  |toplevel_directions:D[prev->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/part_node_after_top.pl 
b/tta/perl/t/results/sectioning/part_node_after_top.pl
index 92d67738b8..392c2e5056 100644
--- a/tta/perl/t/results/sectioning/part_node_after_top.pl
+++ b/tta/perl/t/results/sectioning/part_node_after_top.pl
@@ -25,6 +25,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -41,6 +42,7 @@ NodeBack: [U0]
  |associated_node:[E0]
  |section_directions:D[next->E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -90,6 +92,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap-part-node-after-top}
   *arguments_line C1
    *line_arg C1
@@ -112,6 +115,7 @@ Prev: [U0]
  |global_command_number:{1}
  |section_directions:D[prev->E1]
  |section_level:{0}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/sectioning/part_node_before_top.pl 
b/tta/perl/t/results/sectioning/part_node_before_top.pl
index 07fc05aac0..130ed282f2 100644
--- a/tta/perl/t/results/sectioning/part_node_before_top.pl
+++ b/tta/perl/t/results/sectioning/part_node_before_top.pl
@@ -19,6 +19,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[up->E2]
  |node_directions:D[next->E2|up->E2]
+ |node_number:{1}
  |normalized:{part-node-before-top}
   *arguments_line C4
    *line_arg C1
@@ -50,6 +51,7 @@ NodeBack: [U0]
  |part_following_node:[E2]
  |section_directions:D[next->E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -72,6 +74,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menus:EC[E4]
  |node_directions:D[next->E0]
+ |node_number:{2}
  |node_preceding_part:[E1]
  |normalized:{Top}
   *arguments_line C1
@@ -90,6 +93,7 @@ NodeBack: [U0]
  |associated_part:[E1]
  |section_directions:D[prev->E1]
  |section_level:{0}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/sectioning/part_node_chapter_after_top.pl 
b/tta/perl/t/results/sectioning/part_node_chapter_after_top.pl
index dc46a88b85..a7ed25dfee 100644
--- a/tta/perl/t/results/sectioning/part_node_chapter_after_top.pl
+++ b/tta/perl/t/results/sectioning/part_node_chapter_after_top.pl
@@ -24,6 +24,7 @@ NodeForward: [U1]
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E4]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -40,6 +41,7 @@ NodeForward: [U1]
  |associated_node:[E0]
  |section_directions:D[next->E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -114,6 +116,7 @@ NodeBack: [U0]
  |section_childs:EC[E6]
  |section_directions:D[prev->E1]
  |section_level:{0}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -129,6 +132,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  |node_preceding_part:[E3]
  |normalized:{a-node-after-part}
   *arguments_line C4
@@ -173,6 +177,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[prev->E4|up->E0]
  |node_directions:D[next->E4|up->E0]
+ |node_number:{3}
  |node_preceding_part:[E3]
  |normalized:{chapter}
   *arguments_line C4
@@ -206,8 +211,9 @@ NodeBack: [U0]
  |associated_node:[E5]
  |associated_part:[E3]
  |section_directions:D[up->E3]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{3}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/part_node_chapter_appendix.pl 
b/tta/perl/t/results/sectioning/part_node_chapter_appendix.pl
index 2e6ef4de0b..c96fc54e23 100644
--- a/tta/perl/t/results/sectioning/part_node_chapter_appendix.pl
+++ b/tta/perl/t/results/sectioning/part_node_chapter_appendix.pl
@@ -24,6 +24,7 @@ NodeForward: [U1]
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E4]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -40,6 +41,7 @@ NodeForward: [U1]
  |associated_node:[E0]
  |section_directions:D[next->E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -104,6 +106,7 @@ NodeBack: [U0]
  |section_childs:EC[E5]
  |section_directions:D[next->E6|prev->E1]
  |section_level:{0}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -121,6 +124,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |node_preceding_part:[E3]
  |normalized:{chapter-node}
   *arguments_line C1
@@ -138,8 +142,9 @@ NodeBack: [U0]
  |associated_node:[E4]
  |associated_part:[E3]
  |section_directions:D[up->E3]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{3}
  |toplevel_directions:D[next->E6|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -161,8 +166,9 @@ Prev: [U1]
   |{ }
  |EXTRA
  |section_directions:D[prev->E3]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{4}
  |toplevel_directions:D[prev->E5|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/part_node_chapter_node_appendix.pl 
b/tta/perl/t/results/sectioning/part_node_chapter_node_appendix.pl
index 528291dac0..ab61cffe52 100644
--- a/tta/perl/t/results/sectioning/part_node_chapter_node_appendix.pl
+++ b/tta/perl/t/results/sectioning/part_node_chapter_node_appendix.pl
@@ -24,6 +24,7 @@ NodeForward: [U1]
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E4]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -40,6 +41,7 @@ NodeForward: [U1]
  |associated_node:[E0]
  |section_directions:D[next->E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -117,6 +119,7 @@ NodeBack: [U0]
  |section_childs:EC[E5]
  |section_directions:D[next->E7|prev->E1]
  |section_level:{0}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -134,6 +137,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[next->E6|up->E0]
  |node_directions:D[next->E6|prev->E0|up->E0]
+ |node_number:{2}
  |node_preceding_part:[E3]
  |normalized:{chapter-node}
   *arguments_line C1
@@ -151,8 +155,9 @@ NodeBack: [U0]
  |associated_node:[E4]
  |associated_part:[E3]
  |section_directions:D[up->E3]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{3}
  |toplevel_directions:D[next->E7|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -181,6 +186,7 @@ NodeBack: [U1]
  |is_target:{1}
  |menu_directions:D[prev->E4|up->E0]
  |node_directions:D[prev->E4|up->E0]
+ |node_number:{3}
  |normalized:{appendix-node}
   *arguments_line C1
    *line_arg C1
@@ -196,8 +202,9 @@ NodeBack: [U1]
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[prev->E3]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{4}
  |toplevel_directions:D[prev->E5|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/part_node_node_part_appendix.pl 
b/tta/perl/t/results/sectioning/part_node_node_part_appendix.pl
index c8adeee8a4..6ae664ae5a 100644
--- a/tta/perl/t/results/sectioning/part_node_node_part_appendix.pl
+++ b/tta/perl/t/results/sectioning/part_node_node_part_appendix.pl
@@ -24,6 +24,7 @@ NodeForward: [U1]
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E4]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -40,6 +41,7 @@ NodeForward: [U1]
  |associated_node:[E0]
  |section_directions:D[next->E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -117,6 +119,7 @@ NodeBack: [U0]
  |section_childs:EC[E5]
  |section_directions:D[next->E7|prev->E1]
  |section_level:{0}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -134,6 +137,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[next->E6|up->E0]
  |node_directions:D[next->E6|prev->E0|up->E0]
+ |node_number:{2}
  |node_preceding_part:[E3]
  |normalized:{chapter-node}
   *arguments_line C1
@@ -151,8 +155,9 @@ NodeBack: [U0]
  |associated_node:[E4]
  |associated_part:[E3]
  |section_directions:D[up->E3]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{3}
  |toplevel_directions:D[next->E8|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -180,6 +185,7 @@ NodeBack: [U1]
  |is_target:{1}
  |menu_directions:D[prev->E4|up->E0]
  |node_directions:D[prev->E4|up->E0]
+ |node_number:{3}
  |normalized:{appendix-part}
   *arguments_line C1
    *line_arg C1
@@ -197,6 +203,7 @@ NodeBack: [U1]
  |section_childs:EC[E8]
  |section_directions:D[prev->E3]
  |section_level:{0}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -213,8 +220,9 @@ NodeBack: [U1]
  |associated_node:[E6]
  |associated_part:[E7]
  |section_directions:D[up->E7]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{5}
  |toplevel_directions:D[prev->E5|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/part_node_part_appendix.pl 
b/tta/perl/t/results/sectioning/part_node_part_appendix.pl
index ec3e19d33f..f52436fc47 100644
--- a/tta/perl/t/results/sectioning/part_node_part_appendix.pl
+++ b/tta/perl/t/results/sectioning/part_node_part_appendix.pl
@@ -24,6 +24,7 @@ NodeForward: [U1]
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E4]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -40,6 +41,7 @@ NodeForward: [U1]
  |associated_node:[E0]
  |section_directions:D[next->E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -104,6 +106,7 @@ NodeBack: [U0]
  |section_childs:EC[E5]
  |section_directions:D[next->E6|prev->E1]
  |section_level:{0}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -121,6 +124,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |node_preceding_part:[E3]
  |normalized:{chapter-node}
   *arguments_line C1
@@ -138,8 +142,9 @@ NodeBack: [U0]
  |associated_node:[E4]
  |associated_part:[E3]
  |section_directions:D[up->E3]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{3}
  |toplevel_directions:D[next->E7|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -164,6 +169,7 @@ FastBack: [U1]
  |section_childs:EC[E7]
  |section_directions:D[prev->E3]
  |section_level:{0}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -178,8 +184,9 @@ FastBack: [U1]
  |EXTRA
  |associated_part:[E6]
  |section_directions:D[up->E6]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{5}
  |toplevel_directions:D[prev->E5|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/part_node_part_node_appendix.pl 
b/tta/perl/t/results/sectioning/part_node_part_node_appendix.pl
index e384218a21..a12988e311 100644
--- a/tta/perl/t/results/sectioning/part_node_part_node_appendix.pl
+++ b/tta/perl/t/results/sectioning/part_node_part_node_appendix.pl
@@ -24,6 +24,7 @@ NodeForward: [U1]
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E4]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -40,6 +41,7 @@ NodeForward: [U1]
  |associated_node:[E0]
  |section_directions:D[next->E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -117,6 +119,7 @@ NodeBack: [U0]
  |section_childs:EC[E5]
  |section_directions:D[next->E6|prev->E1]
  |section_level:{0}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -134,6 +137,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[next->E7|up->E0]
  |node_directions:D[next->E7|prev->E0|up->E0]
+ |node_number:{2}
  |node_preceding_part:[E3]
  |normalized:{chapter-node}
   *arguments_line C1
@@ -151,8 +155,9 @@ NodeBack: [U0]
  |associated_node:[E4]
  |associated_part:[E3]
  |section_directions:D[up->E3]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{3}
  |toplevel_directions:D[next->E8|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -181,6 +186,7 @@ NodeBack: [U1]
  |section_childs:EC[E8]
  |section_directions:D[prev->E3]
  |section_level:{0}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -198,6 +204,7 @@ NodeBack: [U1]
  |is_target:{1}
  |menu_directions:D[prev->E4|up->E0]
  |node_directions:D[prev->E4|up->E0]
+ |node_number:{3}
  |node_preceding_part:[E6]
  |normalized:{appendix-node}
   *arguments_line C1
@@ -215,8 +222,9 @@ NodeBack: [U1]
  |associated_node:[E7]
  |associated_part:[E6]
  |section_directions:D[up->E6]
+ |section_heading_number:{A}
  |section_level:{1}
- |section_number:{A}
+ |section_number:{5}
  |toplevel_directions:D[prev->E5|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/part_section_part.pl 
b/tta/perl/t/results/sectioning/part_section_part.pl
index 4b226f9a62..377481311a 100644
--- a/tta/perl/t/results/sectioning/part_section_part.pl
+++ b/tta/perl/t/results/sectioning/part_section_part.pl
@@ -16,6 +16,7 @@ $result_tree_text{'part_section_part'} = '*document_root C4
  |section_childs:EC[E1]
  |section_directions:D[next->E2]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -35,8 +36,9 @@ $result_tree_text{'part_section_part'} = '*document_root C4
  |EXTRA
  |associated_part:[E0]
  |section_directions:D[up->E0]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -52,6 +54,7 @@ $result_tree_text{'part_section_part'} = '*document_root C4
  |global_command_number:{2}
  |section_directions:D[prev->E0]
  |section_level:{0}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/sectioning/protected_node_parentheses.pl 
b/tta/perl/t/results/sectioning/protected_node_parentheses.pl
index 34a69eb792..03f745a564 100644
--- a/tta/perl/t/results/sectioning/protected_node_parentheses.pl
+++ b/tta/perl/t/results/sectioning/protected_node_parentheses.pl
@@ -16,6 +16,7 @@ $result_tree_text{'protected_node_parentheses'} = 
'*document_root C4
  |associated_title_command:[E1]
  |is_target:{1}
  |menus:EC[E2]
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'protected_node_parentheses'} = 
'*document_root C4
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -83,6 +85,7 @@ $result_tree_text{'protected_node_parentheses'} = 
'*document_root C4
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[up->E0]
+ |node_number:{2}
  |normalized:{_0028manual_0029-name}
   *arguments_line C1
    *line_arg C2
diff --git a/tta/perl/t/results/sectioning/recursive_self_section_reference.pl 
b/tta/perl/t/results/sectioning/recursive_self_section_reference.pl
index 2869a73377..c70b3bf19c 100644
--- a/tta/perl/t/results/sectioning/recursive_self_section_reference.pl
+++ b/tta/perl/t/results/sectioning/recursive_self_section_reference.pl
@@ -15,6 +15,7 @@ $result_tree_text{'recursive_self_section_reference'} = 
'*document_root C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{sharp}
   *arguments_line C1
    *line_arg C1
@@ -29,6 +30,7 @@ $result_tree_text{'recursive_self_section_reference'} = 
'*document_root C3
  |EXTRA
  |associated_anchor_command:[E0]
  |associated_node:[E0]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
diff --git a/tta/perl/t/results/sectioning/ref_to_top.pl 
b/tta/perl/t/results/sectioning/ref_to_top.pl
index 62e314e458..cc16560081 100644
--- a/tta/perl/t/results/sectioning/ref_to_top.pl
+++ b/tta/perl/t/results/sectioning/ref_to_top.pl
@@ -15,6 +15,7 @@ $result_tree_text{'ref_to_top'} = '*document_root C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -30,6 +31,7 @@ $result_tree_text{'ref_to_top'} = '*document_root C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git 
a/tta/perl/t/results/sectioning/reference_to_only_special_spaces_node.pl 
b/tta/perl/t/results/sectioning/reference_to_only_special_spaces_node.pl
index 0091748f06..7616de25bd 100644
--- a/tta/perl/t/results/sectioning/reference_to_only_special_spaces_node.pl
+++ b/tta/perl/t/results/sectioning/reference_to_only_special_spaces_node.pl
@@ -18,6 +18,7 @@ $result_tree_text{'reference_to_only_special_spaces_node'} = 
'*document_root C8
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -34,6 +35,7 @@ $result_tree_text{'reference_to_only_special_spaces_node'} = 
'*document_root C8
  |associated_node:[E0]
  |section_childs:EC[E3|E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -56,6 +58,7 @@ $result_tree_text{'reference_to_only_special_spaces_node'} = 
'*document_root C8
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{_2002_2003_2002}
   *arguments_line C1
    *line_arg C1
@@ -71,8 +74,9 @@ $result_tree_text{'reference_to_only_special_spaces_node'} = 
'*document_root C8
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -106,6 +110,7 @@ $result_tree_text{'reference_to_only_special_spaces_node'} 
= '*document_root C8
  |associated_section:[E5]
  |associated_title_command:[E5]
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{_2002_2003_2002}
   *arguments_line C1
    *line_arg C1
@@ -123,8 +128,9 @@ $result_tree_text{'reference_to_only_special_spaces_node'} 
= '*document_root C8
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/section_before_after_top_node.pl 
b/tta/perl/t/results/sectioning/section_before_after_top_node.pl
index 371a8ef13f..fc6ad3af11 100644
--- a/tta/perl/t/results/sectioning/section_before_after_top_node.pl
+++ b/tta/perl/t/results/sectioning/section_before_after_top_node.pl
@@ -14,6 +14,7 @@ $result_tree_text{'section_before_after_top_node'} = 
'*document_root C5
  |EXTRA
  |section_directions:D[next->E2]
  |section_level:{1}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -35,6 +36,7 @@ $result_tree_text{'section_before_after_top_node'} = 
'*document_root C5
  |associated_section:[E2]
  |associated_title_command:[E2]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -51,6 +53,7 @@ $result_tree_text{'section_before_after_top_node'} = 
'*document_root C5
  |associated_node:[E1]
  |section_directions:D[next->E3|prev->E0]
  |section_level:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E3|prev->E0]
   *arguments_line C1
    *line_arg C1
@@ -65,8 +68,9 @@ $result_tree_text{'section_before_after_top_node'} = 
'*document_root C5
   |{ }
  |EXTRA
  |section_directions:D[prev->E2]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{3}
  |toplevel_directions:D[prev->E2|up->E2]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/sectioning/section_before_after_top_node_last_node.pl 
b/tta/perl/t/results/sectioning/section_before_after_top_node_last_node.pl
index fe5b9991ef..49ce997ea8 100644
--- a/tta/perl/t/results/sectioning/section_before_after_top_node_last_node.pl
+++ b/tta/perl/t/results/sectioning/section_before_after_top_node_last_node.pl
@@ -14,6 +14,7 @@ $result_tree_text{'section_before_after_top_node_last_node'} 
= '*document_root C
  |EXTRA
  |section_directions:D[next->E2]
  |section_level:{1}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -36,6 +37,7 @@ $result_tree_text{'section_before_after_top_node_last_node'} 
= '*document_root C
  |associated_title_command:[E2]
  |is_target:{1}
  |node_directions:D[next->E4]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -52,6 +54,7 @@ $result_tree_text{'section_before_after_top_node_last_node'} 
= '*document_root C
  |associated_node:[E1]
  |section_directions:D[next->E3|prev->E0]
  |section_level:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E3|prev->E0]
   *arguments_line C1
    *line_arg C1
@@ -66,8 +69,9 @@ $result_tree_text{'section_before_after_top_node_last_node'} 
= '*document_root C
   |{ }
  |EXTRA
  |section_directions:D[prev->E2]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{3}
  |toplevel_directions:D[prev->E2|up->E2]
   *arguments_line C1
    *line_arg C1
@@ -86,6 +90,7 @@ $result_tree_text{'section_before_after_top_node_last_node'} 
= '*document_root C
  |EXTRA
  |is_target:{1}
  |node_directions:D[prev->E1]
+ |node_number:{2}
  |normalized:{node-after}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/section_before_chapter.pl 
b/tta/perl/t/results/sectioning/section_before_chapter.pl
index 5c61b7961d..077b41cb90 100644
--- a/tta/perl/t/results/sectioning/section_before_chapter.pl
+++ b/tta/perl/t/results/sectioning/section_before_chapter.pl
@@ -12,6 +12,7 @@ $result_tree_text{'section_before_chapter'} = '*document_root 
C3
   |{ }
  |EXTRA
  |section_directions:D[next->E1]
+ |section_heading_number:{1}
  |section_level:{2}
  |section_number:{1}
  |sectioning_root:
@@ -33,6 +34,7 @@ $result_tree_text{'section_before_chapter'} = '*document_root 
C3
   |{ }
  |EXTRA
  |section_directions:D[prev->E0]
+ |section_heading_number:{2}
  |section_level:{2}
  |section_number:{2}
  |toplevel_directions:D[prev->E0]
diff --git a/tta/perl/t/results/sectioning/section_before_part.pl 
b/tta/perl/t/results/sectioning/section_before_part.pl
index 0b6c3a09d7..806575e739 100644
--- a/tta/perl/t/results/sectioning/section_before_part.pl
+++ b/tta/perl/t/results/sectioning/section_before_part.pl
@@ -12,6 +12,7 @@ $result_tree_text{'section_before_part'} = '*document_root C3
  |spaces_before_argument:
   |{ }
  |EXTRA
+ |section_heading_number:{1}
  |section_level:{2}
  |section_number:{1}
  |sectioning_root:
@@ -33,6 +34,7 @@ $result_tree_text{'section_before_part'} = '*document_root C3
  |EXTRA
  |global_command_number:{1}
  |section_level:{0}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/sectioning/section_before_top.pl 
b/tta/perl/t/results/sectioning/section_before_top.pl
index d42c64ed35..acf5736fce 100644
--- a/tta/perl/t/results/sectioning/section_before_top.pl
+++ b/tta/perl/t/results/sectioning/section_before_top.pl
@@ -16,6 +16,7 @@ $result_tree_text{'section_before_top'} = '*document_root C5
  |is_target:{1}
  |menu_directions:D[up->E2]
  |node_directions:D[up->E2]
+ |node_number:{1}
  |normalized:{section-node}
   *arguments_line C4
    *line_arg C1
@@ -38,6 +39,7 @@ $result_tree_text{'section_before_top'} = '*document_root C5
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_directions:D[next->E3]
+ |section_heading_number:{1}
  |section_level:{2}
  |section_number:{1}
  |sectioning_root:
@@ -63,6 +65,7 @@ $result_tree_text{'section_before_top'} = '*document_root C5
  |is_target:{1}
  |menus:EC[E4]
  |node_directions:D[next->E0]
+ |node_number:{2}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -79,6 +82,7 @@ $result_tree_text{'section_before_top'} = '*document_root C5
  |associated_node:[E2]
  |section_directions:D[prev->E1]
  |section_level:{2}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/section_before_top_no_node.pl 
b/tta/perl/t/results/sectioning/section_before_top_no_node.pl
index 2fce29796a..fff3dc81fd 100644
--- a/tta/perl/t/results/sectioning/section_before_top_no_node.pl
+++ b/tta/perl/t/results/sectioning/section_before_top_no_node.pl
@@ -12,6 +12,7 @@ $result_tree_text{'section_before_top_no_node'} = 
'*document_root C3
   |{ }
  |EXTRA
  |section_directions:D[next->E1]
+ |section_heading_number:{1}
  |section_level:{2}
  |section_number:{1}
  |sectioning_root:
@@ -34,6 +35,7 @@ $result_tree_text{'section_before_top_no_node'} = 
'*document_root C3
  |EXTRA
  |section_directions:D[prev->E0]
  |section_level:{2}
+ |section_number:{2}
  |toplevel_directions:D[prev->E0]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/section_below_unnumbered.pl 
b/tta/perl/t/results/sectioning/section_below_unnumbered.pl
index f297290af0..5480d47724 100644
--- a/tta/perl/t/results/sectioning/section_below_unnumbered.pl
+++ b/tta/perl/t/results/sectioning/section_below_unnumbered.pl
@@ -24,6 +24,7 @@ $result_tree_text{'section_below_unnumbered'} = 
'*document_root C8
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -40,6 +41,7 @@ $result_tree_text{'section_below_unnumbered'} = 
'*document_root C8
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -97,6 +99,7 @@ $result_tree_text{'section_below_unnumbered'} = 
'*document_root C8
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Unn}
   *arguments_line C1
    *line_arg C1
@@ -114,6 +117,7 @@ $result_tree_text{'section_below_unnumbered'} = 
'*document_root C8
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
  |section_level:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -161,6 +165,7 @@ $result_tree_text{'section_below_unnumbered'} = 
'*document_root C8
  |is_target:{1}
  |menu_directions:D[up->E3]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{Sec}
   *arguments_line C1
    *line_arg C1
@@ -177,6 +182,7 @@ $result_tree_text{'section_below_unnumbered'} = 
'*document_root C8
  |associated_node:[E6]
  |section_directions:D[up->E4]
  |section_level:{2}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/sectioning/section_below_unnumbered_no_top.pl 
b/tta/perl/t/results/sectioning/section_below_unnumbered_no_top.pl
index e8daabfadb..8f979c184e 100644
--- a/tta/perl/t/results/sectioning/section_below_unnumbered_no_top.pl
+++ b/tta/perl/t/results/sectioning/section_below_unnumbered_no_top.pl
@@ -14,6 +14,7 @@ $result_tree_text{'section_below_unnumbered_no_top'} = 
'*document_root C3
  |EXTRA
  |section_childs:EC[E1]
  |section_level:{1}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -32,6 +33,7 @@ $result_tree_text{'section_below_unnumbered_no_top'} = 
'*document_root C3
  |EXTRA
  |section_directions:D[up->E0]
  |section_level:{2}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/sectioning/section_chapter_before_top.pl 
b/tta/perl/t/results/sectioning/section_chapter_before_top.pl
index 4b7d5b1217..886f60197b 100644
--- a/tta/perl/t/results/sectioning/section_chapter_before_top.pl
+++ b/tta/perl/t/results/sectioning/section_chapter_before_top.pl
@@ -12,6 +12,7 @@ $result_tree_text{'section_chapter_before_top'} = 
'*document_root C4
   |{ }
  |EXTRA
  |section_directions:D[next->E1]
+ |section_heading_number:{1}
  |section_level:{2}
  |section_number:{1}
  |sectioning_root:
@@ -33,6 +34,7 @@ $result_tree_text{'section_chapter_before_top'} = 
'*document_root C4
   |{ }
  |EXTRA
  |section_directions:D[next->E2|prev->E0]
+ |section_heading_number:{2}
  |section_level:{2}
  |section_number:{2}
  |toplevel_directions:D[next->E2|prev->E0]
@@ -50,6 +52,7 @@ $result_tree_text{'section_chapter_before_top'} = 
'*document_root C4
  |EXTRA
  |section_directions:D[prev->E1]
  |section_level:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/section_chapter_before_top_nodes.pl 
b/tta/perl/t/results/sectioning/section_chapter_before_top_nodes.pl
index 44d50a7c9b..832482582b 100644
--- a/tta/perl/t/results/sectioning/section_chapter_before_top_nodes.pl
+++ b/tta/perl/t/results/sectioning/section_chapter_before_top_nodes.pl
@@ -17,6 +17,7 @@ $result_tree_text{'section_chapter_before_top_nodes'} = 
'*document_root C7
  |is_target:{1}
  |menu_directions:D[up->E2]
  |node_directions:D[next->E2|up->E2]
+ |node_number:{1}
  |normalized:{section-node}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'section_chapter_before_top_nodes'} = 
'*document_root C7
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_directions:D[next->E3]
+ |section_heading_number:{1}
  |section_level:{2}
  |section_number:{1}
  |sectioning_root:
@@ -58,6 +60,7 @@ $result_tree_text{'section_chapter_before_top_nodes'} = 
'*document_root C7
  |menu_directions:D[up->E5]
  |menus:EC[E4]
  |node_directions:D[next->E5|prev->E0|up->E5]
+ |node_number:{2}
  |normalized:{chapter-node}
   *arguments_line C1
    *line_arg C1
@@ -73,6 +76,7 @@ $result_tree_text{'section_chapter_before_top_nodes'} = 
'*document_root C7
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E6|prev->E1]
+ |section_heading_number:{2}
  |section_level:{2}
  |section_number:{2}
  |toplevel_directions:D[next->E6|prev->E1]
@@ -122,6 +126,7 @@ $result_tree_text{'section_chapter_before_top_nodes'} = 
'*document_root C7
  |is_target:{1}
  |menus:EC[E7]
  |node_directions:D[next->E2]
+ |node_number:{3}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -138,6 +143,7 @@ $result_tree_text{'section_chapter_before_top_nodes'} = 
'*document_root C7
  |associated_node:[E5]
  |section_directions:D[prev->E3]
  |section_level:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E3]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/section_node_before_part.pl 
b/tta/perl/t/results/sectioning/section_node_before_part.pl
index ee96df854d..7add6510bc 100644
--- a/tta/perl/t/results/sectioning/section_node_before_part.pl
+++ b/tta/perl/t/results/sectioning/section_node_before_part.pl
@@ -15,6 +15,7 @@ $result_tree_text{'section_node_before_part'} = 
'*document_root C4
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -29,6 +30,7 @@ $result_tree_text{'section_node_before_part'} = 
'*document_root C4
  |EXTRA
  |associated_anchor_command:[E0]
  |associated_node:[E0]
+ |section_heading_number:{1}
  |section_level:{2}
  |section_number:{1}
  |sectioning_root:
@@ -50,6 +52,7 @@ $result_tree_text{'section_node_before_part'} = 
'*document_root C4
  |EXTRA
  |global_command_number:{1}
  |section_level:{0}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/sectioning/sections.pl 
b/tta/perl/t/results/sectioning/sections.pl
index 468d23b673..a40f8a4c30 100644
--- a/tta/perl/t/results/sectioning/sections.pl
+++ b/tta/perl/t/results/sectioning/sections.pl
@@ -11,6 +11,7 @@ $result_tree_text{'sections'} = '*document_root C2
  |spaces_before_argument:
   |{ }
  |EXTRA
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
diff --git a/tta/perl/t/results/sectioning/semi_auto.pl 
b/tta/perl/t/results/sectioning/semi_auto.pl
index 694997abe8..624ad8872a 100644
--- a/tta/perl/t/results/sectioning/semi_auto.pl
+++ b/tta/perl/t/results/sectioning/semi_auto.pl
@@ -16,6 +16,7 @@ $result_tree_text{'semi_auto'} = '*document_root C9
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'semi_auto'} = '*document_root C9
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -96,6 +98,7 @@ $result_tree_text{'semi_auto'} = '*document_root C9
  |menu_directions:D[next->E8|up->E0]
  |menus:EC[E5]
  |node_directions:D[next->E8|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Chap1}
   *arguments_line C1
    *line_arg C1
@@ -112,8 +115,9 @@ $result_tree_text{'semi_auto'} = '*document_root C9
  |associated_node:[E3]
  |section_childs:EC[E7|E9]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -161,6 +165,7 @@ $result_tree_text{'semi_auto'} = '*document_root C9
  |is_target:{1}
  |menu_directions:D[up->E3]
  |node_directions:D[next->E8|up->E3]
+ |node_number:{3}
  |normalized:{Sec-in-chapter}
   *arguments_line C1
    *line_arg C1
@@ -176,8 +181,9 @@ $result_tree_text{'semi_auto'} = '*document_root C9
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[next->E9|up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -195,6 +201,7 @@ $result_tree_text{'semi_auto'} = '*document_root C9
  |is_target:{1}
  |menu_directions:D[prev->E3|up->E0]
  |node_directions:D[prev->E3|up->E0]
+ |node_number:{4}
  |normalized:{Section-non-auto}
   *arguments_line C4
    *line_arg C1
@@ -226,8 +233,9 @@ $result_tree_text{'semi_auto'} = '*document_root C9
  |associated_anchor_command:[E8]
  |associated_node:[E8]
  |section_directions:D[prev->E7|up->E4]
+ |section_heading_number:{1.2}
  |section_level:{2}
- |section_number:{1.2}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/sectioning/setfilename_on_top_and_after_node.pl 
b/tta/perl/t/results/sectioning/setfilename_on_top_and_after_node.pl
index a1cfc028f9..a98ee20612 100644
--- a/tta/perl/t/results/sectioning/setfilename_on_top_and_after_node.pl
+++ b/tta/perl/t/results/sectioning/setfilename_on_top_and_after_node.pl
@@ -15,6 +15,7 @@ $result_tree_text{'setfilename_on_top_and_after_node'} = 
'*document_root C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'setfilename_on_top_and_after_node'} = 
'*document_root C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/sectioning/space_in_node.pl 
b/tta/perl/t/results/sectioning/space_in_node.pl
index e19529b755..01550854cc 100644
--- a/tta/perl/t/results/sectioning/space_in_node.pl
+++ b/tta/perl/t/results/sectioning/space_in_node.pl
@@ -15,6 +15,7 @@ $result_tree_text{'space_in_node'} = '*document_root C5
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -86,6 +87,7 @@ $result_tree_text{'space_in_node'} = '*document_root C5
  |is_target:{1}
  |menu_directions:D[next->E3|up->E0]
  |node_directions:D[next->E3|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Chap-first-here}
   *arguments_line C1
    *line_arg C1
@@ -102,6 +104,7 @@ $result_tree_text{'space_in_node'} = '*document_root C5
  |is_target:{1}
  |menu_directions:D[next->E4|prev->E2|up->E0]
  |node_directions:D[next->E4|prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{Test-title}
   *arguments_line C1
    *line_arg C1
@@ -118,6 +121,7 @@ $result_tree_text{'space_in_node'} = '*document_root C5
  |is_target:{1}
  |menu_directions:D[prev->E3|up->E0]
  |node_directions:D[prev->E3|up->E0]
+ |node_number:{4}
  |normalized:{Last-with-spaces}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/split_for_format_not_split.pl 
b/tta/perl/t/results/sectioning/split_for_format_not_split.pl
index eef3ba086b..acd980416f 100644
--- a/tta/perl/t/results/sectioning/split_for_format_not_split.pl
+++ b/tta/perl/t/results/sectioning/split_for_format_not_split.pl
@@ -16,6 +16,7 @@ $result_tree_text{'split_for_format_not_split'} = 
'*document_root C3
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/top_no_argument_and_content.pl 
b/tta/perl/t/results/sectioning/top_no_argument_and_content.pl
index 94419b3a8d..524216f836 100644
--- a/tta/perl/t/results/sectioning/top_no_argument_and_content.pl
+++ b/tta/perl/t/results/sectioning/top_no_argument_and_content.pl
@@ -10,6 +10,7 @@ $result_tree_text{'top_no_argument_and_content'} = 
'*document_root C2
  *0 @top C3 l1
  |EXTRA
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/sectioning/top_no_argument_and_node.pl 
b/tta/perl/t/results/sectioning/top_no_argument_and_node.pl
index 823f7eff09..25090c961f 100644
--- a/tta/perl/t/results/sectioning/top_no_argument_and_node.pl
+++ b/tta/perl/t/results/sectioning/top_no_argument_and_node.pl
@@ -14,6 +14,7 @@ $result_tree_text{'top_no_argument_and_node'} = 
'*document_root C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{start}
   *arguments_line C1
    *line_arg C1
@@ -26,6 +27,7 @@ $result_tree_text{'top_no_argument_and_node'} = 
'*document_root C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/sectioning/top_no_argument_and_top_node.pl 
b/tta/perl/t/results/sectioning/top_no_argument_and_top_node.pl
index 5c985f1fb6..53b5532f1c 100644
--- a/tta/perl/t/results/sectioning/top_no_argument_and_top_node.pl
+++ b/tta/perl/t/results/sectioning/top_no_argument_and_top_node.pl
@@ -14,6 +14,7 @@ $result_tree_text{'top_no_argument_and_top_node'} = 
'*document_root C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -26,6 +27,7 @@ $result_tree_text{'top_no_argument_and_top_node'} = 
'*document_root C3
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/sectioning/top_node_no_menu_direction.pl 
b/tta/perl/t/results/sectioning/top_node_no_menu_direction.pl
index cecc7823c6..9b1c087633 100644
--- a/tta/perl/t/results/sectioning/top_node_no_menu_direction.pl
+++ b/tta/perl/t/results/sectioning/top_node_no_menu_direction.pl
@@ -15,6 +15,7 @@ $result_tree_text{'top_node_no_menu_direction'} = 
'*document_root C3
  |menu_directions:D[prev->E2|up->E0]
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -71,6 +72,7 @@ $result_tree_text{'top_node_no_menu_direction'} = 
'*document_root C3
  |is_target:{1}
  |menu_directions:D[next->E0|up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap-node}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/top_node_part_top.pl 
b/tta/perl/t/results/sectioning/top_node_part_top.pl
index 747e69b0bb..d25d1e99a2 100644
--- a/tta/perl/t/results/sectioning/top_node_part_top.pl
+++ b/tta/perl/t/results/sectioning/top_node_part_top.pl
@@ -17,6 +17,7 @@ This: [U0]
  |associated_section:[E2]
  |associated_title_command:[E2]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -34,6 +35,7 @@ This: [U0]
  |part_associated_section:[E2]
  |section_directions:D[next->E2]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -56,6 +58,7 @@ This: [U0]
  |associated_part:[E1]
  |section_directions:D[prev->E1]
  |section_level:{0}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/sectioning/top_part_chapter.pl 
b/tta/perl/t/results/sectioning/top_part_chapter.pl
index 399494e176..57fb62ed49 100644
--- a/tta/perl/t/results/sectioning/top_part_chapter.pl
+++ b/tta/perl/t/results/sectioning/top_part_chapter.pl
@@ -19,6 +19,7 @@ Next: [U1]
  |EXTRA
  |section_directions:D[next->E1]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -48,6 +49,7 @@ FastBack: [U0]
  |section_childs:EC[E2]
  |section_directions:D[prev->E0]
  |section_level:{0}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -62,8 +64,9 @@ FastBack: [U0]
  |EXTRA
  |associated_part:[E1]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{3}
  |toplevel_directions:D[prev->E0|up->E0]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/top_without_node_nodes.pl 
b/tta/perl/t/results/sectioning/top_without_node_nodes.pl
index 2931d5e48f..f136b57f39 100644
--- a/tta/perl/t/results/sectioning/top_without_node_nodes.pl
+++ b/tta/perl/t/results/sectioning/top_without_node_nodes.pl
@@ -16,6 +16,7 @@ NodeUp: (dir)
  |EXTRA
  |section_childs:EC[E2]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -40,6 +41,7 @@ NodeUp: (dir)
  |associated_title_command:[E2]
  |is_target:{1}
  |node_directions:D[up->MISSING: (line_arg)[C3]]
+ |node_number:{1}
  |normalized:{second}
   *arguments_line C4
    *line_arg C1
@@ -63,8 +65,9 @@ NodeUp: (dir)
  |associated_anchor_command:[E1]
  |associated_node:[E1]
  |section_directions:D[up->E0]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E0|up->E0]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/top_without_node_sections.pl 
b/tta/perl/t/results/sectioning/top_without_node_sections.pl
index 0138847b74..8234e523bc 100644
--- a/tta/perl/t/results/sectioning/top_without_node_sections.pl
+++ b/tta/perl/t/results/sectioning/top_without_node_sections.pl
@@ -18,6 +18,7 @@ FastForward: [U1]
  |EXTRA
  |section_childs:EC[E2]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -50,6 +51,7 @@ NodeUp: (dir)
  |associated_title_command:[E2]
  |is_target:{1}
  |node_directions:D[up->MISSING: (line_arg)[C3]]
+ |node_number:{1}
  |normalized:{second}
   *arguments_line C4
    *line_arg C1
@@ -73,8 +75,9 @@ NodeUp: (dir)
  |associated_anchor_command:[E1]
  |associated_node:[E1]
  |section_directions:D[up->E0]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E0|up->E0]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/sectioning/top_without_node_texi2html_no_use_nodes.pl 
b/tta/perl/t/results/sectioning/top_without_node_texi2html_no_use_nodes.pl
index a70d04b360..653a4e12a7 100644
--- a/tta/perl/t/results/sectioning/top_without_node_texi2html_no_use_nodes.pl
+++ b/tta/perl/t/results/sectioning/top_without_node_texi2html_no_use_nodes.pl
@@ -14,6 +14,7 @@ $result_tree_text{'top_without_node_texi2html_no_use_nodes'} 
= '*document_root C
  |EXTRA
  |section_childs:EC[E2]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -38,6 +39,7 @@ $result_tree_text{'top_without_node_texi2html_no_use_nodes'} 
= '*document_root C
  |associated_title_command:[E2]
  |is_target:{1}
  |node_directions:D[up->MISSING: (line_arg)[C3]]
+ |node_number:{1}
  |normalized:{second}
   *arguments_line C4
    *line_arg C1
@@ -61,8 +63,9 @@ $result_tree_text{'top_without_node_texi2html_no_use_nodes'} 
= '*document_root C
  |associated_anchor_command:[E1]
  |associated_node:[E1]
  |section_directions:D[up->E0]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E0|up->E0]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/sectioning/transliterated_split_equivalent_nodes.pl 
b/tta/perl/t/results/sectioning/transliterated_split_equivalent_nodes.pl
index 0cdccfdd14..4390482208 100644
--- a/tta/perl/t/results/sectioning/transliterated_split_equivalent_nodes.pl
+++ b/tta/perl/t/results/sectioning/transliterated_split_equivalent_nodes.pl
@@ -21,6 +21,7 @@ NodeForward: [U1]
  |is_target:{1}
  |menus:EC[E1]
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -105,6 +106,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[next->E4|up->E0]
  |node_directions:D[next->E4|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{_00e3}
   *arguments_line C1
    *line_arg C1
@@ -122,6 +124,7 @@ NodeBack: [U0]
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_level:{1}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -156,6 +159,7 @@ NodeBack: [U1]
  |is_target:{1}
  |menu_directions:D[next->E5|prev->E2|up->E0]
  |node_directions:D[next->E5|prev->E2|up->E0]
+ |node_number:{3}
  |normalized:{n}
   *arguments_line C1
    *line_arg C1
@@ -181,6 +185,7 @@ NodeBack: [U2]
  |is_target:{1}
  |menu_directions:D[prev->E4|up->E0]
  |node_directions:D[prev->E4|up->E0]
+ |node_number:{4}
  |normalized:{_00e2}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/two_nodes_at_the_end.pl 
b/tta/perl/t/results/sectioning/two_nodes_at_the_end.pl
index 1f36d6eeb7..1c2c9c1be8 100644
--- a/tta/perl/t/results/sectioning/two_nodes_at_the_end.pl
+++ b/tta/perl/t/results/sectioning/two_nodes_at_the_end.pl
@@ -24,6 +24,7 @@ NodeForward: [U1]
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -40,6 +41,7 @@ NodeForward: [U1]
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -126,6 +128,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter-1}
   *arguments_line C4
    *line_arg C1
@@ -164,8 +167,9 @@ NodeBack: [U0]
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -182,6 +186,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[next->E6|prev->E3|up->E0]
  |node_directions:D[next->E6|prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{node-after-chapter-1}
   *arguments_line C1
    *line_arg C1
@@ -201,6 +206,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[prev->E5|up->E0]
  |node_directions:D[prev->E5|up->E0]
+ |node_number:{4}
  |normalized:{last-node-in-chapter-1}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/two_nodes_at_the_end_nodes.pl 
b/tta/perl/t/results/sectioning/two_nodes_at_the_end_nodes.pl
index 2e08dda179..107ad0e7fe 100644
--- a/tta/perl/t/results/sectioning/two_nodes_at_the_end_nodes.pl
+++ b/tta/perl/t/results/sectioning/two_nodes_at_the_end_nodes.pl
@@ -17,6 +17,7 @@ $result_tree_text{'two_nodes_at_the_end_nodes'} = 
'*document_root C7
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -33,6 +34,7 @@ $result_tree_text{'two_nodes_at_the_end_nodes'} = 
'*document_root C7
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -107,6 +109,7 @@ $result_tree_text{'two_nodes_at_the_end_nodes'} = 
'*document_root C7
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter-1}
   *arguments_line C4
    *line_arg C1
@@ -145,8 +148,9 @@ $result_tree_text{'two_nodes_at_the_end_nodes'} = 
'*document_root C7
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -163,6 +167,7 @@ $result_tree_text{'two_nodes_at_the_end_nodes'} = 
'*document_root C7
  |is_target:{1}
  |menu_directions:D[next->E6|prev->E3|up->E0]
  |node_directions:D[next->E6|prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{node-after-chapter-1}
   *arguments_line C1
    *line_arg C1
@@ -182,6 +187,7 @@ $result_tree_text{'two_nodes_at_the_end_nodes'} = 
'*document_root C7
  |is_target:{1}
  |menu_directions:D[prev->E5|up->E0]
  |node_directions:D[prev->E5|up->E0]
+ |node_number:{4}
  |normalized:{last-node-in-chapter-1}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/two_nodes_at_the_end_texi2html.pl 
b/tta/perl/t/results/sectioning/two_nodes_at_the_end_texi2html.pl
index 0023cbea0b..5c939c3f68 100644
--- a/tta/perl/t/results/sectioning/two_nodes_at_the_end_texi2html.pl
+++ b/tta/perl/t/results/sectioning/two_nodes_at_the_end_texi2html.pl
@@ -17,6 +17,7 @@ $result_tree_text{'two_nodes_at_the_end_texi2html'} = 
'*document_root C7
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -33,6 +34,7 @@ $result_tree_text{'two_nodes_at_the_end_texi2html'} = 
'*document_root C7
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -107,6 +109,7 @@ $result_tree_text{'two_nodes_at_the_end_texi2html'} = 
'*document_root C7
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E5|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter-1}
   *arguments_line C4
    *line_arg C1
@@ -145,8 +148,9 @@ $result_tree_text{'two_nodes_at_the_end_texi2html'} = 
'*document_root C7
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -163,6 +167,7 @@ $result_tree_text{'two_nodes_at_the_end_texi2html'} = 
'*document_root C7
  |is_target:{1}
  |menu_directions:D[next->E6|prev->E3|up->E0]
  |node_directions:D[next->E6|prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{node-after-chapter-1}
   *arguments_line C1
    *line_arg C1
@@ -182,6 +187,7 @@ $result_tree_text{'two_nodes_at_the_end_texi2html'} = 
'*document_root C7
  |is_target:{1}
  |menu_directions:D[prev->E5|up->E0]
  |node_directions:D[prev->E5|up->E0]
+ |node_number:{4}
  |normalized:{last-node-in-chapter-1}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/two_nodes_between_chapters.pl 
b/tta/perl/t/results/sectioning/two_nodes_between_chapters.pl
index 800a519ea9..a3f6255576 100644
--- a/tta/perl/t/results/sectioning/two_nodes_between_chapters.pl
+++ b/tta/perl/t/results/sectioning/two_nodes_between_chapters.pl
@@ -25,6 +25,7 @@ NodeBack: [U1]
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -41,6 +42,7 @@ NodeBack: [U1]
  |associated_node:[E0]
  |section_childs:EC[E4|E7]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -130,6 +132,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E0|prev->E5|up->E0]
+ |node_number:{2}
  |normalized:{chapter-1}
   *arguments_line C4
    *line_arg C1
@@ -168,8 +171,9 @@ NodeBack: [U0]
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E7|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E7|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -186,6 +190,7 @@ NodeBack: [U0]
  |is_target:{1}
  |menu_directions:D[next->E6|prev->E3|up->E0]
  |node_directions:D[next->E6|prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{node-between-chapters}
   *arguments_line C1
    *line_arg C1
@@ -214,6 +219,7 @@ NodeUp: [U0]
  |is_target:{1}
  |menu_directions:D[prev->E5|up->E0]
  |node_directions:D[prev->E3|up->E0]
+ |node_number:{4}
  |normalized:{chapter-2}
   *arguments_line C1
    *line_arg C1
@@ -229,8 +235,9 @@ NodeUp: [U0]
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/two_nodes_between_chapters_nodes.pl 
b/tta/perl/t/results/sectioning/two_nodes_between_chapters_nodes.pl
index 65a7a0c40d..7dc25ae012 100644
--- a/tta/perl/t/results/sectioning/two_nodes_between_chapters_nodes.pl
+++ b/tta/perl/t/results/sectioning/two_nodes_between_chapters_nodes.pl
@@ -17,6 +17,7 @@ $result_tree_text{'two_nodes_between_chapters_nodes'} = 
'*document_root C8
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -33,6 +34,7 @@ $result_tree_text{'two_nodes_between_chapters_nodes'} = 
'*document_root C8
  |associated_node:[E0]
  |section_childs:EC[E4|E7]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -107,6 +109,7 @@ $result_tree_text{'two_nodes_between_chapters_nodes'} = 
'*document_root C8
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E0|prev->E5|up->E0]
+ |node_number:{2}
  |normalized:{chapter-1}
   *arguments_line C4
    *line_arg C1
@@ -145,8 +148,9 @@ $result_tree_text{'two_nodes_between_chapters_nodes'} = 
'*document_root C8
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E7|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E7|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -163,6 +167,7 @@ $result_tree_text{'two_nodes_between_chapters_nodes'} = 
'*document_root C8
  |is_target:{1}
  |menu_directions:D[next->E6|prev->E3|up->E0]
  |node_directions:D[next->E6|prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{node-between-chapters}
   *arguments_line C1
    *line_arg C1
@@ -181,6 +186,7 @@ $result_tree_text{'two_nodes_between_chapters_nodes'} = 
'*document_root C8
  |is_target:{1}
  |menu_directions:D[prev->E5|up->E0]
  |node_directions:D[prev->E3|up->E0]
+ |node_number:{4}
  |normalized:{chapter-2}
   *arguments_line C1
    *line_arg C1
@@ -196,8 +202,9 @@ $result_tree_text{'two_nodes_between_chapters_nodes'} = 
'*document_root C8
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/sectioning/two_nodes_between_chapters_texi2html.pl 
b/tta/perl/t/results/sectioning/two_nodes_between_chapters_texi2html.pl
index 11c46c4a10..77afc89ce3 100644
--- a/tta/perl/t/results/sectioning/two_nodes_between_chapters_texi2html.pl
+++ b/tta/perl/t/results/sectioning/two_nodes_between_chapters_texi2html.pl
@@ -17,6 +17,7 @@ $result_tree_text{'two_nodes_between_chapters_texi2html'} = 
'*document_root C8
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -33,6 +34,7 @@ $result_tree_text{'two_nodes_between_chapters_texi2html'} = 
'*document_root C8
  |associated_node:[E0]
  |section_childs:EC[E4|E7]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -107,6 +109,7 @@ $result_tree_text{'two_nodes_between_chapters_texi2html'} = 
'*document_root C8
  |is_target:{1}
  |menu_directions:D[next->E5|up->E0]
  |node_directions:D[next->E0|prev->E5|up->E0]
+ |node_number:{2}
  |normalized:{chapter-1}
   *arguments_line C4
    *line_arg C1
@@ -145,8 +148,9 @@ $result_tree_text{'two_nodes_between_chapters_texi2html'} = 
'*document_root C8
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[next->E7|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E7|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -163,6 +167,7 @@ $result_tree_text{'two_nodes_between_chapters_texi2html'} = 
'*document_root C8
  |is_target:{1}
  |menu_directions:D[next->E6|prev->E3|up->E0]
  |node_directions:D[next->E6|prev->E3|up->E0]
+ |node_number:{3}
  |normalized:{node-between-chapters}
   *arguments_line C1
    *line_arg C1
@@ -181,6 +186,7 @@ $result_tree_text{'two_nodes_between_chapters_texi2html'} = 
'*document_root C8
  |is_target:{1}
  |menu_directions:D[prev->E5|up->E0]
  |node_directions:D[prev->E3|up->E0]
+ |node_number:{4}
  |normalized:{chapter-2}
   *arguments_line C1
    *line_arg C1
@@ -196,8 +202,9 @@ $result_tree_text{'two_nodes_between_chapters_texi2html'} = 
'*document_root C8
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[prev->E4|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E4|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/two_unnumbered_no_argument.pl 
b/tta/perl/t/results/sectioning/two_unnumbered_no_argument.pl
index a2d2593960..6aa2993339 100644
--- a/tta/perl/t/results/sectioning/two_unnumbered_no_argument.pl
+++ b/tta/perl/t/results/sectioning/two_unnumbered_no_argument.pl
@@ -11,6 +11,7 @@ $result_tree_text{'two_unnumbered_no_argument'} = 
'*document_root C3
  |EXTRA
  |section_directions:D[next->E1]
  |section_level:{1}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -26,6 +27,7 @@ $result_tree_text{'two_unnumbered_no_argument'} = 
'*document_root C3
  |EXTRA
  |section_directions:D[prev->E0]
  |section_level:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E0]
   *arguments_line C1
    *line_arg
diff --git a/tta/perl/t/results/sectioning/unknown_node_direction_novalidate.pl 
b/tta/perl/t/results/sectioning/unknown_node_direction_novalidate.pl
index 5fbd7ce6b6..127816753d 100644
--- a/tta/perl/t/results/sectioning/unknown_node_direction_novalidate.pl
+++ b/tta/perl/t/results/sectioning/unknown_node_direction_novalidate.pl
@@ -15,6 +15,7 @@ $result_tree_text{'unknown_node_direction_novalidate'} = 
'*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{one-arg2}
   *arguments_line C2
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/unknown_node_in_menu.pl 
b/tta/perl/t/results/sectioning/unknown_node_in_menu.pl
index 1cdf623d69..f1930dc828 100644
--- a/tta/perl/t/results/sectioning/unknown_node_in_menu.pl
+++ b/tta/perl/t/results/sectioning/unknown_node_in_menu.pl
@@ -13,6 +13,7 @@ $result_tree_text{'unknown_node_in_menu'} = '*document_root C2
  |EXTRA
  |is_target:{1}
  |menus:EC[E1]
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/unknown_node_in_menu_novalidate.pl 
b/tta/perl/t/results/sectioning/unknown_node_in_menu_novalidate.pl
index 1874608911..d3cd43f002 100644
--- a/tta/perl/t/results/sectioning/unknown_node_in_menu_novalidate.pl
+++ b/tta/perl/t/results/sectioning/unknown_node_in_menu_novalidate.pl
@@ -16,6 +16,7 @@ $result_tree_text{'unknown_node_in_menu_novalidate'} = 
'*document_root C2
  |EXTRA
  |is_target:{1}
  |menus:EC[E1]
+ |node_number:{1}
  |normalized:{first}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/unnumbered_before_node_top_top.pl 
b/tta/perl/t/results/sectioning/unnumbered_before_node_top_top.pl
index 0b14726725..800c91ba58 100644
--- a/tta/perl/t/results/sectioning/unnumbered_before_node_top_top.pl
+++ b/tta/perl/t/results/sectioning/unnumbered_before_node_top_top.pl
@@ -19,6 +19,7 @@ Next: [U1]
  |EXTRA
  |section_directions:D[next->E2]
  |section_level:{1}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -50,6 +51,7 @@ Prev: [U0]
  |associated_section:[E2]
  |associated_title_command:[E2]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -66,6 +68,7 @@ Prev: [U0]
  |associated_node:[E1]
  |section_directions:D[prev->E0]
  |section_level:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E0]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/unnumbered_before_top.pl 
b/tta/perl/t/results/sectioning/unnumbered_before_top.pl
index a9188df122..44f0309527 100644
--- a/tta/perl/t/results/sectioning/unnumbered_before_top.pl
+++ b/tta/perl/t/results/sectioning/unnumbered_before_top.pl
@@ -13,6 +13,7 @@ $result_tree_text{'unnumbered_before_top'} = '*document_root 
C3
  |EXTRA
  |section_directions:D[next->E1]
  |section_level:{1}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -33,6 +34,7 @@ $result_tree_text{'unnumbered_before_top'} = '*document_root 
C3
  |EXTRA
  |section_directions:D[prev->E0]
  |section_level:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E0]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/unnumbered_before_top_node.pl 
b/tta/perl/t/results/sectioning/unnumbered_before_top_node.pl
index 2bbceb518f..1b63cc7741 100644
--- a/tta/perl/t/results/sectioning/unnumbered_before_top_node.pl
+++ b/tta/perl/t/results/sectioning/unnumbered_before_top_node.pl
@@ -14,6 +14,7 @@ This: [U0]
   |{ }
  |EXTRA
  |section_level:{1}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -32,6 +33,7 @@ This: [U0]
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/sectioning/unnumbered_no_argument.pl 
b/tta/perl/t/results/sectioning/unnumbered_no_argument.pl
index fcfafa394b..c82b1ec030 100644
--- a/tta/perl/t/results/sectioning/unnumbered_no_argument.pl
+++ b/tta/perl/t/results/sectioning/unnumbered_no_argument.pl
@@ -9,6 +9,7 @@ $result_tree_text{'unnumbered_no_argument'} = '*document_root C2
  *0 @unnumbered C1 l1
  |EXTRA
  |section_level:{1}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
diff --git a/tta/perl/t/results/sectioning/unnumbered_top_without_node_nodes.pl 
b/tta/perl/t/results/sectioning/unnumbered_top_without_node_nodes.pl
index ad64b25c54..28f60f2592 100644
--- a/tta/perl/t/results/sectioning/unnumbered_top_without_node_nodes.pl
+++ b/tta/perl/t/results/sectioning/unnumbered_top_without_node_nodes.pl
@@ -22,6 +22,7 @@ NodeUp: (dir)
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[up->MISSING: (line_arg)[C3]]
+ |node_number:{1}
  |normalized:{a-node}
   *arguments_line C4
    *line_arg C1
@@ -46,6 +47,7 @@ NodeUp: (dir)
  |associated_node:[E0]
  |section_directions:D[next->E2]
  |section_level:{1}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -69,6 +71,7 @@ NodeUp: (dir)
  |EXTRA
  |section_directions:D[next->E4|prev->E1]
  |section_level:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E4|prev->E1]
   *arguments_line C1
    *line_arg C1
@@ -95,6 +98,7 @@ NodeUp: (dir)
  |associated_title_command:[E4]
  |is_target:{1}
  |node_directions:D[up->MISSING: (line_arg)[C3]]
+ |node_number:{2}
  |normalized:{second}
   *arguments_line C4
    *line_arg C1
@@ -118,8 +122,9 @@ NodeUp: (dir)
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[prev->E2]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{3}
  |toplevel_directions:D[prev->E2|up->E2]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/sectioning/unnumbered_top_without_node_sections.pl 
b/tta/perl/t/results/sectioning/unnumbered_top_without_node_sections.pl
index 3ced89fcaa..c3af282796 100644
--- a/tta/perl/t/results/sectioning/unnumbered_top_without_node_sections.pl
+++ b/tta/perl/t/results/sectioning/unnumbered_top_without_node_sections.pl
@@ -23,6 +23,7 @@ NodeUp: (dir)
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[up->MISSING: (line_arg)[C3]]
+ |node_number:{1}
  |normalized:{a-node}
   *arguments_line C4
    *line_arg C1
@@ -47,6 +48,7 @@ NodeUp: (dir)
  |associated_node:[E0]
  |section_directions:D[next->E2]
  |section_level:{1}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -80,6 +82,7 @@ Prev: [U0]
  |EXTRA
  |section_directions:D[next->E4|prev->E1]
  |section_level:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E4|prev->E1]
   *arguments_line C1
    *line_arg C1
@@ -107,6 +110,7 @@ NodeUp: (dir)
  |associated_title_command:[E4]
  |is_target:{1}
  |node_directions:D[up->MISSING: (line_arg)[C3]]
+ |node_number:{2}
  |normalized:{second}
   *arguments_line C4
    *line_arg C1
@@ -130,8 +134,9 @@ NodeUp: (dir)
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[prev->E2]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{3}
  |toplevel_directions:D[prev->E2|up->E2]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/transformations/index_entries_relate_to_item_no_transformation.pl
 
b/tta/perl/t/results/transformations/index_entries_relate_to_item_no_transformation.pl
index a3f877f12c..c074dba36a 100644
Binary files 
a/tta/perl/t/results/transformations/index_entries_relate_to_item_no_transformation.pl
 and 
b/tta/perl/t/results/transformations/index_entries_relate_to_item_no_transformation.pl
 differ
diff --git 
a/tta/perl/t/results/transformations/index_entries_relate_to_item_transformation.pl
 
b/tta/perl/t/results/transformations/index_entries_relate_to_item_transformation.pl
index 9c34c56341..5577bf032d 100644
Binary files 
a/tta/perl/t/results/transformations/index_entries_relate_to_item_transformation.pl
 and 
b/tta/perl/t/results/transformations/index_entries_relate_to_item_transformation.pl
 differ
diff --git 
a/tta/perl/t/results/transformations/insert_nodes_for_sectioning_commands.pl 
b/tta/perl/t/results/transformations/insert_nodes_for_sectioning_commands.pl
index 929551798c..fb08a76120 100644
--- a/tta/perl/t/results/transformations/insert_nodes_for_sectioning_commands.pl
+++ b/tta/perl/t/results/transformations/insert_nodes_for_sectioning_commands.pl
@@ -14,6 +14,7 @@ $result_tree_text{'insert_nodes_for_sectioning_commands'} = 
'*document_root C22
  |associated_section:[E1]
  |is_target:{1}
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -29,6 +30,7 @@ $result_tree_text{'insert_nodes_for_sectioning_commands'} = 
'*document_root C22
  |associated_node:[E0]
  |section_directions:D[next->E2]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -52,6 +54,7 @@ $result_tree_text{'insert_nodes_for_sectioning_commands'} = 
'*document_root C22
  |section_childs:EC[E4|E18]
  |section_directions:D[prev->E1]
  |section_level:{0}
+ |section_number:{2}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -67,6 +70,7 @@ $result_tree_text{'insert_nodes_for_sectioning_commands'} = 
'*document_root C22
  |associated_section:[E4]
  |is_target:{1}
  |node_directions:D[next->E17|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap_002c-a-chap}
   *arguments_line C1
    *line_arg C4
@@ -89,8 +93,9 @@ $result_tree_text{'insert_nodes_for_sectioning_commands'} = 
'*document_root C22
  |associated_part:[E2]
  |section_childs:EC[E6|E8|E14|E16]
  |section_directions:D[next->E18|up->E2]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{3}
  |toplevel_directions:D[next->E18|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C2
@@ -111,6 +116,7 @@ $result_tree_text{'insert_nodes_for_sectioning_commands'} = 
'*document_root C22
  |associated_title_command:[E6]
  |is_target:{1}
  |node_directions:D[next->E7|up->E3]
+ |node_number:{1}
  |normalized:{a-node}
   *arguments_line C1
    *line_arg C1
@@ -126,8 +132,9 @@ $result_tree_text{'insert_nodes_for_sectioning_commands'} = 
'*document_root C22
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[next->E8|up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{4}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -143,6 +150,7 @@ $result_tree_text{'insert_nodes_for_sectioning_commands'} = 
'*document_root C22
  |associated_section:[E8]
  |is_target:{1}
  |node_directions:D[next->E13|prev->E5|up->E3]
+ |node_number:{4}
  |normalized:{truc}
   *arguments_line C1
    *line_arg C1
@@ -158,8 +166,9 @@ $result_tree_text{'insert_nodes_for_sectioning_commands'} = 
'*document_root C22
  |associated_node:[E7]
  |section_childs:EC[E10|E12]
  |section_directions:D[next->E14|prev->E6|up->E4]
+ |section_heading_number:{1.2}
  |section_level:{2}
- |section_number:{1.2}
+ |section_number:{5}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -174,6 +183,7 @@ $result_tree_text{'insert_nodes_for_sectioning_commands'} = 
'*document_root C22
  |associated_section:[E10]
  |is_target:{1}
  |node_directions:D[next->E11|up->E7]
+ |node_number:{5}
  |normalized:{sub1}
   *arguments_line C1
    *line_arg C1
@@ -188,8 +198,9 @@ $result_tree_text{'insert_nodes_for_sectioning_commands'} = 
'*document_root C22
  |EXTRA
  |associated_node:[E9]
  |section_directions:D[next->E12|up->E8]
+ |section_heading_number:{1.2.1}
  |section_level:{3}
- |section_number:{1.2.1}
+ |section_number:{6}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -208,6 +219,7 @@ $result_tree_text{'insert_nodes_for_sectioning_commands'} = 
'*document_root C22
  |associated_section:[E12]
  |is_target:{1}
  |node_directions:D[prev->E9|up->E7]
+ |node_number:{6}
  |normalized:{sub2}
   *arguments_line C1
    *line_arg C1
@@ -222,8 +234,9 @@ $result_tree_text{'insert_nodes_for_sectioning_commands'} = 
'*document_root C22
  |EXTRA
  |associated_node:[E11]
  |section_directions:D[prev->E10|up->E8]
+ |section_heading_number:{1.2.2}
  |section_level:{3}
- |section_number:{1.2.2}
+ |section_number:{7}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -242,6 +255,7 @@ $result_tree_text{'insert_nodes_for_sectioning_commands'} = 
'*document_root C22
  |associated_section:[E14]
  |is_target:{1}
  |node_directions:D[next->E15|prev->E7|up->E3]
+ |node_number:{7}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -256,8 +270,9 @@ $result_tree_text{'insert_nodes_for_sectioning_commands'} = 
'*document_root C22
  |EXTRA
  |associated_node:[E13]
  |section_directions:D[next->E16|prev->E8|up->E4]
+ |section_heading_number:{1.3}
  |section_level:{2}
- |section_number:{1.3}
+ |section_number:{8}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -273,6 +288,7 @@ $result_tree_text{'insert_nodes_for_sectioning_commands'} = 
'*document_root C22
  |associated_section:[E16]
  |is_target:{1}
  |node_directions:D[prev->E13|up->E3]
+ |node_number:{8}
  |normalized:{section-1}
   *arguments_line C1
    *line_arg C2
@@ -288,8 +304,9 @@ $result_tree_text{'insert_nodes_for_sectioning_commands'} = 
'*document_root C22
  |EXTRA
  |associated_node:[E15]
  |section_directions:D[prev->E14|up->E4]
+ |section_heading_number:{1.4}
  |section_level:{2}
- |section_number:{1.4}
+ |section_number:{9}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -305,6 +322,7 @@ $result_tree_text{'insert_nodes_for_sectioning_commands'} = 
'*document_root C22
  |associated_section:[E18]
  |is_target:{1}
  |node_directions:D[prev->E3|up->E0]
+ |node_number:{9}
  |normalized:{-1}
   *arguments_line C1
    *line_arg C2
@@ -319,6 +337,7 @@ $result_tree_text{'insert_nodes_for_sectioning_commands'} = 
'*document_root C22
  |section_childs:EC[E20]
  |section_directions:D[prev->E4|up->E2]
  |section_level:{1}
+ |section_number:{10}
  |toplevel_directions:D[prev->E4|up->E1]
   *arguments_line C1
    *line_arg
@@ -334,6 +353,7 @@ $result_tree_text{'insert_nodes_for_sectioning_commands'} = 
'*document_root C22
  |associated_section:[E20]
  |is_target:{1}
  |node_directions:D[up->E17]
+ |node_number:{10}
  |normalized:{-2}
   *arguments_line C1
    *line_arg C2
@@ -351,6 +371,7 @@ $result_tree_text{'insert_nodes_for_sectioning_commands'} = 
'*document_root C22
  |associated_node:[E19]
  |section_directions:D[up->E18]
  |section_level:{2}
+ |section_number:{11}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/transformations/master_menu_fr.pl 
b/tta/perl/t/results/transformations/master_menu_fr.pl
index a854f4cf9d..b28ec05ec9 100644
--- a/tta/perl/t/results/transformations/master_menu_fr.pl
+++ b/tta/perl/t/results/transformations/master_menu_fr.pl
@@ -33,6 +33,7 @@ $result_tree_text{'master_menu_fr'} = '*document_root C7
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -49,6 +50,7 @@ $result_tree_text{'master_menu_fr'} = '*document_root C7
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -141,6 +143,7 @@ $result_tree_text{'master_menu_fr'} = '*document_root C7
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -157,8 +160,9 @@ $result_tree_text{'master_menu_fr'} = '*document_root C7
  |associated_node:[E3]
  |section_childs:EC[E7]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -206,6 +210,7 @@ $result_tree_text{'master_menu_fr'} = '*document_root C7
  |is_target:{1}
  |menu_directions:D[up->E3]
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{section}
   *arguments_line C1
    *line_arg C1
@@ -221,8 +226,9 @@ $result_tree_text{'master_menu_fr'} = '*document_root C7
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git 
a/tta/perl/t/results/transformations/regenerate_master_menu_no_need_for_master_menu.pl
 
b/tta/perl/t/results/transformations/regenerate_master_menu_no_need_for_master_menu.pl
index 433588edb8..d1ebf5d976 100644
--- 
a/tta/perl/t/results/transformations/regenerate_master_menu_no_need_for_master_menu.pl
+++ 
b/tta/perl/t/results/transformations/regenerate_master_menu_no_need_for_master_menu.pl
@@ -16,6 +16,7 @@ 
$result_tree_text{'regenerate_master_menu_no_need_for_master_menu'} = '*document
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ 
$result_tree_text{'regenerate_master_menu_no_need_for_master_menu'} = '*document
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -84,6 +86,7 @@ 
$result_tree_text{'regenerate_master_menu_no_need_for_master_menu'} = '*document
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -99,8 +102,9 @@ 
$result_tree_text{'regenerate_master_menu_no_need_for_master_menu'} = '*document
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git 
a/tta/perl/t/results/transformations/regenerate_master_menu_with_menu_comment.pl
 
b/tta/perl/t/results/transformations/regenerate_master_menu_with_menu_comment.pl
index 0b837d1870..4ac4d62427 100644
--- 
a/tta/perl/t/results/transformations/regenerate_master_menu_with_menu_comment.pl
+++ 
b/tta/perl/t/results/transformations/regenerate_master_menu_with_menu_comment.pl
@@ -16,6 +16,7 @@ $result_tree_text{'regenerate_master_menu_with_menu_comment'} 
= '*document_root
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'regenerate_master_menu_with_menu_comment'} 
= '*document_root
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -125,6 +127,7 @@ 
$result_tree_text{'regenerate_master_menu_with_menu_comment'} = '*document_root
  |is_target:{1}
  |menu_directions:D[up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -141,8 +144,9 @@ 
$result_tree_text{'regenerate_master_menu_with_menu_comment'} = '*document_root
  |associated_node:[E3]
  |section_childs:EC[E6]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -160,6 +164,7 @@ 
$result_tree_text{'regenerate_master_menu_with_menu_comment'} = '*document_root
  |associated_title_command:[E6]
  |is_target:{1}
  |node_directions:D[up->E3]
+ |node_number:{3}
  |normalized:{sec}
   *arguments_line C1
    *line_arg C1
@@ -175,8 +180,9 @@ 
$result_tree_text{'regenerate_master_menu_with_menu_comment'} = '*document_root
  |associated_anchor_command:[E5]
  |associated_node:[E5]
  |section_directions:D[up->E4]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
diff --git a/tta/perl/t/results/value/value_in_index_commands.pl 
b/tta/perl/t/results/value/value_in_index_commands.pl
index 747f5fd6af..0111bcc80c 100644
--- a/tta/perl/t/results/value/value_in_index_commands.pl
+++ b/tta/perl/t/results/value/value_in_index_commands.pl
@@ -136,6 +136,7 @@ $result_tree_text{'value_in_index_commands'} = 
'*document_root C3
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->E1]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -151,6 +152,7 @@ $result_tree_text{'value_in_index_commands'} = 
'*document_root C3
  |is_target:{1}
  |isindex:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/value/value_in_misc_commands.pl 
b/tta/perl/t/results/value/value_in_misc_commands.pl
index 50b3d85d7a..cb0d9251eb 100644
--- a/tta/perl/t/results/value/value_in_misc_commands.pl
+++ b/tta/perl/t/results/value/value_in_misc_commands.pl
@@ -21,6 +21,7 @@ $result_tree_text{'value_in_misc_commands'} = '*document_root 
C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -36,6 +37,7 @@ $result_tree_text{'value_in_misc_commands'} = '*document_root 
C5
  |associated_anchor_command:[E0]
  |associated_node:[E0]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -62,6 +64,7 @@ $result_tree_text{'value_in_misc_commands'} = '*document_root 
C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0]
+ |node_number:{2}
  |normalized:{chap}
  >SOURCEMARKS
  >value_expansion<end;43>
@@ -79,6 +82,7 @@ $result_tree_text{'value_in_misc_commands'} = '*document_root 
C5
   |EXTRA
   |associated_anchor_command:[E2]
   |global_command_number:{1}
+  |heading_number:{1}
    *line_arg C1
    |INFO
    |spaces_after_argument:
diff --git a/tta/perl/t/results/value/value_in_node.pl 
b/tta/perl/t/results/value/value_in_node.pl
index 1b20886d33..42d8d8b117 100644
--- a/tta/perl/t/results/value/value_in_node.pl
+++ b/tta/perl/t/results/value/value_in_node.pl
@@ -22,6 +22,7 @@ $result_tree_text{'value_in_node'} = '*document_root C6
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->MISSING: (line_arg)[C3]|prev->MISSING: 
(line_arg)[C3]|up->MISSING: (line_arg)[C3]]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C4
    *line_arg C1
@@ -64,6 +65,7 @@ $result_tree_text{'value_in_node'} = '*document_root C6
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -129,6 +131,7 @@ $result_tree_text{'value_in_node'} = '*document_root C6
  |menu_directions:D[up->E0]
  |menus:EC[E5]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{Node-1}
   *arguments_line C4
    *line_arg C1
@@ -162,8 +165,9 @@ $result_tree_text{'value_in_node'} = '*document_root C6
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -221,6 +225,7 @@ $result_tree_text{'value_in_node'} = '*document_root C6
  |is_target:{1}
  |menu_directions:D[up->E3]
  |node_directions:D[prev->E3|up->E3]
+ |node_number:{3}
  |normalized:{Section-1_002e1}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/value/value_node_directions.pl 
b/tta/perl/t/results/value/value_node_directions.pl
index 64bbfba6ee..19c1208e70 100644
--- a/tta/perl/t/results/value/value_node_directions.pl
+++ b/tta/perl/t/results/value/value_node_directions.pl
@@ -21,6 +21,7 @@ $result_tree_text{'value_node_directions'} = '*document_root 
C7
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2|prev->MISSING: (line_arg)[C3]|up->MISSING: 
(line_arg)[C3]]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C4
    *line_arg C1
@@ -69,6 +70,7 @@ $result_tree_text{'value_node_directions'} = '*document_root 
C7
  |associated_node:[E0]
  |section_childs:EC[E3|E5]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -110,6 +112,7 @@ $result_tree_text{'value_node_directions'} = 
'*document_root C7
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E4|prev->E0|up->MISSING: (line_arg)[C3]]
+ |node_number:{2}
  |normalized:{bar}
   *arguments_line C4
    *line_arg C1
@@ -151,8 +154,9 @@ $result_tree_text{'value_node_directions'} = 
'*document_root C7
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[next->E5|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E5|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -170,6 +174,7 @@ $result_tree_text{'value_node_directions'} = 
'*document_root C7
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[prev->E2|up->MISSING: (line_arg)[C3]]
+ |node_number:{3}
  |normalized:{BarFoo}
   *arguments_line C4
    *line_arg C1
@@ -212,8 +217,9 @@ $result_tree_text{'value_node_directions'} = 
'*document_root C7
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{3}
  |toplevel_directions:D[prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/xml_tests/commands_and_spaces.pl 
b/tta/perl/t/results/xml_tests/commands_and_spaces.pl
index b215c9cacc..4b3b57bbdb 100644
--- a/tta/perl/t/results/xml_tests/commands_and_spaces.pl
+++ b/tta/perl/t/results/xml_tests/commands_and_spaces.pl
@@ -43,6 +43,7 @@ $result_tree_text{'commands_and_spaces'} = '*document_root C2
  |EXTRA
  |is_target:{1}
  |node_directions:D[next->MISSING: (line_arg)[C3]|prev->MISSING: 
(line_arg)[C3]|up->MISSING: (line_arg)[C3]]
+ |node_number:{1}
  |normalized:{a}
   *arguments_line C4
    *line_arg C1
diff --git a/tta/perl/t/results/xml_tests/image_inline_or_not.pl 
b/tta/perl/t/results/xml_tests/image_inline_or_not.pl
index cdfbf843b5..8e21018b39 100644
--- a/tta/perl/t/results/xml_tests/image_inline_or_not.pl
+++ b/tta/perl/t/results/xml_tests/image_inline_or_not.pl
@@ -32,6 +32,7 @@ $result_tree_text{'image_inline_or_not'} = '*document_root C5
  |is_target:{1}
  |menus:EC[E2]
  |node_directions:D[next->E3]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -48,6 +49,7 @@ $result_tree_text{'image_inline_or_not'} = '*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E4]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -287,6 +289,7 @@ $result_tree_text{'image_inline_or_not'} = '*document_root 
C5
  |is_target:{1}
  |menu_directions:D[next->MISSING: (menu_entry_node)[C4]|up->E0]
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{node_005fimage}
   *arguments_line C1
    *line_arg C1
@@ -306,8 +309,9 @@ $result_tree_text{'image_inline_or_not'} = '*document_root 
C5
  |associated_anchor_command:[E3]
  |associated_node:[E3]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/xml_tests/sectioning_test_no_use_nodes.pl 
b/tta/perl/t/results/xml_tests/sectioning_test_no_use_nodes.pl
index fdfce6c558..14ae796694 100644
--- a/tta/perl/t/results/xml_tests/sectioning_test_no_use_nodes.pl
+++ b/tta/perl/t/results/xml_tests/sectioning_test_no_use_nodes.pl
@@ -15,6 +15,7 @@ $result_tree_text{'sectioning_test_no_use_nodes'} = 
'*document_root C9
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'sectioning_test_no_use_nodes'} = 
'*document_root C9
  |associated_node:[E0]
  |section_childs:EC[E3|E7]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -56,6 +58,7 @@ $result_tree_text{'sectioning_test_no_use_nodes'} = 
'*document_root C9
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E6|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -72,8 +75,9 @@ $result_tree_text{'sectioning_test_no_use_nodes'} = 
'*document_root C9
  |associated_node:[E2]
  |section_childs:EC[E5]
  |section_directions:D[next->E7|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E7|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -94,6 +98,7 @@ $result_tree_text{'sectioning_test_no_use_nodes'} = 
'*document_root C9
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[up->E2]
+ |node_number:{3}
  |normalized:{sec}
   *arguments_line C1
    *line_arg C1
@@ -109,8 +114,9 @@ $result_tree_text{'sectioning_test_no_use_nodes'} = 
'*document_root C9
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[up->E3]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -130,6 +136,7 @@ $result_tree_text{'sectioning_test_no_use_nodes'} = 
'*document_root C9
  |associated_title_command:[E7]
  |is_target:{1}
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{4}
  |normalized:{chap2}
   *arguments_line C1
    *line_arg C1
@@ -145,8 +152,9 @@ $result_tree_text{'sectioning_test_no_use_nodes'} = 
'*document_root C9
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{4}
  |toplevel_directions:D[prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/xml_tests/sectioning_test_ref.pl 
b/tta/perl/t/results/xml_tests/sectioning_test_ref.pl
index 11c7c9d94e..0c2da25fc7 100644
--- a/tta/perl/t/results/xml_tests/sectioning_test_ref.pl
+++ b/tta/perl/t/results/xml_tests/sectioning_test_ref.pl
@@ -15,6 +15,7 @@ $result_tree_text{'sectioning_test_ref'} = '*document_root C9
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'sectioning_test_ref'} = '*document_root C9
  |associated_node:[E0]
  |section_childs:EC[E3|E7]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -56,6 +58,7 @@ $result_tree_text{'sectioning_test_ref'} = '*document_root C9
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[next->E6|prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -72,8 +75,9 @@ $result_tree_text{'sectioning_test_ref'} = '*document_root C9
  |associated_node:[E2]
  |section_childs:EC[E5]
  |section_directions:D[next->E7|up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[next->E7|prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
@@ -94,6 +98,7 @@ $result_tree_text{'sectioning_test_ref'} = '*document_root C9
  |associated_title_command:[E5]
  |is_target:{1}
  |node_directions:D[up->E2]
+ |node_number:{3}
  |normalized:{sec}
   *arguments_line C1
    *line_arg C1
@@ -109,8 +114,9 @@ $result_tree_text{'sectioning_test_ref'} = '*document_root 
C9
  |associated_anchor_command:[E4]
  |associated_node:[E4]
  |section_directions:D[up->E3]
+ |section_heading_number:{1.1}
  |section_level:{2}
- |section_number:{1.1}
+ |section_number:{3}
   *arguments_line C1
    *line_arg C1
    |INFO
@@ -130,6 +136,7 @@ $result_tree_text{'sectioning_test_ref'} = '*document_root 
C9
  |associated_title_command:[E7]
  |is_target:{1}
  |node_directions:D[prev->E2|up->E0]
+ |node_number:{4}
  |normalized:{chap2}
   *arguments_line C1
    *line_arg C1
@@ -145,8 +152,9 @@ $result_tree_text{'sectioning_test_ref'} = '*document_root 
C9
  |associated_anchor_command:[E6]
  |associated_node:[E6]
  |section_directions:D[prev->E3|up->E1]
+ |section_heading_number:{2}
  |section_level:{1}
- |section_number:{2}
+ |section_number:{4}
  |toplevel_directions:D[prev->E3|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/xml_tests/top_node_and_bye.pl 
b/tta/perl/t/results/xml_tests/top_node_and_bye.pl
index 3768654150..6ffbcdc095 100644
--- a/tta/perl/t/results/xml_tests/top_node_and_bye.pl
+++ b/tta/perl/t/results/xml_tests/top_node_and_bye.pl
@@ -14,6 +14,7 @@ This: [U0]
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/xml_tests/top_node_no_section.pl 
b/tta/perl/t/results/xml_tests/top_node_no_section.pl
index f64f499086..cc33a4fc4b 100644
--- a/tta/perl/t/results/xml_tests/top_node_no_section.pl
+++ b/tta/perl/t/results/xml_tests/top_node_no_section.pl
@@ -12,6 +12,7 @@ $result_tree_text{'top_node_no_section'} = '*document_root C2
   |{ }
  |EXTRA
  |is_target:{1}
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/xtable/block_commands_in_table.pl 
b/tta/perl/t/results/xtable/block_commands_in_table.pl
index 7395f25924..64d1a79acf 100644
--- a/tta/perl/t/results/xtable/block_commands_in_table.pl
+++ b/tta/perl/t/results/xtable/block_commands_in_table.pl
@@ -15,6 +15,7 @@ $result_tree_text{'block_commands_in_table'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -31,6 +32,7 @@ $result_tree_text{'block_commands_in_table'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -53,6 +55,7 @@ $result_tree_text{'block_commands_in_table'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -68,8 +71,9 @@ $result_tree_text{'block_commands_in_table'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/xtable/inter_item_commands_in_table.pl 
b/tta/perl/t/results/xtable/inter_item_commands_in_table.pl
index a8aa4c8259..7740cc29bf 100644
--- a/tta/perl/t/results/xtable/inter_item_commands_in_table.pl
+++ b/tta/perl/t/results/xtable/inter_item_commands_in_table.pl
@@ -16,6 +16,7 @@ $result_tree_text{'inter_item_commands_in_table'} = 
'*document_root C5
  |associated_title_command:[E1]
  |is_target:{1}
  |node_directions:D[next->E2]
+ |node_number:{1}
  |normalized:{Top}
   *arguments_line C1
    *line_arg C1
@@ -32,6 +33,7 @@ $result_tree_text{'inter_item_commands_in_table'} = 
'*document_root C5
  |associated_node:[E0]
  |section_childs:EC[E3]
  |section_level:{0}
+ |section_number:{1}
  |sectioning_root:
   |*
   ||EXTRA
@@ -54,6 +56,7 @@ $result_tree_text{'inter_item_commands_in_table'} = 
'*document_root C5
  |associated_title_command:[E3]
  |is_target:{1}
  |node_directions:D[prev->E0|up->E0]
+ |node_number:{2}
  |normalized:{chapter}
   *arguments_line C1
    *line_arg C1
@@ -69,8 +72,9 @@ $result_tree_text{'inter_item_commands_in_table'} = 
'*document_root C5
  |associated_anchor_command:[E2]
  |associated_node:[E2]
  |section_directions:D[up->E1]
+ |section_heading_number:{1}
  |section_level:{1}
- |section_number:{1}
+ |section_number:{2}
  |toplevel_directions:D[prev->E1|up->E1]
   *arguments_line C1
    *line_arg C1
diff --git a/tta/perl/t/results/xtable/item_index_transformation.pl 
b/tta/perl/t/results/xtable/item_index_transformation.pl
index c6945be379..51cfa1e42b 100644
--- a/tta/perl/t/results/xtable/item_index_transformation.pl
+++ b/tta/perl/t/results/xtable/item_index_transformation.pl
@@ -14,6 +14,7 @@ $result_tree_text{'item_index_transformation'} = 
'*document_root C3
  |associated_section:[E1]
  |associated_title_command:[E1]
  |is_target:{1}
+ |node_number:{1}
  |normalized:{chap}
   *arguments_line C1
    *line_arg C1
@@ -28,6 +29,7 @@ $result_tree_text{'item_index_transformation'} = 
'*document_root C3
  |EXTRA
  |associated_anchor_command:[E0]
  |associated_node:[E0]
+ |section_heading_number:{1}
  |section_level:{1}
  |section_number:{1}
  |sectioning_root:
diff --git a/tta/perl/t/z_misc/no_structure_test.t 
b/tta/perl/t/z_misc/no_structure_test.t
index 78dcdc9fd0..8bdff1d996 100644
--- a/tta/perl/t/z_misc/no_structure_test.t
+++ b/tta/perl/t/z_misc/no_structure_test.t
@@ -147,7 +147,6 @@ my $html_converter = Texinfo::Convert::HTML->converter(
                          'SUBDIR' => $html_test_out_dir,
                          'SPLIT' => ''});
 
-# Note that there are no contents, as there is no sections_list
 _do_format_test_file($test_name, $format, $html_converter, $document,
                       $html_test_out_dir, $html_reference_dir);
 
@@ -190,6 +189,7 @@ my $latex_converter = Texinfo::Convert::LaTeX->converter();
 my $latex_text = $latex_converter->convert($document);
 is($latex_text, '
 \begin{document}
+\tableofcontents\newpage
 \part*{{First File}}
 \label{anchor:Top}%
 \chapter{{Chap}}



reply via email to

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