texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: * p/Texinfo/Common.pm, tp/Texinfo/Config.pm, tp/T


From: Patrice Dumas
Subject: branch master updated: * p/Texinfo/Common.pm, tp/Texinfo/Config.pm, tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/TexinfoXML.pm, tp/Texinfo/ParserNonXS.pm, tp/Texinfo/XS/parsetexi/Parsetexi.pm: use cleaner ref($var) eq '' instead of ! ref($var).
Date: Sun, 02 Jan 2022 19:30:54 -0500

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

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 25bb784426 * p/Texinfo/Common.pm, tp/Texinfo/Config.pm, 
tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/TexinfoXML.pm, 
tp/Texinfo/ParserNonXS.pm, tp/Texinfo/XS/parsetexi/Parsetexi.pm: use cleaner 
ref($var) eq '' instead of ! ref($var).
25bb784426 is described below

commit 25bb784426469ae4986c65f392398eaf37b2fcb1
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Jan 3 01:30:40 2022 +0100

    * p/Texinfo/Common.pm, tp/Texinfo/Config.pm,
    tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/TexinfoXML.pm,
    tp/Texinfo/ParserNonXS.pm, tp/Texinfo/XS/parsetexi/Parsetexi.pm:
    use cleaner ref($var) eq '' instead of ! ref($var).
    
    * tp/Texinfo/Structuring.pm (sectioning_structure)
    (section_level_adjusted_command_name, split_pages)
    (elements_directions),
    tp/Texinfo/Convert/DocBook.pm (_docbook_section_element, _convert),
    tp/Texinfo/Convert/HTML.pm (command_text, _convert_heading_command)
    (_prepare_tree_units_global_targets, _default_format_contents),
    tp/Texinfo/Convert/LaTeX.pm (_convert),
    tp/Texinfo/Convert/Plaintext.pm (format_contents, _convert),
    tp/Texinfo/Convert/Text.pm (heading), tp/Texinfo/Convert/Utils.pm
    (numbered_heading), tp/init/book.pm, tp/init/chm.pm, tp/init/epub3.pm:
    replace section element level by section_level and number by
    section_number in structure.
---
 ChangeLog                                          |  20 ++
 tp/Texinfo/Common.pm                               |   6 +-
 tp/Texinfo/Config.pm                               |   2 +-
 tp/Texinfo/Convert/DocBook.pm                      |   6 +-
 tp/Texinfo/Convert/HTML.pm                         |  53 ++---
 tp/Texinfo/Convert/LaTeX.pm                        |   2 +-
 tp/Texinfo/Convert/Plaintext.pm                    |  21 +-
 tp/Texinfo/Convert/TexinfoXML.pm                   |   2 +-
 tp/Texinfo/Convert/Text.pm                         |   4 +-
 tp/Texinfo/Convert/Utils.pm                        |   8 +-
 tp/Texinfo/ParserNonXS.pm                          |   6 +-
 tp/Texinfo/Structuring.pm                          |  88 ++++----
 tp/Texinfo/XS/parsetexi/Parsetexi.pm               |   2 +-
 tp/init/book.pm                                    |  12 +-
 tp/init/chm.pm                                     |  11 +-
 tp/init/epub3.pm                                   |  11 +-
 tp/t/results/converters_tests/ref_in_sectioning.pl |  72 +++----
 tp/t/results/converters_tests/refs_formatting.pl   |  12 +-
 .../some_at_commands_in_ref_nodes.pl               |  16 +-
 .../converters_tests/test_deftypefnnewline.pl      |  16 +-
 .../converters_tests/things_before_setfilename.pl  |   8 +-
 .../coverage/punctuation_in_line_commands.pl       |  10 +-
 tp/t/results/coverage_braces/footnote_no_node.pl   |   6 +-
 .../coverage_braces/two_footnotes_in_nodes.pl      |  16 +-
 .../two_footnotes_in_nodes_separate.pl             |  16 +-
 .../docbook_tests/multiple_documentlanguage.pl     |  32 +--
 .../docbook_tests/special_docbook_unnumbered.pl    |  28 +--
 tp/t/results/float/complex_float.pl                |  22 +-
 tp/t/results/float/float_copying.pl                |  16 +-
 .../float/numbering_captions_listoffloats.pl       |  80 ++++----
 tp/t/results/formats_encodings/accent.pl           |   8 +-
 .../formats_encodings/accent_enable_encoding.pl    |   8 +-
 tp/t/results/formats_encodings/accentenc.pl        |   8 +-
 .../formats_encodings/accentenc_enable_encoding.pl |   8 +-
 .../formats_encodings/at_commands_in_refs.pl       | 224 ++++++++++-----------
 .../at_commands_in_refs_latin1.pl                  | 224 ++++++++++-----------
 .../formats_encodings/at_commands_in_refs_utf8.pl  | 224 ++++++++++-----------
 .../char_latin1_latin1_in_refs.pl                  |  48 ++---
 .../formats_encodings/char_latin1_utf8_in_refs.pl  |  48 ++---
 .../char_latin2_latin2_in_refs.pl                  |  16 +-
 .../formats_encodings/japanese_shift_jis.pl        |  24 +--
 tp/t/results/formats_encodings/sample_utf8.pl      |  28 +--
 tp/t/results/formats_encodings/weird_accents.pl    |   8 +-
 .../weird_accents_disable_encoding.pl              |   8 +-
 .../formatting/direntry_dircategory_info_split.pl  |  16 +-
 .../formatting/documentlanguage_set_option.pl      |   8 +-
 .../formatting/documentlanguage_set_option_info.pl |   8 +-
 .../formatting/documentlanguage_set_unknown.pl     |   8 +-
 tp/t/results/formatting/float_copying.pl           |  16 +-
 tp/t/results/formatting/split_nocopying.pl         |  16 +-
 tp/t/results/formatting/split_nocopying_split.pl   |  16 +-
 tp/t/results/formatting/texi_bib_example.pl        |  24 +--
 tp/t/results/formatting/texi_glossary.pl           |  16 +-
 .../character_number_leading_toc_stoc.pl           |  14 +-
 tp/t/results/html_tests/check_htmlxref.pl          |   8 +-
 .../deftypefnnewline_for_copying_after.pl          |   8 +-
 .../deftypefnnewline_for_copying_before.pl         |   8 +-
 tp/t/results/html_tests/documentdescription.pl     |   6 +-
 .../empty_lines_at_beginning_no_setfilename.pl     |   8 +-
 .../html_tests/footnotestyle_separate_late.pl      |  24 +--
 tp/t/results/html_tests/html_in_copying.pl         |   8 +-
 .../results/html_tests/index_and_node_same_name.pl |   6 +-
 tp/t/results/html_tests/index_below.pl             |  24 +--
 tp/t/results/html_tests/redirection_same_labels.pl |  44 ++--
 tp/t/results/html_tests/shortcontents_no_top.pl    |  16 +-
 tp/t/results/html_tests/simple_menu.pl             |   8 +-
 .../html_tests/test_xrefautomaticsectiontitle.pl   |  16 +-
 .../test_xrefautomaticsectiontitle_off_first.pl    |  16 +-
 .../text_before_top_and_contents_after_title.pl    |  12 +-
 ...t_before_top_and_summarycontents_after_title.pl |  12 +-
 tp/t/results/html_tests/titles.pl                  |   8 +-
 tp/t/results/htmlxref/htmlxref.pl                  |  16 +-
 tp/t/results/htmlxref/htmlxref_nodes.pl            |  16 +-
 tp/t/results/htmlxref/htmlxref_only_mono.pl        |  16 +-
 tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl  |  16 +-
 tp/t/results/htmlxref/htmlxref_only_split.pl       |  16 +-
 tp/t/results/htmlxref/htmlxref_only_split_nodes.pl |  16 +-
 .../macro_and_commands_in_early_commands.pl        |   8 +-
 tp/t/results/include/macro_in_early_commands.pl    |   8 +-
 tp/t/results/indices/def_syn_indices.pl            |  16 +-
 tp/t/results/indices/double_seeentry_seealso.pl    |  16 +-
 tp/t/results/indices/encoding_index_ascii.pl       |   8 +-
 .../encoding_index_ascii_enable_encoding.pl        |   8 +-
 tp/t/results/indices/encoding_index_latin1.pl      |   8 +-
 .../encoding_index_latin1_enable_encoding.pl       |   8 +-
 tp/t/results/indices/encoding_index_utf8.pl        |   8 +-
 .../indices/encoding_index_utf8_enable_encoding.pl |   8 +-
 tp/t/results/indices/explicit_sort_key.pl          |   8 +-
 .../indices/printindex_index_entry_in_copying.pl   |  16 +-
 ...rintindex_index_entry_in_copying_in_footnote.pl |  16 +-
 ...ndex_index_entry_in_copying_no_insertcopying.pl |  16 +-
 .../indices/same_index_entry_merged_indices.pl     |   8 +-
 tp/t/results/indices/seeentry.pl                   |  16 +-
 tp/t/results/indices/subentries.pl                 |  16 +-
 tp/t/results/indices/subentry_and_sortas.pl        |  16 +-
 tp/t/results/indices/syncode_index_print_both.pl   |  16 +-
 tp/t/results/indices/transparent_sort_chars.pl     |   8 +-
 tp/t/results/indices/w_lines_count.pl              |   8 +-
 tp/t/results/info_tests/anchor_and_spaces.pl       |   8 +-
 tp/t/results/info_tests/before_node_and_section.pl |  16 +-
 tp/t/results/info_tests/def_in_copying.pl          |   8 +-
 .../direntry_dircategory_and_commands.pl           |   8 +-
 tp/t/results/info_tests/index_entry_at_end_node.pl |  24 +--
 tp/t/results/info_tests/no_node_but_top.pl         |   6 +-
 .../info_tests/paragraphindent_and_preamble.pl     |   8 +-
 tp/t/results/info_tests/space_in_menu.pl           |  16 +-
 tp/t/results/info_tests/split_no_copying.pl        |  16 +-
 .../info_tests/split_test_before_first_node.pl     |  16 +-
 .../split_test_before_first_node_no_empty_line.pl  |  16 +-
 tp/t/results/info_tests/test_index.pl              |  42 ++--
 tp/t/results/info_tests/text_before_node.pl        |  16 +-
 .../invalid_nestings/node_in_copying_not_closed.pl |   8 +-
 tp/t/results/invalid_nestings/on_section_line.pl   |   8 +-
 .../results/invalid_nestings/section_in_copying.pl |   8 +-
 .../invalid_nestings/section_in_flushright.pl      |   8 +-
 .../invalid_nestings/section_in_footnote.pl        |   8 +-
 tp/t/results/invalid_nestings/section_in_math.pl   |  12 +-
 .../section_in_nested_block_commands.pl            |   8 +-
 tp/t/results/invalid_nestings/section_in_table.pl  |   8 +-
 .../invalid_nestings/section_on_def_line.pl        |   8 +-
 .../invalid_nestings/section_on_defx_line.pl       |   8 +-
 .../section_on_index_entry_line.pl                 |   8 +-
 .../style_not_closed_no_newline_root_commands.pl   |  16 +-
 .../style_not_closed_root_commands.pl              |  16 +-
 .../unclosed_verb_on_section_line.pl               |   8 +-
 .../itemize/inter_item_commands_in_enumerate.pl    |  16 +-
 .../itemize/inter_item_commands_in_itemize.pl      |  16 +-
 tp/t/results/languages/appendix_translated.pl      |  12 +-
 tp/t/results/languages/command_translated.pl       |   8 +-
 tp/t/results/languages/multiple_lang_chapters.pl   |  48 ++---
 .../languages/multiple_lang_chapters_latex.pl      |  48 ++---
 .../languages/multiple_lang_chapters_texi2html.pl  |  48 ++---
 tp/t/results/languages/unknown_language.pl         |   8 +-
 .../anchor_links_xref_xrefautomaticsectiontitle.pl |  16 +-
 tp/t/results/latex_tests/custom_headings.pl        |  28 +--
 tp/t/results/latex_tests/float_and_refs.pl         |  28 +--
 tp/t/results/latex_tests/fonttextsize.pl           |  36 ++--
 tp/t/results/latex_tests/indices.pl                |  16 +-
 .../informative_commands_in_top_node.pl            |  16 +-
 tp/t/results/latex_tests/pagesizes.pl              |  20 +-
 tp/t/results/latex_tests/pagetype.pl               |  20 +-
 tp/t/results/latex_tests/settitle_and_headings.pl  |   8 +-
 tp/t/results/latex_tests/shorttitlepage.pl         |  16 +-
 tp/t/results/latex_tests/titlepage_classical.pl    |  16 +-
 tp/t/results/latex_tests/titlepage_in_top_node.pl  |  16 +-
 tp/t/results/latex_tests/titlepage_long_title.pl   |  16 +-
 tp/t/results/latex_tests/titlepage_no_author.pl    |  16 +-
 tp/t/results/latex_tests/titlepage_no_title.pl     |  16 +-
 .../titlepage_with_commands_classical.pl           |  16 +-
 tp/t/results/layout/navigation.pl                  |  32 +--
 tp/t/results/layout/navigation_chapter.pl          |  32 +--
 .../results/layout/navigation_chapter_no_header.pl |  32 +--
 .../navigation_chapter_no_header_vertical.pl       |  32 +--
 tp/t/results/layout/navigation_chapter_vertical.pl |  32 +--
 tp/t/results/layout/navigation_no_header.pl        |  32 +--
 .../layout/navigation_no_header_vertical.pl        |  32 +--
 tp/t/results/layout/navigation_node.pl             |  32 +--
 tp/t/results/layout/navigation_node_no_header.pl   |  32 +--
 .../layout/navigation_node_no_header_vertical.pl   |  32 +--
 tp/t/results/layout/navigation_node_vertical.pl    |  32 +--
 tp/t/results/layout/navigation_section.pl          |  32 +--
 .../results/layout/navigation_section_no_header.pl |  32 +--
 .../navigation_section_no_header_vertical.pl       |  32 +--
 tp/t/results/layout/navigation_section_vertical.pl |  32 +--
 tp/t/results/layout/navigation_vertical.pl         |  32 +--
 tp/t/results/layout/no_monolithic.pl               |  16 +-
 tp/t/results/macro/macro_in_misc_commands.pl       |  16 +-
 .../menu/block_commands_in_menu_description.pl     |   8 +-
 tp/t/results/menu/comment_on_menu_line.pl          |  12 +-
 tp/t/results/menu/detailmenu_on_subnodes.pl        |  44 ++--
 .../menu/direntry_dircategory_after_first_node.pl  |   8 +-
 tp/t/results/menu/example_in_menu_description.pl   |   8 +-
 tp/t/results/menu/inlineraw_in_menu_description.pl |   8 +-
 tp/t/results/menu/menu_pointing_to_anchor.pl       |   8 +-
 tp/t/results/menu/verb_in_menu_description.pl      |   8 +-
 .../codequoteundirected_codequotebacktick.pl       |   8 +-
 .../misc_commands/comment_space_command_on_line.pl |  10 +-
 .../no_empty_line_between_headings.pl              |  14 +-
 .../misc_commands/text_before_line_command.pl      |  12 +-
 tp/t/results/morecoverage/formatting_fr.pl         |  36 ++--
 tp/t/results/morecoverage/texi_formatting.pl       |  36 ++--
 tp/t/results/moreindices/index_no_node.pl          |  18 +-
 tp/t/results/moreindices/index_split.pl            |  64 +++---
 tp/t/results/moreindices/index_split_nodes.pl      |  64 +++---
 .../nodes_before_top_and_sections_monolithic.pl    |  12 +-
 tp/t/results/moreindices/split_chapter_index.pl    |  32 +--
 .../moresectioning/more_sections_than_nodes.pl     |  72 +++----
 tp/t/results/moresectioning/node_footnote_end.pl   |  12 +-
 .../moresectioning/node_footnote_separated.pl      |  12 +-
 .../moresectioning/node_footnote_use_node.pl       |  12 +-
 .../nodes_after_top_before_chapter.pl              |  12 +-
 ...s_after_top_before_chapter_use_nodes_chapter.pl |  12 +-
 .../nodes_after_top_before_section.pl              |  12 +-
 .../nodes_after_top_before_section_use_nodes.pl    |  12 +-
 ...s_after_top_before_section_use_nodes_chapter.pl |  12 +-
 .../moresectioning/placed_things_before_element.pl |   8 +-
 tp/t/results/moresectioning/sectioning_frames.pl   |  58 +++---
 .../results/moresectioning/top_node_up_explicit.pl |  16 +-
 .../results/moresectioning/top_node_up_implicit.pl |  16 +-
 .../moresectioning/two_footnotes_in_nodes.pl       |  16 +-
 .../two_footnotes_in_nodes_separated.pl            |  16 +-
 tp/t/results/plaintext_tests/japanese_utf8.pl      |  24 +--
 .../plaintext_tests/no_empty_line_after_section.pl |  18 +-
 tp/t/results/plaintext_tests/quote_node_names.pl   |  40 ++--
 .../plaintext_tests/settitle_and_empty_top.pl      |   6 +-
 tp/t/results/regions/anchor_in_titlepage.pl        |   6 +-
 .../regions/anchor_in_titlepage_titlepage.pl       |   6 +-
 tp/t/results/regions/ref_in_copying.pl             |  16 +-
 tp/t/results/regions/today_in_copying.pl           |   8 +-
 tp/t/results/sectioning/anchor_in_footnote.pl      |  16 +-
 .../sectioning/anchor_in_footnote_separate.pl      |  16 +-
 .../sectioning/chapter_before_and_after_part.pl    |  24 +--
 tp/t/results/sectioning/chapter_before_part.pl     |  16 +-
 tp/t/results/sectioning/chapter_between_nodes.pl   |  20 +-
 .../chapter_node_before_and_after_part.pl          |  24 +--
 tp/t/results/sectioning/chapter_sections.pl        |  64 +++---
 .../sectioning/character_and_spaces_in_refs.pl     |  16 +-
 .../sectioning/character_and_spaces_in_refs_out.pl |  16 +-
 tp/t/results/sectioning/complex.pl                 | 132 ++++++------
 tp/t/results/sectioning/complex_split_at_node.pl   |  68 +++----
 tp/t/results/sectioning/contents.pl                |  42 ++--
 .../sectioning/contents_and_shortcontents.pl       |  42 ++--
 .../sectioning/contents_at_document_begin.pl       |  12 +-
 .../results/sectioning/contents_at_end_document.pl |  12 +-
 .../contents_at_end_document_after_node.pl         |  12 +-
 tp/t/results/sectioning/contents_in_document.pl    |  12 +-
 tp/t/results/sectioning/contents_in_html_text.pl   |  18 +-
 tp/t/results/sectioning/double_part.pl             |  44 ++--
 tp/t/results/sectioning/double_top_section.pl      |   8 +-
 tp/t/results/sectioning/empty_top_node_up.pl       |   8 +-
 tp/t/results/sectioning/external_node_in_menu.pl   |  24 +--
 tp/t/results/sectioning/hole_in_sectioning.pl      |  22 +-
 tp/t/results/sectioning/internal_top_node_up.pl    |   8 +-
 tp/t/results/sectioning/lone_Top_node.pl           |  20 +-
 tp/t/results/sectioning/loop_nodes.pl              |   8 +-
 tp/t/results/sectioning/lowered_subsubsection.pl   |  56 +++---
 tp/t/results/sectioning/loweredheading.pl          |   8 +-
 tp/t/results/sectioning/menutextorder.pl           |  60 +++---
 .../results/sectioning/more_sections_than_nodes.pl |  72 +++----
 tp/t/results/sectioning/next_in_menu_is_below.pl   |  32 +--
 .../results/sectioning/no_argument_and_contents.pl |  10 +-
 tp/t/results/sectioning/no_menu.pl                 |  32 +--
 .../sectioning/node_part_chapter_after_chapter.pl  |  52 ++---
 .../sectioning/node_part_chapter_after_top.pl      |  36 ++--
 .../node_sectop_before_chapter_no_node.pl          |  12 +-
 .../sectioning/node_sectop_before_lone_node_Top.pl |  16 +-
 tp/t/results/sectioning/nodename_parentheses.pl    |  32 +--
 .../nodes_after_top_before_chapter_nodes.pl        |  12 +-
 .../nodes_after_top_before_chapter_not_split.pl    |  12 +-
 ...ore_chapter_not_split_no_use_node_directions.pl |  12 +-
 .../nodes_after_top_before_chapter_sections.pl     |  20 +-
 .../nodes_after_top_before_section_nodes.pl        |  12 +-
 .../nodes_after_top_before_section_sections.pl     |  20 +-
 tp/t/results/sectioning/nodes_before_after_top.pl  |  16 +-
 .../sectioning/nodes_before_after_top_xref.pl      |  16 +-
 tp/t/results/sectioning/nodes_before_top.pl        |  16 +-
 .../non_automatic_internal_top_node_up.pl          |   8 +-
 .../non_automatic_top_node_up_and_url.pl           |   8 +-
 .../sectioning/non_automatic_top_node_up_url.pl    |   8 +-
 tp/t/results/sectioning/one_subsection.pl          |   8 +-
 tp/t/results/sectioning/one_subsection_and_node.pl |  12 +-
 tp/t/results/sectioning/part_before_chapter.pl     |  16 +-
 tp/t/results/sectioning/part_before_section.pl     |  16 +-
 tp/t/results/sectioning/part_before_top.pl         |  12 +-
 tp/t/results/sectioning/part_chapter_after_top.pl  |  36 ++--
 tp/t/results/sectioning/part_chapter_appendix.pl   |  14 +-
 tp/t/results/sectioning/part_node_after_top.pl     |  20 +-
 tp/t/results/sectioning/part_node_before_top.pl    |  20 +-
 .../sectioning/part_node_chapter_after_top.pl      |  36 ++--
 .../sectioning/part_node_chapter_appendix.pl       |  52 ++---
 .../sectioning/part_node_chapter_node_appendix.pl  |  52 ++---
 .../sectioning/part_node_node_part_appendix.pl     |  60 +++---
 tp/t/results/sectioning/part_node_part_appendix.pl |  60 +++---
 .../sectioning/part_node_part_node_appendix.pl     |  60 +++---
 .../sectioning/placed_things_before_element.pl     |   8 +-
 .../sectioning/placed_things_before_node.pl        |   8 +-
 .../sectioning/protected_node_parentheses.pl       |   8 +-
 tp/t/results/sectioning/raiselowersections.pl      |  48 ++---
 tp/t/results/sectioning/ref_to_top.pl              |   8 +-
 .../sectioning/section_before_after_top_node.pl    |  14 +-
 .../section_before_after_top_node_last_node.pl     |  14 +-
 tp/t/results/sectioning/section_before_chapter.pl  |  12 +-
 tp/t/results/sectioning/section_before_part.pl     |  10 +-
 tp/t/results/sectioning/section_before_top.pl      |  16 +-
 .../sectioning/section_before_top_no_node.pl       |  10 +-
 .../results/sectioning/section_below_unnumbered.pl |  16 +-
 .../sectioning/section_below_unnumbered_no_top.pl  |   8 +-
 .../sectioning/section_chapter_before_top.pl       |  14 +-
 .../sectioning/section_chapter_before_top_nodes.pl |  24 +--
 .../sectioning/section_in_unnumbered_info.pl       | 160 +++++++--------
 .../sectioning/section_in_unnumbered_plaintext.pl  | 160 +++++++--------
 .../results/sectioning/section_node_before_part.pl |  14 +-
 .../results/sectioning/sectioning_part_appendix.pl |  80 ++++----
 .../sectioning/sectioning_part_appendix_no_top.pl  |  76 +++----
 tp/t/results/sectioning/sections.pl                |   8 +-
 tp/t/results/sectioning/sections_test.pl           |  42 ++--
 .../sectioning/sections_test_no_use_nodes.pl       |  42 ++--
 ...ctions_test_no_use_nodes_use_node_directions.pl |  42 ++--
 tp/t/results/sectioning/semi_auto.pl               |  32 +--
 .../setfilename_on_top_and_after_node.pl           |   8 +-
 tp/t/results/sectioning/shortcontents.pl           |  42 ++--
 tp/t/results/sectioning/top_chapter_sections.pl    |  68 +++----
 .../sectioning/top_no_argument_and_content.pl      |   6 +-
 .../results/sectioning/top_no_argument_and_node.pl |   8 +-
 .../sectioning/top_no_argument_and_top_node.pl     |   8 +-
 tp/t/results/sectioning/top_node_part_top.pl       |  20 +-
 tp/t/results/sectioning/top_node_up_url.pl         |   8 +-
 tp/t/results/sectioning/top_part_chapter.pl        |  20 +-
 tp/t/results/sectioning/top_without_node_nodes.pl  |  14 +-
 .../sectioning/top_without_node_sections.pl        |  28 +--
 tp/t/results/sectioning/two_nodes_at_the_end.pl    |  28 +--
 .../sectioning/two_nodes_between_chapters.pl       |  44 ++--
 .../sectioning/two_unnumbered_no_argument.pl       |   8 +-
 .../sectioning/unnumbered_before_node_top_top.pl   |  20 +-
 tp/t/results/sectioning/unnumbered_before_top.pl   |   8 +-
 .../sectioning/unnumbered_before_top_node.pl       |  12 +-
 tp/t/results/sectioning/unnumbered_no_argument.pl  |   6 +-
 .../unnumbered_top_without_node_nodes.pl           |  18 +-
 .../unnumbered_top_without_node_sections.pl        |  36 ++--
 tp/t/results/value/value_in_misc_commands.pl       |   8 +-
 tp/t/results/value/value_in_node.pl                |  16 +-
 tp/t/results/value/value_node_directions.pl        |  24 +--
 tp/t/results/xml_tests/image_inline_or_not.pl      |  20 +-
 tp/t/results/xtable/block_commands_in_table.pl     |   8 +-
 .../results/xtable/inter_item_commands_in_table.pl |  16 +-
 tp/t/test_utils.pl                                 |   2 +-
 326 files changed, 3787 insertions(+), 3757 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ed9db9f1db..9fea42fc4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2022-01-03  Patrice Dumas  <pertusus@free.fr>
+
+       * p/Texinfo/Common.pm, tp/Texinfo/Config.pm,
+       tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/TexinfoXML.pm,
+       tp/Texinfo/ParserNonXS.pm, tp/Texinfo/XS/parsetexi/Parsetexi.pm:
+       use cleaner ref($var) eq '' instead of ! ref($var).
+
+       * tp/Texinfo/Structuring.pm (sectioning_structure)
+       (section_level_adjusted_command_name, split_pages)
+       (elements_directions),
+       tp/Texinfo/Convert/DocBook.pm (_docbook_section_element, _convert),
+       tp/Texinfo/Convert/HTML.pm (command_text, _convert_heading_command)
+       (_prepare_tree_units_global_targets, _default_format_contents),
+       tp/Texinfo/Convert/LaTeX.pm (_convert),
+       tp/Texinfo/Convert/Plaintext.pm (format_contents, _convert),
+       tp/Texinfo/Convert/Text.pm (heading), tp/Texinfo/Convert/Utils.pm
+       (numbered_heading), tp/init/book.pm, tp/init/chm.pm, tp/init/epub3.pm: 
+       replace section element level by section_level and number by
+       section_number in structure.
+
 2022-01-02  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Common.pm (_substitute_references): handle
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index d2b3003660..7343a4d995 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -2032,7 +2032,7 @@ sub _substitute_references_in_array($$$)
   my $result = [];
   my $index = 0;
   foreach my $item (@{$array}) {
-    if (!ref($item)) {
+    if (ref($item) eq '') {
       push @{$result}, $item;
     } elsif ($reference_associations->{$item}) {
       push @{$result}, $reference_associations->{$item};
@@ -2534,8 +2534,8 @@ sub debug_print_element($)
     if (defined($current->{'extra'})
       and defined($current->{'extra'}->{'special_element_type'}));
   $cmd = "\@$current->{'cmdname'}" if (defined($current->{'cmdname'}));
-  $cmd .= "($current->{'structure'}->{'level'})"
-        if (defined($current->{'structure'}->{'level'}));
+  $cmd .= "($current->{'structure'}->{'section_level'})"
+        if (defined($current->{'structure'}->{'section_level'}));
   if (defined($current->{'text'})) {
     my $text_str = $current->{'text'};
     $text_str =~ s/\n/\\n/g;
diff --git a/tp/Texinfo/Config.pm b/tp/Texinfo/Config.pm
index b2f17195e8..d9d99dc26c 100644
--- a/tp/Texinfo/Config.pm
+++ b/tp/Texinfo/Config.pm
@@ -64,7 +64,7 @@ sub GNUT_initialize_config($$$) {
   # consider options passed from main program for initialization
   # as list options
   foreach my $cmdline_option (keys(%$cmdline_options)) {
-    if (not ref($cmdline_options->{$cmdline_option})
+    if (ref($cmdline_options->{$cmdline_option}) eq ''
         or ref($cmdline_options->{$cmdline_option}) ne 'ARRAY') {
       warn "BUG: $cmdline_option not an ARRAY 
$cmdline_options->{$cmdline_option}\n";
     }
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index 5b0f8f141e..3bfd0ddf5c 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -389,7 +389,7 @@ sub _docbook_section_element($$)
   my $self = shift;
   my $element = shift;
 
-  my $heading_level = $element->{'structure'}->{'level'};
+  my $heading_level = $element->{'structure'}->{'section_level'};
   if (exists $docbook_sections{$heading_level}) {
     return $docbook_sections{$heading_level};
   }
@@ -647,12 +647,12 @@ sub _convert($$;$)
           # able to figure it out.  For @unnumbered or if ! NUMBER_SECTIONS
           # having a label (empty) is important.
           my $label = '';
-          if (defined($element->{'structure'}->{'number'})
+          if (defined($element->{'structure'}->{'section_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 = $element->{'structure'}->{'number'};
+            $label = $element->{'structure'}->{'section_number'};
           }
           my $docbook_sectioning_element = 
$self->_docbook_section_element($element);
           if (! $docbook_special_unnumbered{$docbook_sectioning_element}) {
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 034d24a09e..b950729f5b 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -697,21 +697,21 @@ sub command_text($$;$)
           cluck "No misc_content: "
             .Texinfo::Common::debug_print_element($command);
         }
-        if (defined($command->{'structure'}->{'number'})
+        if (defined($command->{'structure'}->{'section_number'})
             and ($self->get_conf('NUMBER_SECTIONS')
                  or !defined($self->get_conf('NUMBER_SECTIONS')))) {
           if ($command->{'cmdname'} eq 'appendix'
-              and $command->{'structure'}->{'level'} == 1) {
+              and $command->{'structure'}->{'section_level'} == 1) {
             $tree = $self->gdt('Appendix {number} {section_title}',
                              {'number'
-                                => {'text' => 
$command->{'structure'}->{'number'}},
+                                => {'text' => 
$command->{'structure'}->{'section_number'}},
                               'section_title'
                                 => {'contents' 
                                     => 
$command->{'args'}->[0]->{'contents'}}});
           } else {
             $tree = $self->gdt('{number} {section_title}',
                              {'number'
-                                => {'text' => 
$command->{'structure'}->{'number'}},
+                                => {'text' => 
$command->{'structure'}->{'section_number'}},
                               'section_title'
                                 => {'contents' 
                                     => 
$command->{'args'}->[0]->{'contents'}}});
@@ -2531,7 +2531,7 @@ sub _default_format_button($$)
     my $text = $button->[1];
     my $button_href = $button->[0];
     # $button_href is simple text and $text is a reference
-    if (defined($button_href) and !ref($button_href)
+    if (defined($button_href) and ref($button_href) eq ''
         and defined($text) and (ref($text) eq 'SCALAR') and defined($$text)) {
       # use given text
       my $href = $self->from_element_direction(
@@ -2544,12 +2544,12 @@ sub _default_format_button($$)
       }
       $need_delimiter = 1;
     # $button_href is simple text and $text is a reference on code
-    } elsif (defined($button_href) and !ref($button_href)
+    } elsif (defined($button_href) and ref($button_href) eq ''
              and defined($text) and (ref($text) eq 'CODE')) {
       ($active, $need_delimiter) = &$text($self, $button_href);
     # $button_href is simple text and $text is also a simple text
-    } elsif (defined($button_href) and !ref($button_href)
-             and defined($text) and !ref($text)) {
+    } elsif (defined($button_href) and ref($button_href) eq ''
+             and defined($text) and ref($text) eq '') {
       if ($text =~ s/^->\s*//) {
         $active = $self->from_element_direction(
                     $self->{'current_root_element'}, $button_href, $text);
@@ -2690,9 +2690,9 @@ sub _default_format_navigation_header_panel($$$$;$)
     }
     my $direction;
     if (ref($button) eq 'ARRAY'
-        and defined($button->[0]) and !ref($button->[0])) {
+        and defined($button->[0]) and ref($button->[0]) eq '') {
       $direction = $button->[0];
-    } elsif (defined($button) and !ref($button)) {
+    } elsif (defined($button) and ref($button) eq '') {
       $direction = $button;
     }
 
@@ -2889,7 +2889,7 @@ sub _convert_heading_command($$$$$)
   # if set, the id is associated to the heading text
   my $heading_id;
   if ($section) {
-    my $level = $section->{'structure'}->{'level'};
+    my $level = $section->{'structure'}->{'section_level'};
     $result .= join('', $self->close_registered_sections_level($level));
     $self->register_opened_section_level($level, "</div>\n");
 
@@ -2930,8 +2930,8 @@ sub _convert_heading_command($$$$$)
         $heading_level = 3;
       }
     }
-  } elsif (defined $element->{'structure'}->{'level'}) {
-    $heading_level = $element->{'structure'}->{'level'};
+  } elsif (defined $element->{'structure'}->{'section_level'}) {
+    $heading_level = $element->{'structure'}->{'section_level'};
     # if the level was changed, set the command name right
     $cmdname_for_heading
       = Texinfo::Structuring::section_level_adjusted_command_name($element);
@@ -6690,9 +6690,10 @@ sub _prepare_tree_units_global_targets($$)
       }
       # find the first level 1 sectioning element to associate the printindex 
with
       if ($root_command and $root_command->{'cmdname'} ne 'node') {
-        while ($root_command->{'structure'}->{'level'} > 1
+        while ($root_command->{'structure'}->{'section_level'} > 1
                and $root_command->{'structure'}->{'section_up'}
-               and 
$root_command->{'structure'}->{'section_up'}->{'structure'}->{'associated_unit'})
 {
+               and $root_command->{'structure'}->{'section_up'}
+                                        ->{'structure'}->{'associated_unit'}) {
           $root_command = $root_command->{'structure'}->{'section_up'};
           $root_element = $root_command->{'structure'}->{'associated_unit'};
         }
@@ -6983,13 +6984,15 @@ sub _default_format_contents($$;$$)
   my $contents;
   $contents = 1 if ($cmdname eq 'contents');
 
-  my $min_root_level = 
$section_root->{'structure'}->{'section_childs'}->[0]->{'structure'}->{'level'};
-  my $max_root_level = 
$section_root->{'structure'}->{'section_childs'}->[0]->{'structure'}->{'level'};
+  my $min_root_level = $section_root->{'structure'}->{'section_childs'}->[0]
+                                             
->{'structure'}->{'section_level'};
+  my $max_root_level = $section_root->{'structure'}->{'section_childs'}->[0]
+                                              
->{'structure'}->{'section_level'};
   foreach my $top_section 
(@{$section_root->{'structure'}->{'section_childs'}}) {
-    $min_root_level = $top_section->{'structure'}->{'level'}
-      if ($top_section->{'structure'}->{'level'} < $min_root_level);
-    $max_root_level = $top_section->{'structure'}->{'level'}
-      if ($top_section->{'structure'}->{'level'} > $max_root_level);
+    $min_root_level = $top_section->{'structure'}->{'section_level'}
+      if ($top_section->{'structure'}->{'section_level'} < $min_root_level);
+    $max_root_level = $top_section->{'structure'}->{'section_level'}
+      if ($top_section->{'structure'}->{'section_level'} > $max_root_level);
   }
   # chapter level elements are considered top-level here.
   $max_root_level = 1 if ($max_root_level < 1);
@@ -7027,7 +7030,7 @@ sub _default_format_contents($$;$$)
         my $toc_id = $self->command_contents_target($section, $cmdname);
         if ($text ne '') {
           # no indenting for shortcontents
-          $result .= (' ' x (2*($section->{'structure'}->{'level'} - 
$min_root_level)))
+          $result .= (' ' x (2*($section->{'structure'}->{'section_level'} - 
$min_root_level)))
             if ($contents);
           if ($toc_id ne '' or $href ne '') {
             my $toc_name_attribute = '';
@@ -7056,9 +7059,9 @@ sub _default_format_contents($$;$$)
       }
       # for shortcontents don't do child if child is not toplevel
       if ($section->{'structure'}->{'section_childs'}
-          and ($contents or $section->{'structure'}->{'level'} < 
$max_root_level)) {
+          and ($contents or $section->{'structure'}->{'section_level'} < 
$max_root_level)) {
         # no indenting for shortcontents
-        $result .= "\n". ' ' x (2*($section->{'structure'}->{'level'} - 
$min_root_level))
+        $result .= "\n". ' ' x (2*($section->{'structure'}->{'section_level'} 
- $min_root_level))
           if ($contents);
         $result .= $self->html_attribute_class('ul', $ul_class) .">\n";
         $section = $section->{'structure'}->{'section_childs'}->[0];
@@ -7075,7 +7078,7 @@ sub _default_format_contents($$;$$)
         }
         while ($section->{'structure'}->{'section_up'}) {
           $section = $section->{'structure'}->{'section_up'};
-          $result .= "</li>\n". ' ' x (2*($section->{'structure'}->{'level'} - 
$min_root_level))
+          $result .= "</li>\n". ' ' x 
(2*($section->{'structure'}->{'section_level'} - $min_root_level))
             . "</ul>";
           if ($section eq $top_section) {
             $result .= "</li>\n" if ($toplevel_contents);
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 4c5a830a87..1430e720e0 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -2469,7 +2469,7 @@ sub _convert($$)
             # If an unwanted comma is added, follow the argument with a 
command such as @:
             if ($reference->{'cmdname'} and $reference->{'cmdname'} eq 'node'
                 and $section_command) {
-              if ($section_command->{'structure'}->{'level'} > 1) {
+              if ($section_command->{'structure'}->{'section_level'} > 1) {
                 # TODO command that could be used for translation \sectionname 
does
                 # not exist in the default case.  it is defined in the 
pagenote package together with 
                 # \pagename which is page in the default case, but it is 
unclear if this
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 18d766ee75..bf4ac5dda9 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -1072,10 +1072,11 @@ sub format_contents($$$)
   # no sections
   return ('', 0) if (!$section_root
                      or !$section_root->{'structure'}->{'section_childs'});
-  my $root_level = 
$section_root->{'structure'}->{'section_childs'}->[0]->{'structure'}->{'level'};
+  my $root_level = $section_root->{'structure'}->{'section_childs'}->[0]
+                                                     
->{'structure'}->{'section_level'};
   foreach my $top_section 
(@{$section_root->{'structure'}->{'section_childs'}}) {
-    $root_level = $top_section->{'structure'}->{'level'}
-      if ($top_section->{'structure'}->{'level'} < $root_level);
+    $root_level = $top_section->{'structure'}->{'section_level'}
+      if ($top_section->{'structure'}->{'section_level'} < $root_level);
   }
 
   my $result = '';
@@ -1088,18 +1089,18 @@ sub format_contents($$$)
     while ($section) {
       push @{$self->{'count_context'}}, {'lines' => 0, 'bytes' => 0};
       my $section_title_tree;
-      if (defined($section->{'structure'}->{'number'})
+      if (defined($section->{'structure'}->{'section_number'})
           and ($self->get_conf('NUMBER_SECTIONS')
                or !defined($self->get_conf('NUMBER_SECTIONS')))) {
         if ($section->{'cmdname'} eq 'appendix'
-            and $section->{'structure'}->{'level'} == 1) {
+            and $section->{'structure'}->{'section_level'} == 1) {
           $section_title_tree = $self->gdt('Appendix {number} {section_title}',
-                           {'number' => {'text' => 
$section->{'structure'}->{'number'}},
+                           {'number' => {'text' => 
$section->{'structure'}->{'section_number'}},
                             'section_title'
                               => {'contents' => 
$section->{'args'}->[0]->{'contents'}}});
         } else {
           $section_title_tree = $self->gdt('{number} {section_title}',
-                           {'number' => {'text' => 
$section->{'structure'}->{'number'}},
+                           {'number' => {'text' => 
$section->{'structure'}->{'section_number'}},
                             'section_title'
                               => {'contents' => 
$section->{'args'}->[0]->{'contents'}}});
         }
@@ -1113,12 +1114,12 @@ sub format_contents($$$)
       my $text = $section_title;
       chomp ($text);
       $text .= "\n";
-      my $repeat_count = 2 * ($section->{'structure'}->{'level'} - 
($root_level+1));
+      my $repeat_count = 2 * ($section->{'structure'}->{'section_level'} - 
($root_level+1));
       ($result .= (' ' x $repeat_count)) if $repeat_count > 0;
       $result .= $text;
       $lines_count++;
       if ($section->{'structure'}->{'section_childs'}
-          and ($contents or $section->{'structure'}->{'level'} < 
$root_level+1)) {
+          and ($contents or $section->{'structure'}->{'section_level'} < 
$root_level+1)) {
         $section = $section->{'structure'}->{'section_childs'}->[0];
       } elsif ($section->{'structure'}->{'section_next'}) {
         last if ($section eq $top_section);
@@ -2273,7 +2274,7 @@ sub _convert($$)
       $result = $self->convert_line ({'type' => 'frenchspacing',
                'contents' => [$element->{'args'}->[0]]});
       pop @{$self->{'count_context'}};
-      $result = Texinfo::Convert::Text::heading({'structure' => {'level' => 0},
+      $result = Texinfo::Convert::Text::heading({'structure' => 
{'section_level' => 0},
         'cmdname' => 'titlefont'}, $result, $self, 
         $self->get_conf('NUMBER_SECTIONS'),
         ($self->{'format_context'}->[-1]->{'indent_level'}) * $indent_length);
diff --git a/tp/Texinfo/Convert/TexinfoXML.pm b/tp/Texinfo/Convert/TexinfoXML.pm
index 77b3615cb6..add58b3fb5 100644
--- a/tp/Texinfo/Convert/TexinfoXML.pm
+++ b/tp/Texinfo/Convert/TexinfoXML.pm
@@ -475,7 +475,7 @@ sub _format_command($$)
   my $self = shift;
   my $command = shift;
 
-  if (! ref($no_arg_commands_formatting{$command})) {
+  if (ref($no_arg_commands_formatting{$command}) eq '') {
     return $self->format_atom($command);
   } else {
     my @spec = @{$no_arg_commands_formatting{$command}};
diff --git a/tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm
index 25968b76de..20bdb19f37 100644
--- a/tp/Texinfo/Convert/Text.pm
+++ b/tp/Texinfo/Convert/Text.pm
@@ -313,10 +313,10 @@ sub heading($$$;$$)
     $indent_length = 0;
   }
   my $section_level;
-  if (!defined($current->{'structure'}->{'level'})) {
+  if (!defined($current->{'structure'}->{'section_level'})) {
     $section_level = Texinfo::Structuring::section_level($current);
   } else {
-    $section_level = $current->{'structure'}->{'level'};
+    $section_level = $current->{'structure'}->{'section_level'};
   }
   $result .= ($underline_symbol{$section_level}
      x (Texinfo::Convert::Unicode::string_width($text) - $indent_length))."\n";
diff --git a/tp/Texinfo/Convert/Utils.pm b/tp/Texinfo/Convert/Utils.pm
index c00d1f1032..7632653c2f 100644
--- a/tp/Texinfo/Convert/Utils.pm
+++ b/tp/Texinfo/Convert/Utils.pm
@@ -248,16 +248,16 @@ sub numbered_heading($$$;$)
   my $numbered = shift;
 
   my $number;
-  if (defined($current->{'structure'}->{'number'})
+  if (defined($current->{'structure'}->{'section_number'})
       and ($numbered or !defined($numbered))) {
-    $number = $current->{'structure'}->{'number'};
+    $number = $current->{'structure'}->{'section_number'};
   }
 
   my $result;
   if ($self) {
     if (defined($number)) {
       if ($current->{'cmdname'} eq 'appendix'
-          and $current->{'structure'}->{'level'} == 1) {
+          and $current->{'structure'}->{'section_level'} == 1) {
         $result = $self->gdt('Appendix {number} {section_title}',
                    {'number' => $number, 'section_title' => $text},
                    'translated_text');
@@ -273,7 +273,7 @@ sub numbered_heading($$$;$)
     $result = $text;
     $result = $number.' '.$result if (defined($number));
     if ($current->{'cmdname'} eq 'appendix'
-        and $current->{'structure'}->{'level'} == 1) {
+        and $current->{'structure'}->{'section_level'} == 1) {
       $result = 'Appendix '.$result;
     }
   }
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 65810662b9..46d52965f2 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -856,11 +856,11 @@ sub parse_texi_text($$;$$$$)
   return undef if (!defined($text));
 
   my $lines_array = [];
-  if (!ref($text)) {
+  if (ref($text) eq '') {
     $text = _text_to_lines($text);
   }
   $lines_nr = [] if (!defined($lines_nr));
-  if (!ref($lines_nr)) {
+  if (ref($lines_nr) eq '') {
     # $lines_nr is the first line number
     $lines_array = _complete_line_nr($text, $lines_nr, $file, 
                                      $macro, $fixed_line_number);
@@ -991,7 +991,7 @@ sub parse_texi_line($$;$$$$)
 
   return undef if (!defined($text));
 
-  if (!ref($text)) {
+  if (ref($text) eq '') {
     $text = _text_to_lines($text);
   }
   if (not defined($lines_nr)) {
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index 404547f601..b6ec13ce95 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -116,7 +116,8 @@ sub section_level($)
 
 # Go through the sectioning commands (e.g. @chapter, not @node), and
 # set:
-# 'number'
+# 'section_level'
+# 'section_number'
 # 'section_childs'
 # 'section_up'
 # 'section_prev'
@@ -158,20 +159,21 @@ sub sectioning_structure($$$)
       }
     }
     my $level;
-    $level = $content->{'structure'}->{'level'} = section_level($content);
+    $level = $content->{'structure'}->{'section_level'} = 
section_level($content);
     if (!defined($level)) {
       warn "bug: level not defined for $content->{'cmdname'}\n";
-      $level = $content->{'structure'}->{'level'} = 0;
+      $level = $content->{'structure'}->{'section_level'} = 0;
     }
 
     if ($previous_section) {
       # new command is below
-      if ($previous_section->{'structure'}->{'level'} < $level) {
-        if ($level - $previous_section->{'structure'}->{'level'} > 1) {
+      if ($previous_section->{'structure'}->{'section_level'} < $level) {
+        if ($level - $previous_section->{'structure'}->{'section_level'} > 1) {
           $registrar->line_error($configuration_informations,
            sprintf(__("raising the section level of \@%s which is too low"), 
               $content->{'cmdname'}), $content->{'line_nr'});
-          $content->{'structure'}->{'level'} = 
$previous_section->{'structure'}->{'level'} + 1;
+          $content->{'structure'}->{'section_level'}
+              = $previous_section->{'structure'}->{'section_level'} + 1;
         }
         $previous_section->{'structure'}->{'section_childs'} = [$content];
         $content->{'structure'}->{'section_up'} = $previous_section;
@@ -179,28 +181,28 @@ sub sectioning_structure($$$)
         # if the up is unnumbered, the number information has to be kept,
         # to avoid reusing an already used number.
         if (!$unnumbered_commands{$previous_section->{'cmdname'}}) {
-          $command_numbers[$content->{'structure'}->{'level'}] = undef;
+          $command_numbers[$content->{'structure'}->{'section_level'}] = undef;
         } elsif (!$unnumbered_commands{$content->{'cmdname'}}) {
-          $command_numbers[$content->{'structure'}->{'level'}]++;
+          $command_numbers[$content->{'structure'}->{'section_level'}]++;
         }
         if ($unnumbered_commands{$content->{'cmdname'}}) {
-          $command_unnumbered[$content->{'structure'}->{'level'}] = 1;
+          $command_unnumbered[$content->{'structure'}->{'section_level'}] = 1;
         } else {
-          $command_unnumbered[$content->{'structure'}->{'level'}] = 0;
+          $command_unnumbered[$content->{'structure'}->{'section_level'}] = 0;
         }
       } else {
         my $up = $previous_section->{'structure'}->{'section_up'};
         my $new_upper_part_element;
-        if ($previous_section->{'structure'}->{'level'} != $level) {
+        if ($previous_section->{'structure'}->{'section_level'} != $level) {
           # means it is above the previous command, the up is to be found
           while ($up->{'structure'}->{'section_up'}
-                 and $up->{'structure'}->{'level'} >= $level) {
+                 and $up->{'structure'}->{'section_level'} >= $level) {
             $up = $up->{'structure'}->{'section_up'};
           }
-          if ($level <= $up->{'structure'}->{'level'}) {
+          if ($level <= $up->{'structure'}->{'section_level'}) {
             if ($content->{'cmdname'} eq 'part') {
               $new_upper_part_element = 1;
-              if ($level < $up->{'structure'}->{'level'}) {
+              if ($level < $up->{'structure'}->{'section_level'}) {
                 $registrar->line_warn($configuration_informations,
                  sprintf(__("no chapter-level command before \@%s"),
                     $content->{'cmdname'}), $content->{'line_nr'});
@@ -209,19 +211,20 @@ sub sectioning_structure($$$)
               $registrar->line_warn($configuration_informations,
   sprintf(__("lowering the section level of \@%s appearing after a lower 
element"), 
                   $content->{'cmdname'}), $content->{'line_nr'});
-              $content->{'structure'}->{'level'} = 
$up->{'structure'}->{'level'} + 1;
+              $content->{'structure'}->{'section_level'}
+                 = $up->{'structure'}->{'section_level'} + 1;
             }
           }
         }
         if ($appendix_commands{$content->{'cmdname'}} and !$in_appendix
-            and $content->{'structure'}->{'level'} <= $number_top_level 
+            and $content->{'structure'}->{'section_level'} <= 
$number_top_level 
             and $up->{'cmdname'} and $up->{'cmdname'} eq 'part') {
           $up = $up->{'structure'}->{'section_up'};
         }
         if ($new_upper_part_element) {
           # In that case the root has to be updated because the first 
           # 'part' just appeared
-          $sec_root->{'structure'}->{'level'} = $level - 1;
+          $sec_root->{'structure'}->{'section_level'} = $level - 1;
           push @{$sec_root->{'structure'}->{'section_childs'}}, $content;
           $content->{'structure'}->{'section_up'} = $sec_root;
           $number_top_level = $level;
@@ -233,15 +236,15 @@ sub sectioning_structure($$$)
           
$content->{'structure'}->{'section_prev'}->{'structure'}->{'section_next'} = 
$content;
         }
         if (!$unnumbered_commands{$content->{'cmdname'}}) {
-          $command_numbers[$content->{'structure'}->{'level'}]++;
-          $command_unnumbered[$content->{'structure'}->{'level'}] = 0;
+          $command_numbers[$content->{'structure'}->{'section_level'}]++;
+          $command_unnumbered[$content->{'structure'}->{'section_level'}] = 0;
         } else {
-          $command_unnumbered[$content->{'structure'}->{'level'}] = 1;
+          $command_unnumbered[$content->{'structure'}->{'section_level'}] = 1;
         }
       }
     } else { # first section determines the level of the root.  It is 
       # typically -1 when there is a @top.
-      $sec_root->{'structure'}->{'level'} = $level - 1;
+      $sec_root->{'structure'}->{'section_level'} = $level - 1;
       $sec_root->{'structure'}->{'section_childs'} = [$content];
       $content->{'structure'}->{'section_up'} = $sec_root;
       $number_top_level = $level;
@@ -251,28 +254,28 @@ sub sectioning_structure($$$)
       $number_top_level++ if (!$number_top_level);
       if ($content->{'cmdname'} ne 'top') {
         if (!$unnumbered_commands{$content->{'cmdname'}}) {
-          $command_unnumbered[$content->{'structure'}->{'level'}] = 0;
+          $command_unnumbered[$content->{'structure'}->{'section_level'}] = 0;
         } else {
-          $command_unnumbered[$content->{'structure'}->{'level'}] = 1;
+          $command_unnumbered[$content->{'structure'}->{'section_level'}] = 1;
         }
       }
     }
-    if (!defined($command_numbers[$content->{'structure'}->{'level'}])) {
+    if 
(!defined($command_numbers[$content->{'structure'}->{'section_level'}])) {
       if ($unnumbered_commands{$content->{'cmdname'}}) {
-        $command_numbers[$content->{'structure'}->{'level'}] = 0;
+        $command_numbers[$content->{'structure'}->{'section_level'}] = 0;
       } else {
-        $command_numbers[$content->{'structure'}->{'level'}] = 1;
+        $command_numbers[$content->{'structure'}->{'section_level'}] = 1;
       }
     }
     if ($appendix_commands{$content->{'cmdname'}} and !$in_appendix) {
       $in_appendix = 1;
-      $command_numbers[$content->{'structure'}->{'level'}] = 'A';
+      $command_numbers[$content->{'structure'}->{'section_level'}] = 'A';
     }
     if (!$unnumbered_commands{$content->{'cmdname'}}) {
       # construct the number, if not below an unnumbered
       if (!$command_unnumbered[$number_top_level]) {
         my $section_number = $command_numbers[$number_top_level];
-        for (my $i = $number_top_level+1; $i <= 
$content->{'structure'}->{'level'}; $i++) {
+        for (my $i = $number_top_level+1; $i <= 
$content->{'structure'}->{'section_level'}; $i++) {
           $section_number .= ".$command_numbers[$i]";
           # If there is an unnumbered above, then no number is added.
           if ($command_unnumbered[$i]) {
@@ -281,13 +284,13 @@ sub sectioning_structure($$$)
           }
         }
         if (defined($section_number)) {
-          $content->{'structure'}->{'number'} = $section_number;
+          $content->{'structure'}->{'section_number'} = $section_number;
         }
       }
     }
     $previous_section = $content;
     if ($content->{'cmdname'} ne 'part' 
-        and $content->{'structure'}->{'level'} <= $number_top_level) {
+        and $content->{'structure'}->{'section_level'} <= $number_top_level) {
       if ($previous_toplevel) {
         $previous_toplevel->{'structure'}->{'toplevel_next'} = $content;
         $content->{'structure'}->{'toplevel_prev'} = $previous_toplevel;
@@ -311,7 +314,7 @@ sub _print_sectioning_tree($);
 sub _print_sectioning_tree($)
 {
   my $current = shift;
-  my $result = ' ' x $current->{'structure'}->{'level'}
+  my $result = ' ' x $current->{'structure'}->{'section_level'}
      . 
Texinfo::Convert::Texinfo::root_element_command_to_texinfo($current)."\n";
   foreach my $child (@{$current->{'structure'}->{'section_childs'}}) {
     $result .= _print_sectioning_tree($child);
@@ -820,7 +823,7 @@ sub section_level_adjusted_command_name($)
 {
   my $element = shift;
 
-  my $heading_level = $element->{'structure'}->{'level'};
+  my $heading_level = $element->{'structure'}->{'section_level'};
   my $command;
   if ($heading_level ne 
$Texinfo::Common::command_structuring_level{$element->{'cmdname'}}) {
     $command
@@ -948,7 +951,7 @@ sub split_pages ($$)
     my $level;
     my $section = _tree_unit_section($tree_unit);
     if (defined($section)) {
-      $level = $section->{'structure'}->{'level'};
+      $level = $section->{'structure'}->{'section_level'};
     }
     #print STDERR "level($split_level) $level 
".root_or_external_element_cmd_texi($tree_unit)."\n";
     if (!defined($split_level) or (defined($level) and $split_level >= $level)
@@ -1109,7 +1112,7 @@ sub elements_directions($$$)
           $directions->{'FastForward'}
             = $section_element->{'structure'}->{'directions'}->{'FastForward'};
         }
-        if ($section->{'structure'}->{'level'} <= 1) {
+        if ($section->{'structure'}->{'section_level'} <= 1) {
           $directions->{'FastBack'} = $section_element;
         } elsif 
($section_element->{'structure'}->{'directions'}->{'Fastback'}) {
           $directions->{'FastBack'}
@@ -1132,14 +1135,15 @@ sub elements_directions($$$)
       }
 
       my $up = $section;
-      while ($up->{'structure'}->{'level'} > 1
+      while ($up->{'structure'}->{'section_level'} > 1
              and $up->{'structure'}->{'section_up'}) {
         $up = $up->{'structure'}->{'section_up'};
       }
 
       # fastforward is the next element on same level than the upper parent
       # element.
-      if ($up->{'structure'}->{'level'} < 1 and $up->{'cmdname'} and 
$up->{'cmdname'} eq 'top'
+      if ($up->{'structure'}->{'section_level'} < 1
+          and $up->{'cmdname'} and $up->{'cmdname'} eq 'top'
           and $up->{'structure'}->{'section_childs'}
           and @{$up->{'structure'}->{'section_childs'}}) {
         $directions->{'FastForward'}
@@ -1153,7 +1157,7 @@ sub elements_directions($$$)
       # highest parent element
       if ($up and $up ne $section) {
         $directions->{'FastBack'} = $up->{'structure'}->{'associated_unit'};
-      } elsif ($section->{'structure'}->{'level'} <= 1) {
+      } elsif ($section->{'structure'}->{'section_level'} <= 1) {
         # the element is a top level element, we adjust the next
         # toplevel element fastback
         
$directions->{'FastForward'}->{'structure'}->{'directions'}->{'FastBack'}
@@ -1379,9 +1383,9 @@ sub number_floats($)
           $up = $up->{'structure'}->{'section_up'};
         }
         if (!$unnumbered_commands{$up->{'cmdname'}}) {
-          $nr_in_chapter{$up->{'structure'}->{'number'}}++;
-          $number = $up->{'structure'}->{'number'} .
-            '.' . $nr_in_chapter{$up->{'structure'}->{'number'}};
+          $nr_in_chapter{$up->{'structure'}->{'section_number'}}++;
+          $number = $up->{'structure'}->{'section_number'} .
+            '.' . $nr_in_chapter{$up->{'structure'}->{'section_number'}};
         }
       }
       $number = $float_index if (!defined($number));
@@ -1990,13 +1994,13 @@ It sets section elements C<structure> hash values:
 
 =over
 
-=item level
+=item section_level
 
 The level in the sectioning tree hierarchy.  0 is for C<@top> or
 C<@part>, 1 for C<@chapter>, C<@appendix>...  This level is corrected
 by C<@raisesections> and C<@lowersections>.
 
-=item number
+=item section_number
 
 The sectioning element number.
 
diff --git a/tp/Texinfo/XS/parsetexi/Parsetexi.pm 
b/tp/Texinfo/XS/parsetexi/Parsetexi.pm
index d3a7b46c15..b424f30137 100644
--- a/tp/Texinfo/XS/parsetexi/Parsetexi.pm
+++ b/tp/Texinfo/XS/parsetexi/Parsetexi.pm
@@ -78,7 +78,7 @@ sub parser (;$$)
         }
       } elsif ($key eq 'values') {
         for my $v (keys %{$conf->{'values'}}) {
-          if (!ref($conf->{'values'}->{$v})) {
+          if (ref($conf->{'values'}->{$v}) eq '') {
             store_value ($v, $conf->{'values'}->{$v});
           } else {
             warn "bug: non-scalar \@value\n";
diff --git a/tp/init/book.pm b/tp/init/book.pm
index 86d9d88a6c..4e3c53b283 100644
--- a/tp/init/book.pm
+++ b/tp/init/book.pm
@@ -195,7 +195,7 @@ sub book_convert_heading_command($$$$$)
   # if set, the id is associated to the heading text
   my $heading_id;
   if ($section) {
-    my $level = $section->{'structure'}->{'level'};
+    my $level = $section->{'structure'}->{'section_level'};
     $result .= join('', $self->close_registered_sections_level($level));
     $self->register_opened_section_level($level, "</div>\n");
 
@@ -236,8 +236,8 @@ sub book_convert_heading_command($$$$$)
         $heading_level = 3;
       }
     }
-  } elsif (defined $element->{'structure'}->{'level'}) {
-    $heading_level = $element->{'structure'}->{'level'};
+  } elsif (defined $element->{'structure'}->{'section_level'}) {
+    $heading_level = $element->{'structure'}->{'section_level'};
     # if the level was changed, set the command name right
     $cmdname_for_heading
       = Texinfo::Structuring::section_level_adjusted_command_name($element);
@@ -323,9 +323,9 @@ sub book_element_file_name($$$)
   return undef unless ($command);
   if ($converter->element_is_tree_unit_top($element)) {
     $new_file_name = "${prefix}_top.html";
-  } elsif (defined($command->{'structure'}->{'number'})
-           and ($command->{'structure'}->{'number'} ne '')) {
-    my $number = $command->{'structure'}->{'number'};
+  } elsif (defined($command->{'structure'}->{'section_number'})
+           and ($command->{'structure'}->{'section_number'} ne '')) {
+    my $number = $command->{'structure'}->{'section_number'};
     $number .= '.' unless ($number =~ /\.$/);
     $new_file_name = "${prefix}_$number" . 'html';
   } else {
diff --git a/tp/init/chm.pm b/tp/init/chm.pm
index bb228d98b2..fec2deada8 100644
--- a/tp/init/chm.pm
+++ b/tp/init/chm.pm
@@ -307,24 +307,25 @@ sub chm_init($)
 
   if ($self->{'structuring'} and $self->{'structuring'}->{'sectioning_root'}) {
     my $section_root = $self->{'structuring'}->{'sectioning_root'};
-    my $upper_level = 
$section_root->{'structure'}->{'section_childs'}->[0]->{'structure'}->{'level'};
+    my $upper_level = $section_root->{'structure'}->{'section_childs'}->[0]
+                                                   
->{'structure'}->{'section_level'};
     foreach my $top_section 
(@{$section_root->{'structure'}->{'section_childs'}}) {
-      $upper_level = $top_section->{'structure'}->{'level'}
-      if ($top_section->{'structure'}->{'level'} < $upper_level);
+      $upper_level = $top_section->{'structure'}->{'section_level'}
+      if ($top_section->{'structure'}->{'section_level'} < $upper_level);
     }
     $upper_level = 1 if ($upper_level <= 0);
     my $root_level = $upper_level - 1;
     my $level = $root_level;
     foreach my $section (@{$self->{'structuring'}->{'sections_list'}}) {
       next if ($section->{'cmdname'} eq 'part');
-      my $section_level = $section->{'structure'}->{'level'};
+      my $section_level = $section->{'structure'}->{'section_level'};
       $section_level = 1 if ($section_level == 0);
       if ($level < $section_level) {
         while ($level < $section_level) {
           print $hhc_fh "<UL>\n";
           $level++;
         }
-      } elsif ($level > $section->{'structure'}->{'level'}) {
+      } elsif ($level > $section->{'structure'}->{'section_level'}) {
         while ($level > $section_level) {
           print $hhc_fh "</UL>\n";
           $level--;
diff --git a/tp/init/epub3.pm b/tp/init/epub3.pm
index 03e37c922a..9a7f67610d 100644
--- a/tp/init/epub3.pm
+++ b/tp/init/epub3.pm
@@ -430,17 +430,18 @@ EOT
 
     # similar code as in chm.pm
     my $section_root = $self->{'structuring'}->{'sectioning_root'};
-    my $upper_level = 
$section_root->{'structure'}->{'section_childs'}->[0]->{'structure'}->{'level'};
+    my $upper_level = $section_root->{'structure'}->{'section_childs'}->[0]
+                                            ->{'structure'}->{'section_level'};
     foreach my $top_section 
(@{$section_root->{'structure'}->{'section_childs'}}) {
-      $upper_level = $top_section->{'structure'}->{'level'}
-      if ($top_section->{'structure'}->{'level'} < $upper_level);
+      $upper_level = $top_section->{'structure'}->{'section_level'}
+      if ($top_section->{'structure'}->{'section_level'} < $upper_level);
     }
     $upper_level = 1 if ($upper_level <= 0);
     my $root_level = $upper_level - 1;
     my $level = $root_level;
     foreach my $section (@{$self->{'structuring'}->{'sections_list'}}) {
       next if ($section->{'cmdname'} eq 'part');
-      my $section_level = $section->{'structure'}->{'level'};
+      my $section_level = $section->{'structure'}->{'section_level'};
       $section_level = 1 if ($section_level == 0);
       # FIXME with gaps in sectioning there could be nesting issues?
       if ($level < $section_level) {
@@ -449,7 +450,7 @@ EOT
           print $nav_fh "\n". " " x $level . "<ol>\n";
           $level++;
         }
-      } elsif ($level > $section->{'structure'}->{'level'}) {
+      } elsif ($level > $section->{'structure'}->{'section_level'}) {
         # on the same line as the a element for the first </li>
         print $nav_fh "</li>\n". " " x ($level -1) . "</ol>\n";
         $level--;
diff --git a/tp/t/results/converters_tests/ref_in_sectioning.pl 
b/tp/t/results/converters_tests/ref_in_sectioning.pl
index bc02f3dad1..5fb0972ca7 100644
--- a/tp/t/results/converters_tests/ref_in_sectioning.pl
+++ b/tp/t/results/converters_tests/ref_in_sectioning.pl
@@ -2108,7 +2108,6 @@ for example node (node) (Top)
 
 $result_sectioning{'ref_in_sectioning'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -2122,7 +2121,6 @@ $result_sectioning{'ref_in_sectioning'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -2136,8 +2134,8 @@ $result_sectioning{'ref_in_sectioning'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -2155,15 +2153,13 @@ $result_sectioning{'ref_in_sectioning'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 2,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '2.1',
+                      'section_level' => 2,
+                      'section_number' => '2.1',
                       'section_up' => {}
                     }
                   },
@@ -2171,8 +2167,8 @@ $result_sectioning{'ref_in_sectioning'} = {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '2.2',
+                      'section_level' => 2,
+                      'section_number' => '2.2',
                       'section_prev' => {},
                       'section_up' => {}
                     }
@@ -2181,8 +2177,8 @@ $result_sectioning{'ref_in_sectioning'} = {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '2.3',
+                      'section_level' => 2,
+                      'section_number' => '2.3',
                       'section_prev' => {},
                       'section_up' => {}
                     }
@@ -2191,8 +2187,8 @@ $result_sectioning{'ref_in_sectioning'} = {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '2.4',
+                      'section_level' => 2,
+                      'section_number' => '2.4',
                       'section_prev' => {},
                       'section_up' => {}
                     }
@@ -2201,8 +2197,8 @@ $result_sectioning{'ref_in_sectioning'} = {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '2.5',
+                      'section_level' => 2,
+                      'section_number' => '2.5',
                       'section_prev' => {},
                       'section_up' => {}
                     }
@@ -2211,8 +2207,8 @@ $result_sectioning{'ref_in_sectioning'} = {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '2.6',
+                      'section_level' => 2,
+                      'section_number' => '2.6',
                       'section_prev' => {},
                       'section_up' => {}
                     }
@@ -2221,8 +2217,8 @@ $result_sectioning{'ref_in_sectioning'} = {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '2.7',
+                      'section_level' => 2,
+                      'section_number' => '2.7',
                       'section_prev' => {},
                       'section_up' => {}
                     }
@@ -2231,8 +2227,8 @@ $result_sectioning{'ref_in_sectioning'} = {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '2.8',
+                      'section_level' => 2,
+                      'section_number' => '2.8',
                       'section_prev' => {},
                       'section_up' => {}
                     }
@@ -2241,8 +2237,8 @@ $result_sectioning{'ref_in_sectioning'} = {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '2.9',
+                      'section_level' => 2,
+                      'section_number' => '2.9',
                       'section_prev' => {},
                       'section_up' => {}
                     }
@@ -2251,8 +2247,8 @@ $result_sectioning{'ref_in_sectioning'} = {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '2.10',
+                      'section_level' => 2,
+                      'section_number' => '2.10',
                       'section_prev' => {},
                       'section_up' => {}
                     }
@@ -2261,8 +2257,8 @@ $result_sectioning{'ref_in_sectioning'} = {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '2.11',
+                      'section_level' => 2,
+                      'section_number' => '2.11',
                       'section_prev' => {},
                       'section_up' => {}
                     }
@@ -2271,13 +2267,15 @@ $result_sectioning{'ref_in_sectioning'} = {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '2.12',
+                      'section_level' => 2,
+                      'section_number' => '2.12',
                       'section_prev' => {},
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -2285,10 +2283,12 @@ $result_sectioning{'ref_in_sectioning'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'ref_in_sectioning'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'ref_in_sectioning'}{'structure'}{'section_childs'}[0];
@@ -2330,7 +2330,7 @@ $result_nodes{'ref_in_sectioning'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -2349,8 +2349,8 @@ $result_nodes{'ref_in_sectioning'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'node'
@@ -2363,8 +2363,8 @@ $result_nodes{'ref_in_sectioning'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 2
+                'section_level' => 1,
+                'section_number' => 2
               }
             },
             'normalized' => 'chap'
diff --git a/tp/t/results/converters_tests/refs_formatting.pl 
b/tp/t/results/converters_tests/refs_formatting.pl
index f9332c8126..43a36f4be7 100644
--- a/tp/t/results/converters_tests/refs_formatting.pl
+++ b/tp/t/results/converters_tests/refs_formatting.pl
@@ -4329,7 +4329,6 @@ $result_texts{'refs_formatting'} = '1 chapter
 
 $result_sectioning{'refs_formatting'} = {
   'structure' => {
-    'level' => 0,
     'section_childs' => [
       {
         'cmdname' => 'chapter',
@@ -4342,12 +4341,13 @@ $result_sectioning{'refs_formatting'} = {
           }
         },
         'structure' => {
-          'level' => 1,
-          'number' => 1,
+          'section_level' => 1,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 0
   }
 };
 
$result_sectioning{'refs_formatting'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'refs_formatting'};
@@ -4359,8 +4359,8 @@ $result_nodes{'refs_formatting'} = {
       'cmdname' => 'chapter',
       'extra' => {},
       'structure' => {
-        'level' => 1,
-        'number' => 1
+        'section_level' => 1,
+        'section_number' => 1
       }
     },
     'normalized' => 'chapter'
diff --git a/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl 
b/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
index 4d409ccec9..2c4ea925c4 100644
--- a/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
+++ b/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
@@ -1691,7 +1691,6 @@ see a strong ref with SC, a i trema i", a dotless i trema 
i" E=` and exclamdown
 
 $result_sectioning{'some_at_commands_in_ref_nodes'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1705,7 +1704,6 @@ $result_sectioning{'some_at_commands_in_ref_nodes'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1719,18 +1717,20 @@ $result_sectioning{'some_at_commands_in_ref_nodes'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'some_at_commands_in_ref_nodes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'some_at_commands_in_ref_nodes'}{'structure'}{'section_childs'}[0];
@@ -1745,7 +1745,7 @@ $result_nodes{'some_at_commands_in_ref_nodes'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1764,8 +1764,8 @@ $result_nodes{'some_at_commands_in_ref_nodes'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 
'A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl 
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index dc6e255c3b..f96e858319 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -3226,7 +3226,6 @@ fff2
 
 $result_sectioning{'test_deftypefnnewline'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -3240,7 +3239,6 @@ $result_sectioning{'test_deftypefnnewline'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -3254,18 +3252,20 @@ $result_sectioning{'test_deftypefnnewline'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'test_deftypefnnewline'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'test_deftypefnnewline'}{'structure'}{'section_childs'}[0];
@@ -3280,7 +3280,7 @@ $result_nodes{'test_deftypefnnewline'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -3293,8 +3293,8 @@ $result_nodes{'test_deftypefnnewline'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter'
diff --git a/tp/t/results/converters_tests/things_before_setfilename.pl 
b/tp/t/results/converters_tests/things_before_setfilename.pl
index 3a348ea2fa..d75a8695df 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -1358,7 +1358,6 @@ Anchor in footnote
 
 $result_sectioning{'things_before_setfilename'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1371,11 +1370,12 @@ $result_sectioning{'things_before_setfilename'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'things_before_setfilename'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'things_before_setfilename'};
@@ -1387,7 +1387,7 @@ $result_nodes{'things_before_setfilename'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl 
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index 36f167cf32..f8eea28f42 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -1032,7 +1032,6 @@ center! After punc
 
 $result_sectioning{'punctuation_in_line_commands'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1046,11 +1045,12 @@ $result_sectioning{'punctuation_in_line_commands'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'punctuation_in_line_commands'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'punctuation_in_line_commands'};
@@ -1062,7 +1062,7 @@ $result_nodes{'punctuation_in_line_commands'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'isindex' => 1,
@@ -1090,7 +1090,7 @@ $result_floats{'punctuation_in_line_commands'} = {
           'cmdname' => 'top',
           'extra' => {},
           'structure' => {
-            'level' => 0
+            'section_level' => 0
           }
         },
         'normalized' => 'float-label_0021-After-punc',
diff --git a/tp/t/results/coverage_braces/footnote_no_node.pl 
b/tp/t/results/coverage_braces/footnote_no_node.pl
index 5313e360c1..40afa1cac1 100644
--- a/tp/t/results/coverage_braces/footnote_no_node.pl
+++ b/tp/t/results/coverage_braces/footnote_no_node.pl
@@ -121,17 +121,17 @@ F.
 
 $result_sectioning{'footnote_no_node'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
         'extra' => {},
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'footnote_no_node'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'footnote_no_node'};
diff --git a/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl 
b/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
index 405cad4363..d037335318 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
@@ -680,7 +680,6 @@ D
 
 $result_sectioning{'two_footnotes_in_nodes'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -694,7 +693,6 @@ $result_sectioning{'two_footnotes_in_nodes'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -708,18 +706,20 @@ $result_sectioning{'two_footnotes_in_nodes'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'two_footnotes_in_nodes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'two_footnotes_in_nodes'}{'structure'}{'section_childs'}[0];
@@ -734,7 +734,7 @@ $result_nodes{'two_footnotes_in_nodes'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -753,8 +753,8 @@ $result_nodes{'two_footnotes_in_nodes'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter'
diff --git a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl 
b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
index dc4c9254fb..d90e6d78b7 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
@@ -716,7 +716,6 @@ D
 
 $result_sectioning{'two_footnotes_in_nodes_separate'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -730,7 +729,6 @@ $result_sectioning{'two_footnotes_in_nodes_separate'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -744,18 +742,20 @@ $result_sectioning{'two_footnotes_in_nodes_separate'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'two_footnotes_in_nodes_separate'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'two_footnotes_in_nodes_separate'}{'structure'}{'section_childs'}[0];
@@ -770,7 +770,7 @@ $result_nodes{'two_footnotes_in_nodes_separate'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -789,8 +789,8 @@ $result_nodes{'two_footnotes_in_nodes_separate'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter'
diff --git a/tp/t/results/docbook_tests/multiple_documentlanguage.pl 
b/tp/t/results/docbook_tests/multiple_documentlanguage.pl
index f4df6b8b2e..e074ea8b9f 100644
--- a/tp/t/results/docbook_tests/multiple_documentlanguage.pl
+++ b/tp/t/results/docbook_tests/multiple_documentlanguage.pl
@@ -626,7 +626,6 @@ top
 
 $result_sectioning{'multiple_documentlanguage'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -640,7 +639,6 @@ $result_sectioning{'multiple_documentlanguage'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -654,8 +652,8 @@ $result_sectioning{'multiple_documentlanguage'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -673,8 +671,6 @@ $result_sectioning{'multiple_documentlanguage'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 2,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -688,8 +684,8 @@ $result_sectioning{'multiple_documentlanguage'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '2.1',
+                      'section_level' => 2,
+                      'section_number' => '2.1',
                       'section_up' => {}
                     }
                   },
@@ -705,13 +701,15 @@ $result_sectioning{'multiple_documentlanguage'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '2.2',
+                      'section_level' => 2,
+                      'section_number' => '2.2',
                       'section_prev' => {},
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -719,10 +717,12 @@ $result_sectioning{'multiple_documentlanguage'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'multiple_documentlanguage'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'multiple_documentlanguage'}{'structure'}{'section_childs'}[0];
@@ -744,7 +744,7 @@ $result_nodes{'multiple_documentlanguage'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -757,8 +757,8 @@ $result_nodes{'multiple_documentlanguage'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chap'
@@ -771,8 +771,8 @@ $result_nodes{'multiple_documentlanguage'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 2
+                'section_level' => 1,
+                'section_number' => 2
               }
             },
             'normalized' => 'chapter-fr'
diff --git a/tp/t/results/docbook_tests/special_docbook_unnumbered.pl 
b/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
index 1606cb1403..1e40c3e4e9 100644
--- a/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
+++ b/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
@@ -942,7 +942,6 @@ Ack!
 
 $result_sectioning{'special_docbook_unnumbered'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -956,7 +955,6 @@ $result_sectioning{'special_docbook_unnumbered'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'unnumbered',
@@ -970,7 +968,7 @@ $result_sectioning{'special_docbook_unnumbered'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
+                'section_level' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -988,7 +986,7 @@ $result_sectioning{'special_docbook_unnumbered'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
+                'section_level' => 1,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1007,7 +1005,7 @@ $result_sectioning{'special_docbook_unnumbered'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
+                'section_level' => 1,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1026,8 +1024,8 @@ $result_sectioning{'special_docbook_unnumbered'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1035,10 +1033,12 @@ $result_sectioning{'special_docbook_unnumbered'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'special_docbook_unnumbered'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'special_docbook_unnumbered'}{'structure'}{'section_childs'}[0];
@@ -1065,7 +1065,7 @@ $result_nodes{'special_docbook_unnumbered'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1084,7 +1084,7 @@ $result_nodes{'special_docbook_unnumbered'} = {
           'cmdname' => 'unnumbered',
           'extra' => {},
           'structure' => {
-            'level' => 1
+            'section_level' => 1
           }
         },
         'normalized' => 'Dedication'
@@ -1097,7 +1097,7 @@ $result_nodes{'special_docbook_unnumbered'} = {
               'cmdname' => 'unnumbered',
               'extra' => {},
               'structure' => {
-                'level' => 1
+                'section_level' => 1
               }
             },
             'normalized' => 'preface'
@@ -1110,7 +1110,7 @@ $result_nodes{'special_docbook_unnumbered'} = {
                   'cmdname' => 'unnumbered',
                   'extra' => {},
                   'structure' => {
-                    'level' => 1
+                    'section_level' => 1
                   }
                 },
                 'normalized' => 'colophon'
@@ -1123,8 +1123,8 @@ $result_nodes{'special_docbook_unnumbered'} = {
                       'cmdname' => 'chapter',
                       'extra' => {},
                       'structure' => {
-                        'level' => 1,
-                        'number' => 1
+                        'section_level' => 1,
+                        'section_number' => 1
                       }
                     },
                     'normalized' => 'acknowledgements'
diff --git a/tp/t/results/float/complex_float.pl 
b/tp/t/results/float/complex_float.pl
index 4d5d6650fc..dbd5a10b51 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -4559,7 +4559,6 @@ text with a lot of features.
 
 $result_sectioning{'complex_float'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -4573,7 +4572,6 @@ $result_sectioning{'complex_float'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -4587,18 +4585,20 @@ $result_sectioning{'complex_float'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'complex_float'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'complex_float'}{'structure'}{'section_childs'}[0];
@@ -4613,7 +4613,7 @@ $result_nodes{'complex_float'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -4632,8 +4632,8 @@ $result_nodes{'complex_float'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter'
@@ -4690,7 +4690,7 @@ $result_floats{'complex_float'} = {
           'cmdname' => 'top',
           'extra' => {},
           'structure' => {
-            'level' => 0
+            'section_level' => 0
           }
         },
         'normalized' => 'text-with-a-lot-of-features',
@@ -4726,8 +4726,8 @@ $result_floats{'complex_float'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'float-with-a-lot-of-features-and-no-shortcaption',
diff --git a/tp/t/results/float/float_copying.pl 
b/tp/t/results/float/float_copying.pl
index 5100805849..c33d84cc42 100644
--- a/tp/t/results/float/float_copying.pl
+++ b/tp/t/results/float/float_copying.pl
@@ -1220,7 +1220,6 @@ Appendix A Copying and floats
 
 $result_sectioning{'float_copying'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1234,7 +1233,6 @@ $result_sectioning{'float_copying'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'appendix',
@@ -1249,18 +1247,20 @@ $result_sectioning{'float_copying'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 'A',
+                'section_level' => 1,
+                'section_number' => 'A',
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'float_copying'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'float_copying'}{'structure'}{'section_childs'}[0];
@@ -1275,7 +1275,7 @@ $result_nodes{'float_copying'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1294,8 +1294,8 @@ $result_nodes{'float_copying'} = {
           'cmdname' => 'appendix',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 'A'
+            'section_level' => 1,
+            'section_number' => 'A'
           }
         },
         'isindex' => 1,
diff --git a/tp/t/results/float/numbering_captions_listoffloats.pl 
b/tp/t/results/float/numbering_captions_listoffloats.pl
index 92e83c6dad..2d44e023d7 100644
--- a/tp/t/results/float/numbering_captions_listoffloats.pl
+++ b/tp/t/results/float/numbering_captions_listoffloats.pl
@@ -6709,7 +6709,6 @@ A ref to float without type label but no type.
 
 $result_sectioning{'numbering_captions_listoffloats'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -6723,7 +6722,6 @@ $result_sectioning{'numbering_captions_listoffloats'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -6737,8 +6735,6 @@ $result_sectioning{'numbering_captions_listoffloats'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -6752,12 +6748,14 @@ $result_sectioning{'numbering_captions_listoffloats'} = 
{
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -6775,7 +6773,6 @@ $result_sectioning{'numbering_captions_listoffloats'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -6789,11 +6786,12 @@ $result_sectioning{'numbering_captions_listoffloats'} = 
{
                       }
                     },
                     'structure' => {
-                      'level' => 2,
+                      'section_level' => 2,
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -6812,8 +6810,6 @@ $result_sectioning{'numbering_captions_listoffloats'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 2,
                 'section_childs' => [
                   {
                     'cmdname' => 'unnumberedsec',
@@ -6827,11 +6823,13 @@ $result_sectioning{'numbering_captions_listoffloats'} = 
{
                       }
                     },
                     'structure' => {
-                      'level' => 2,
+                      'section_level' => 2,
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -6850,8 +6848,8 @@ $result_sectioning{'numbering_captions_listoffloats'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 'A',
+                'section_level' => 1,
+                'section_number' => 'A',
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -6870,7 +6868,7 @@ $result_sectioning{'numbering_captions_listoffloats'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
+                'section_level' => 1,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -6878,10 +6876,12 @@ $result_sectioning{'numbering_captions_listoffloats'} = 
{
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'numbering_captions_listoffloats'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'numbering_captions_listoffloats'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -6915,7 +6915,7 @@ $result_nodes{'numbering_captions_listoffloats'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -6934,8 +6934,8 @@ $result_nodes{'numbering_captions_listoffloats'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
@@ -6954,8 +6954,8 @@ $result_nodes{'numbering_captions_listoffloats'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'section_level' => 2,
+                'section_number' => '1.1'
               }
             },
             'normalized' => 'section'
@@ -6971,7 +6971,7 @@ $result_nodes{'numbering_captions_listoffloats'} = {
               'cmdname' => 'unnumbered',
               'extra' => {},
               'structure' => {
-                'level' => 1
+                'section_level' => 1
               }
             },
             'menus' => [
@@ -6990,7 +6990,7 @@ $result_nodes{'numbering_captions_listoffloats'} = {
                   'cmdname' => 'section',
                   'extra' => {},
                   'structure' => {
-                    'level' => 2
+                    'section_level' => 2
                   }
                 },
                 'normalized' => 'Section-within-unnumbered'
@@ -7006,8 +7006,8 @@ $result_nodes{'numbering_captions_listoffloats'} = {
                   'cmdname' => 'chapter',
                   'extra' => {},
                   'structure' => {
-                    'level' => 1,
-                    'number' => 2
+                    'section_level' => 1,
+                    'section_number' => 2
                   }
                 },
                 'menus' => [
@@ -7026,7 +7026,7 @@ $result_nodes{'numbering_captions_listoffloats'} = {
                       'cmdname' => 'unnumberedsec',
                       'extra' => {},
                       'structure' => {
-                        'level' => 2
+                        'section_level' => 2
                       }
                     },
                     'normalized' => 'unnumbered-sec'
@@ -7042,8 +7042,8 @@ $result_nodes{'numbering_captions_listoffloats'} = {
                       'cmdname' => 'appendix',
                       'extra' => {},
                       'structure' => {
-                        'level' => 1,
-                        'number' => 'A'
+                        'section_level' => 1,
+                        'section_number' => 'A'
                       }
                     },
                     'normalized' => 'Appendix-for-float'
@@ -7056,7 +7056,7 @@ $result_nodes{'numbering_captions_listoffloats'} = {
                           'cmdname' => 'unnumbered',
                           'extra' => {},
                           'structure' => {
-                            'level' => 1
+                            'section_level' => 1
                           }
                         },
                         'normalized' => 'list-of-floats'
@@ -7239,7 +7239,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'cmdname' => 'top',
           'extra' => {},
           'structure' => {
-            'level' => 0
+            'section_level' => 0
           }
         },
         'normalized' => 'label-but-no-type',
@@ -7340,8 +7340,8 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'label-but-no-type-in-chapter',
@@ -7372,7 +7372,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'cmdname' => 'unnumbered',
           'extra' => {},
           'structure' => {
-            'level' => 1
+            'section_level' => 1
           }
         },
         'normalized' => 'label-but-no-type-in-unnumbered',
@@ -7403,7 +7403,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'cmdname' => 'unnumberedsec',
           'extra' => {},
           'structure' => {
-            'level' => 2
+            'section_level' => 2
           }
         },
         'normalized' => 'label-but-no-type-in-unnumbered-subsec-in-chapter',
@@ -7535,8 +7535,8 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'cmdname' => 'section',
           'extra' => {},
           'structure' => {
-            'level' => 2,
-            'number' => '1.1'
+            'section_level' => 2,
+            'section_number' => '1.1'
           }
         },
         'normalized' => 'text-in-section',
@@ -7596,7 +7596,7 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'cmdname' => 'section',
           'extra' => {},
           'structure' => {
-            'level' => 2
+            'section_level' => 2
           }
         },
         'normalized' => 'Section-within-unnumbered-float',
@@ -7632,8 +7632,8 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 2
+            'section_level' => 1,
+            'section_number' => 2
           }
         },
         'normalized' => 'Chapter-with-subsec-float',
@@ -7699,8 +7699,8 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'cmdname' => 'appendix',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 'A'
+            'section_level' => 1,
+            'section_number' => 'A'
           }
         },
         'normalized' => 'appendix-sec-float',
diff --git a/tp/t/results/formats_encodings/accent.pl 
b/tp/t/results/formats_encodings/accent.pl
index 9389858509..c84812f31b 100644
--- a/tp/t/results/formats_encodings/accent.pl
+++ b/tp/t/results/formats_encodings/accent.pl
@@ -3120,7 +3120,6 @@ should be dotless j": j"
 
 $result_sectioning{'accent'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -3133,11 +3132,12 @@ $result_sectioning{'accent'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'accent'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'accent'};
@@ -3149,7 +3149,7 @@ $result_nodes{'accent'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top-node'
diff --git a/tp/t/results/formats_encodings/accent_enable_encoding.pl 
b/tp/t/results/formats_encodings/accent_enable_encoding.pl
index 8711313d48..da055b56e1 100644
--- a/tp/t/results/formats_encodings/accent_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accent_enable_encoding.pl
@@ -3120,7 +3120,6 @@ should be dotless j": j"
 
 $result_sectioning{'accent_enable_encoding'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -3133,11 +3132,12 @@ $result_sectioning{'accent_enable_encoding'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'accent_enable_encoding'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'accent_enable_encoding'};
@@ -3149,7 +3149,7 @@ $result_nodes{'accent_enable_encoding'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top-node'
diff --git a/tp/t/results/formats_encodings/accentenc.pl 
b/tp/t/results/formats_encodings/accentenc.pl
index 00e2e0c4c0..7ff2ee1b7c 100644
--- a/tp/t/results/formats_encodings/accentenc.pl
+++ b/tp/t/results/formats_encodings/accentenc.pl
@@ -3165,7 +3165,6 @@ should be dotless j": j"
 
 $result_sectioning{'accentenc'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -3178,11 +3177,12 @@ $result_sectioning{'accentenc'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'accentenc'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'accentenc'};
@@ -3194,7 +3194,7 @@ $result_nodes{'accentenc'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top-node'
diff --git a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl 
b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
index cf6f4bf7af..649f880a06 100644
--- a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
@@ -3165,7 +3165,6 @@ should be dotless j": j"
 
 $result_sectioning{'accentenc_enable_encoding'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -3178,11 +3177,12 @@ $result_sectioning{'accentenc_enable_encoding'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'accentenc_enable_encoding'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'accentenc_enable_encoding'};
@@ -3194,7 +3194,7 @@ $result_nodes{'accentenc_enable_encoding'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top-node'
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs.pl 
b/tp/t/results/formats_encodings/at_commands_in_refs.pl
index 007258a3a0..228d5d0b27 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -21022,7 +21022,6 @@ http://somewhere_aaa url (text) ls
 
 $result_sectioning{'at_commands_in_refs'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -21036,7 +21035,6 @@ $result_sectioning{'at_commands_in_refs'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -21050,8 +21048,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -21069,8 +21067,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 2,
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21089,8 +21087,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 3,
+                'section_level' => 1,
+                'section_number' => 3,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21109,8 +21107,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 4,
+                'section_level' => 1,
+                'section_number' => 4,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21129,8 +21127,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 5,
+                'section_level' => 1,
+                'section_number' => 5,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21149,8 +21147,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 6,
+                'section_level' => 1,
+                'section_number' => 6,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21169,8 +21167,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 7,
+                'section_level' => 1,
+                'section_number' => 7,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21189,8 +21187,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 8,
+                'section_level' => 1,
+                'section_number' => 8,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21209,8 +21207,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 9,
+                'section_level' => 1,
+                'section_number' => 9,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21229,8 +21227,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 10,
+                'section_level' => 1,
+                'section_number' => 10,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21249,8 +21247,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 11,
+                'section_level' => 1,
+                'section_number' => 11,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21269,8 +21267,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 12,
+                'section_level' => 1,
+                'section_number' => 12,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21289,8 +21287,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 13,
+                'section_level' => 1,
+                'section_number' => 13,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21309,8 +21307,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 14,
+                'section_level' => 1,
+                'section_number' => 14,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21329,8 +21327,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 15,
+                'section_level' => 1,
+                'section_number' => 15,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21349,8 +21347,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 16,
+                'section_level' => 1,
+                'section_number' => 16,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21369,8 +21367,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 17,
+                'section_level' => 1,
+                'section_number' => 17,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21389,8 +21387,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 18,
+                'section_level' => 1,
+                'section_number' => 18,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21409,8 +21407,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 19,
+                'section_level' => 1,
+                'section_number' => 19,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21429,8 +21427,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 20,
+                'section_level' => 1,
+                'section_number' => 20,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21449,8 +21447,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 21,
+                'section_level' => 1,
+                'section_number' => 21,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21469,8 +21467,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 22,
+                'section_level' => 1,
+                'section_number' => 22,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21489,8 +21487,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 23,
+                'section_level' => 1,
+                'section_number' => 23,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21509,8 +21507,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 24,
+                'section_level' => 1,
+                'section_number' => 24,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21529,8 +21527,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 25,
+                'section_level' => 1,
+                'section_number' => 25,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21549,8 +21547,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 26,
+                'section_level' => 1,
+                'section_number' => 26,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21569,8 +21567,8 @@ $result_sectioning{'at_commands_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 27,
+                'section_level' => 1,
+                'section_number' => 27,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21578,10 +21576,12 @@ $result_sectioning{'at_commands_in_refs'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'at_commands_in_refs'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'at_commands_in_refs'}{'structure'}{'section_childs'}[0];
@@ -21700,7 +21700,7 @@ $result_nodes{'at_commands_in_refs'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -21719,8 +21719,8 @@ $result_nodes{'at_commands_in_refs'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => '-_007b-_007d'
@@ -21733,8 +21733,8 @@ $result_nodes{'at_commands_in_refs'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 2
+                'section_level' => 1,
+                'section_number' => 2
               }
             },
             'normalized' => '----_0021---_002e--_002e-_003f-_0040'
@@ -21747,8 +21747,8 @@ $result_nodes{'at_commands_in_refs'} = {
                   'cmdname' => 'chapter',
                   'extra' => {},
                   'structure' => {
-                    'level' => 1,
-                    'number' => 3
+                    'section_level' => 1,
+                    'section_number' => 3
                   }
                 },
                 'normalized' => '_0040-_007b-_007d-_005c-_0023'
@@ -21761,8 +21761,8 @@ $result_nodes{'at_commands_in_refs'} = {
                       'cmdname' => 'chapter',
                       'extra' => {},
                       'structure' => {
-                        'level' => 1,
-                        'number' => 4
+                        'section_level' => 1,
+                        'section_number' => 4
                       }
                     },
                     'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
@@ -21775,8 +21775,8 @@ $result_nodes{'at_commands_in_refs'} = {
                           'cmdname' => 'chapter',
                           'extra' => {},
                           'structure' => {
-                            'level' => 1,
-                            'number' => 5
+                            'section_level' => 1,
+                            'section_number' => 5
                           }
                         },
                         'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
@@ -21789,8 +21789,8 @@ $result_nodes{'at_commands_in_refs'} = {
                               'cmdname' => 'chapter',
                               'extra' => {},
                               'structure' => {
-                                'level' => 1,
-                                'number' => 6
+                                'section_level' => 1,
+                                'section_number' => 6
                               }
                             },
                             'normalized' => '_2265-_2264-_2192'
@@ -21803,8 +21803,8 @@ $result_nodes{'at_commands_in_refs'} = {
                                   'cmdname' => 'chapter',
                                   'extra' => {},
                                   'structure' => {
-                                    'level' => 1,
-                                    'number' => 7
+                                    'section_level' => 1,
+                                    'section_number' => 7
                                   }
                                 },
                                 'normalized' => 
'_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae'
@@ -21817,8 +21817,8 @@ $result_nodes{'at_commands_in_refs'} = {
                                       'cmdname' => 'chapter',
                                       'extra' => {},
                                       'structure' => {
-                                        'level' => 1,
-                                        'number' => 8
+                                        'section_level' => 1,
+                                        'section_number' => 8
                                       }
                                     },
                                     'normalized' => '_21d2-_00b0-a-b--_00e5'
@@ -21831,8 +21831,8 @@ $result_nodes{'at_commands_in_refs'} = {
                                           'cmdname' => 'chapter',
                                           'extra' => {},
                                           'structure' => {
-                                            'level' => 1,
-                                            'number' => 9
+                                            'section_level' => 1,
+                                            'section_number' => 9
                                           }
                                         },
                                         'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
@@ -21845,8 +21845,8 @@ $result_nodes{'at_commands_in_refs'} = {
                                               'cmdname' => 'chapter',
                                               'extra' => {},
                                               'structure' => {
-                                                'level' => 1,
-                                                'number' => 10
+                                                'section_level' => 1,
+                                                'section_number' => 10
                                               }
                                             },
                                             'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
@@ -21859,8 +21859,8 @@ $result_nodes{'at_commands_in_refs'} = {
                                                   'cmdname' => 'chapter',
                                                   'extra' => {},
                                                   'structure' => {
-                                                    'level' => 1,
-                                                    'number' => 11
+                                                    'section_level' => 1,
+                                                    'section_number' => 11
                                                   }
                                                 },
                                                 'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
@@ -21873,8 +21873,8 @@ $result_nodes{'at_commands_in_refs'} = {
                                                       'cmdname' => 'chapter',
                                                       'extra' => {},
                                                       'structure' => {
-                                                        'level' => 1,
-                                                        'number' => 12
+                                                        'section_level' => 1,
+                                                        'section_number' => 12
                                                       }
                                                     },
                                                     'normalized' => 
'_0131-_1e14-_1e08'
@@ -21887,8 +21887,8 @@ $result_nodes{'at_commands_in_refs'} = {
                                                           'cmdname' => 
'chapter',
                                                           'extra' => {},
                                                           'structure' => {
-                                                            'level' => 1,
-                                                            'number' => 13
+                                                            'section_level' => 
1,
+                                                            'section_number' 
=> 13
                                                           }
                                                         },
                                                         'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a'
@@ -21901,8 +21901,8 @@ $result_nodes{'at_commands_in_refs'} = {
                                                               'cmdname' => 
'chapter',
                                                               'extra' => {},
                                                               'structure' => {
-                                                                'level' => 1,
-                                                                'number' => 14
+                                                                
'section_level' => 1,
+                                                                
'section_number' => 14
                                                               }
                                                             },
                                                             'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a'
@@ -21915,8 +21915,8 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                   'cmdname' => 
'chapter',
                                                                   'extra' => 
{},
                                                                   'structure' 
=> {
-                                                                    'level' => 
1,
-                                                                    'number' 
=> 15
+                                                                    
'section_level' => 1,
+                                                                    
'section_number' => 15
                                                                   }
                                                                 },
                                                                 'normalized' 
=> '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
@@ -21929,8 +21929,8 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                       
'cmdname' => 'chapter',
                                                                       'extra' 
=> {},
                                                                       
'structure' => {
-                                                                        
'level' => 1,
-                                                                        
'number' => 16
+                                                                        
'section_level' => 1,
+                                                                        
'section_number' => 16
                                                                       }
                                                                     },
                                                                     
'normalized' => 'AAA-AAA-BBB'
@@ -21943,8 +21943,8 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                           
'cmdname' => 'chapter',
                                                                           
'extra' => {},
                                                                           
'structure' => {
-                                                                            
'level' => 1,
-                                                                            
'number' => 17
+                                                                            
'section_level' => 1,
+                                                                            
'section_number' => 17
                                                                           }
                                                                         },
                                                                         
'normalized' => 'CCC-CCC-DDD'
@@ -21957,8 +21957,8 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                               
'cmdname' => 'chapter',
                                                                               
'extra' => {},
                                                                               
'structure' => {
-                                                                               
 'level' => 1,
-                                                                               
 'number' => 18
+                                                                               
 'section_level' => 1,
+                                                                               
 'section_number' => 18
                                                                               }
                                                                             },
                                                                             
'normalized' => 'someone_0040somewher-no_005fexplain_0040there'
@@ -21971,8 +21971,8 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                                
   'cmdname' => 'chapter',
                                                                                
   'extra' => {},
                                                                                
   'structure' => {
-                                                                               
     'level' => 1,
-                                                                               
     'number' => 19
+                                                                               
     'section_level' => 1,
+                                                                               
     'section_number' => 19
                                                                                
   }
                                                                                
 },
                                                                                
 'normalized' => 'f_002d_002dile1-f_002d_002dile'
@@ -21985,8 +21985,8 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                                
       'cmdname' => 'chapter',
                                                                                
       'extra' => {},
                                                                                
       'structure' => {
-                                                                               
         'level' => 1,
-                                                                               
         'number' => 20
+                                                                               
         'section_level' => 1,
+                                                                               
         'section_number' => 20
                                                                                
       }
                                                                                
     },
                                                                                
     'normalized' => '-_0040-_007b_007d-_002e-'
@@ -21999,8 +21999,8 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                                
           'cmdname' => 'chapter',
                                                                                
           'extra' => {},
                                                                                
           'structure' => {
-                                                                               
             'level' => 1,
-                                                                               
             'number' => 21
+                                                                               
             'section_level' => 1,
+                                                                               
             'section_number' => 21
                                                                                
           }
                                                                                
         },
                                                                                
         'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
@@ -22013,8 +22013,8 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                                
               'cmdname' => 'chapter',
                                                                                
               'extra' => {},
                                                                                
               'structure' => {
-                                                                               
                 'level' => 1,
-                                                                               
                 'number' => 22
+                                                                               
                 'section_level' => 1,
+                                                                               
                 'section_number' => 22
                                                                                
               }
                                                                                
             },
                                                                                
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC'
@@ -22027,8 +22027,8 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                                
                   'cmdname' => 'chapter',
                                                                                
                   'extra' => {},
                                                                                
                   'structure' => {
-                                                                               
                     'level' => 1,
-                                                                               
                     'number' => 23
+                                                                               
                     'section_level' => 1,
+                                                                               
                     'section_number' => 23
                                                                                
                   }
                                                                                
                 },
                                                                                
                 'normalized' => '8_002e27in'
@@ -22041,8 +22041,8 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                                
                       'cmdname' => 'chapter',
                                                                                
                       'extra' => {},
                                                                                
                       'structure' => {
-                                                                               
                         'level' => 1,
-                                                                               
                         'number' => 24
+                                                                               
                         'section_level' => 1,
+                                                                               
                         'section_number' => 24
                                                                                
                       }
                                                                                
                     },
                                                                                
                     'normalized' => 'sansserif-slanted'
@@ -22055,8 +22055,8 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                                
                           'cmdname' => 'chapter',
                                                                                
                           'extra' => {},
                                                                                
                           'structure' => {
-                                                                               
                             'level' => 1,
-                                                                               
                             'number' => 25
+                                                                               
                             'section_level' => 1,
+                                                                               
                             'section_number' => 25
                                                                                
                           }
                                                                                
                         },
                                                                                
                         'normalized' => 'indicateurl'
@@ -22069,8 +22069,8 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                                
                               'cmdname' => 'chapter',
                                                                                
                               'extra' => {},
                                                                                
                               'structure' => {
-                                                                               
                                 'level' => 1,
-                                                                               
                                 'number' => 26
+                                                                               
                                 'section_level' => 1,
+                                                                               
                                 'section_number' => 26
                                                                                
                               }
                                                                                
                             },
                                                                                
                             'normalized' => 'gH-3rd'
@@ -22083,8 +22083,8 @@ $result_nodes{'at_commands_in_refs'} = {
                                                                                
                                   'cmdname' => 'chapter',
                                                                                
                                   'extra' => {},
                                                                                
                                   'structure' => {
-                                                                               
                                     'level' => 1,
-                                                                               
                                     'number' => 27
+                                                                               
                                     'section_level' => 1,
+                                                                               
                                     'section_number' => 27
                                                                                
                                   }
                                                                                
                                 },
                                                                                
                                 'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl
index 18b0d83742..48e12a0bc3 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl
@@ -21100,7 +21100,6 @@ http://somewhere_aaa url (text) ls
 
 $result_sectioning{'at_commands_in_refs_latin1'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -21114,7 +21113,6 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -21128,8 +21126,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -21147,8 +21145,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 2,
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21167,8 +21165,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 3,
+                'section_level' => 1,
+                'section_number' => 3,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21187,8 +21185,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 4,
+                'section_level' => 1,
+                'section_number' => 4,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21207,8 +21205,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 5,
+                'section_level' => 1,
+                'section_number' => 5,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21227,8 +21225,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 6,
+                'section_level' => 1,
+                'section_number' => 6,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21247,8 +21245,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 7,
+                'section_level' => 1,
+                'section_number' => 7,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21267,8 +21265,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 8,
+                'section_level' => 1,
+                'section_number' => 8,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21287,8 +21285,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 9,
+                'section_level' => 1,
+                'section_number' => 9,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21307,8 +21305,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 10,
+                'section_level' => 1,
+                'section_number' => 10,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21327,8 +21325,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 11,
+                'section_level' => 1,
+                'section_number' => 11,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21347,8 +21345,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 12,
+                'section_level' => 1,
+                'section_number' => 12,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21367,8 +21365,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 13,
+                'section_level' => 1,
+                'section_number' => 13,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21387,8 +21385,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 14,
+                'section_level' => 1,
+                'section_number' => 14,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21407,8 +21405,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 15,
+                'section_level' => 1,
+                'section_number' => 15,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21427,8 +21425,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 16,
+                'section_level' => 1,
+                'section_number' => 16,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21447,8 +21445,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 17,
+                'section_level' => 1,
+                'section_number' => 17,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21467,8 +21465,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 18,
+                'section_level' => 1,
+                'section_number' => 18,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21487,8 +21485,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 19,
+                'section_level' => 1,
+                'section_number' => 19,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21507,8 +21505,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 20,
+                'section_level' => 1,
+                'section_number' => 20,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21527,8 +21525,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 21,
+                'section_level' => 1,
+                'section_number' => 21,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21547,8 +21545,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 22,
+                'section_level' => 1,
+                'section_number' => 22,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21567,8 +21565,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 23,
+                'section_level' => 1,
+                'section_number' => 23,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21587,8 +21585,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 24,
+                'section_level' => 1,
+                'section_number' => 24,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21607,8 +21605,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 25,
+                'section_level' => 1,
+                'section_number' => 25,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21627,8 +21625,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 26,
+                'section_level' => 1,
+                'section_number' => 26,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21647,8 +21645,8 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 27,
+                'section_level' => 1,
+                'section_number' => 27,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21656,10 +21654,12 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'at_commands_in_refs_latin1'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'at_commands_in_refs_latin1'}{'structure'}{'section_childs'}[0];
@@ -21778,7 +21778,7 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -21797,8 +21797,8 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => '-_007b-_007d'
@@ -21811,8 +21811,8 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 2
+                'section_level' => 1,
+                'section_number' => 2
               }
             },
             'normalized' => '----_0021---_002e--_002e-_003f-_0040'
@@ -21825,8 +21825,8 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                   'cmdname' => 'chapter',
                   'extra' => {},
                   'structure' => {
-                    'level' => 1,
-                    'number' => 3
+                    'section_level' => 1,
+                    'section_number' => 3
                   }
                 },
                 'normalized' => '_0040-_007b-_007d-_005c-_0023'
@@ -21839,8 +21839,8 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                       'cmdname' => 'chapter',
                       'extra' => {},
                       'structure' => {
-                        'level' => 1,
-                        'number' => 4
+                        'section_level' => 1,
+                        'section_number' => 4
                       }
                     },
                     'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
@@ -21853,8 +21853,8 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                           'cmdname' => 'chapter',
                           'extra' => {},
                           'structure' => {
-                            'level' => 1,
-                            'number' => 5
+                            'section_level' => 1,
+                            'section_number' => 5
                           }
                         },
                         'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
@@ -21867,8 +21867,8 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                               'cmdname' => 'chapter',
                               'extra' => {},
                               'structure' => {
-                                'level' => 1,
-                                'number' => 6
+                                'section_level' => 1,
+                                'section_number' => 6
                               }
                             },
                             'normalized' => '_2265-_2264-_2192'
@@ -21881,8 +21881,8 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                   'cmdname' => 'chapter',
                                   'extra' => {},
                                   'structure' => {
-                                    'level' => 1,
-                                    'number' => 7
+                                    'section_level' => 1,
+                                    'section_number' => 7
                                   }
                                 },
                                 'normalized' => 
'_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae'
@@ -21895,8 +21895,8 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                       'cmdname' => 'chapter',
                                       'extra' => {},
                                       'structure' => {
-                                        'level' => 1,
-                                        'number' => 8
+                                        'section_level' => 1,
+                                        'section_number' => 8
                                       }
                                     },
                                     'normalized' => '_21d2-_00b0-a-b--_00e5'
@@ -21909,8 +21909,8 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                           'cmdname' => 'chapter',
                                           'extra' => {},
                                           'structure' => {
-                                            'level' => 1,
-                                            'number' => 9
+                                            'section_level' => 1,
+                                            'section_number' => 9
                                           }
                                         },
                                         'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
@@ -21923,8 +21923,8 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                               'cmdname' => 'chapter',
                                               'extra' => {},
                                               'structure' => {
-                                                'level' => 1,
-                                                'number' => 10
+                                                'section_level' => 1,
+                                                'section_number' => 10
                                               }
                                             },
                                             'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
@@ -21937,8 +21937,8 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                   'cmdname' => 'chapter',
                                                   'extra' => {},
                                                   'structure' => {
-                                                    'level' => 1,
-                                                    'number' => 11
+                                                    'section_level' => 1,
+                                                    'section_number' => 11
                                                   }
                                                 },
                                                 'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
@@ -21951,8 +21951,8 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                       'cmdname' => 'chapter',
                                                       'extra' => {},
                                                       'structure' => {
-                                                        'level' => 1,
-                                                        'number' => 12
+                                                        'section_level' => 1,
+                                                        'section_number' => 12
                                                       }
                                                     },
                                                     'normalized' => 
'_0131-_1e14-_1e08'
@@ -21965,8 +21965,8 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                           'cmdname' => 
'chapter',
                                                           'extra' => {},
                                                           'structure' => {
-                                                            'level' => 1,
-                                                            'number' => 13
+                                                            'section_level' => 
1,
+                                                            'section_number' 
=> 13
                                                           }
                                                         },
                                                         'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a'
@@ -21979,8 +21979,8 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                               'cmdname' => 
'chapter',
                                                               'extra' => {},
                                                               'structure' => {
-                                                                'level' => 1,
-                                                                'number' => 14
+                                                                
'section_level' => 1,
+                                                                
'section_number' => 14
                                                               }
                                                             },
                                                             'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a'
@@ -21993,8 +21993,8 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                   'cmdname' => 
'chapter',
                                                                   'extra' => 
{},
                                                                   'structure' 
=> {
-                                                                    'level' => 
1,
-                                                                    'number' 
=> 15
+                                                                    
'section_level' => 1,
+                                                                    
'section_number' => 15
                                                                   }
                                                                 },
                                                                 'normalized' 
=> '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
@@ -22007,8 +22007,8 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                       
'cmdname' => 'chapter',
                                                                       'extra' 
=> {},
                                                                       
'structure' => {
-                                                                        
'level' => 1,
-                                                                        
'number' => 16
+                                                                        
'section_level' => 1,
+                                                                        
'section_number' => 16
                                                                       }
                                                                     },
                                                                     
'normalized' => 'AAA-AAA-BBB'
@@ -22021,8 +22021,8 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                           
'cmdname' => 'chapter',
                                                                           
'extra' => {},
                                                                           
'structure' => {
-                                                                            
'level' => 1,
-                                                                            
'number' => 17
+                                                                            
'section_level' => 1,
+                                                                            
'section_number' => 17
                                                                           }
                                                                         },
                                                                         
'normalized' => 'CCC-CCC-DDD'
@@ -22035,8 +22035,8 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                               
'cmdname' => 'chapter',
                                                                               
'extra' => {},
                                                                               
'structure' => {
-                                                                               
 'level' => 1,
-                                                                               
 'number' => 18
+                                                                               
 'section_level' => 1,
+                                                                               
 'section_number' => 18
                                                                               }
                                                                             },
                                                                             
'normalized' => 'someone_0040somewher-no_005fexplain_0040there'
@@ -22049,8 +22049,8 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                                
   'cmdname' => 'chapter',
                                                                                
   'extra' => {},
                                                                                
   'structure' => {
-                                                                               
     'level' => 1,
-                                                                               
     'number' => 19
+                                                                               
     'section_level' => 1,
+                                                                               
     'section_number' => 19
                                                                                
   }
                                                                                
 },
                                                                                
 'normalized' => 'f_002d_002dile1-f_002d_002dile'
@@ -22063,8 +22063,8 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                                
       'cmdname' => 'chapter',
                                                                                
       'extra' => {},
                                                                                
       'structure' => {
-                                                                               
         'level' => 1,
-                                                                               
         'number' => 20
+                                                                               
         'section_level' => 1,
+                                                                               
         'section_number' => 20
                                                                                
       }
                                                                                
     },
                                                                                
     'normalized' => '-_0040-_007b_007d-_002e-'
@@ -22077,8 +22077,8 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                                
           'cmdname' => 'chapter',
                                                                                
           'extra' => {},
                                                                                
           'structure' => {
-                                                                               
             'level' => 1,
-                                                                               
             'number' => 21
+                                                                               
             'section_level' => 1,
+                                                                               
             'section_number' => 21
                                                                                
           }
                                                                                
         },
                                                                                
         'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
@@ -22091,8 +22091,8 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                                
               'cmdname' => 'chapter',
                                                                                
               'extra' => {},
                                                                                
               'structure' => {
-                                                                               
                 'level' => 1,
-                                                                               
                 'number' => 22
+                                                                               
                 'section_level' => 1,
+                                                                               
                 'section_number' => 22
                                                                                
               }
                                                                                
             },
                                                                                
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC'
@@ -22105,8 +22105,8 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                                
                   'cmdname' => 'chapter',
                                                                                
                   'extra' => {},
                                                                                
                   'structure' => {
-                                                                               
                     'level' => 1,
-                                                                               
                     'number' => 23
+                                                                               
                     'section_level' => 1,
+                                                                               
                     'section_number' => 23
                                                                                
                   }
                                                                                
                 },
                                                                                
                 'normalized' => '8_002e27in'
@@ -22119,8 +22119,8 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                                
                       'cmdname' => 'chapter',
                                                                                
                       'extra' => {},
                                                                                
                       'structure' => {
-                                                                               
                         'level' => 1,
-                                                                               
                         'number' => 24
+                                                                               
                         'section_level' => 1,
+                                                                               
                         'section_number' => 24
                                                                                
                       }
                                                                                
                     },
                                                                                
                     'normalized' => 'sansserif-slanted'
@@ -22133,8 +22133,8 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                                
                           'cmdname' => 'chapter',
                                                                                
                           'extra' => {},
                                                                                
                           'structure' => {
-                                                                               
                             'level' => 1,
-                                                                               
                             'number' => 25
+                                                                               
                             'section_level' => 1,
+                                                                               
                             'section_number' => 25
                                                                                
                           }
                                                                                
                         },
                                                                                
                         'normalized' => 'indicateurl'
@@ -22147,8 +22147,8 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                                
                               'cmdname' => 'chapter',
                                                                                
                               'extra' => {},
                                                                                
                               'structure' => {
-                                                                               
                                 'level' => 1,
-                                                                               
                                 'number' => 26
+                                                                               
                                 'section_level' => 1,
+                                                                               
                                 'section_number' => 26
                                                                                
                               }
                                                                                
                             },
                                                                                
                             'normalized' => 'gH-3rd'
@@ -22161,8 +22161,8 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                                                
                                   'cmdname' => 'chapter',
                                                                                
                                   'extra' => {},
                                                                                
                                   'structure' => {
-                                                                               
                                     'level' => 1,
-                                                                               
                                     'number' => 27
+                                                                               
                                     'section_level' => 1,
+                                                                               
                                     'section_number' => 27
                                                                                
                                   }
                                                                                
                                 },
                                                                                
                                 'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl
index f126ba7302..8b12b9fdae 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl
@@ -21100,7 +21100,6 @@ http://somewhere_aaa url (text) ls
 
 $result_sectioning{'at_commands_in_refs_utf8'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -21114,7 +21113,6 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -21128,8 +21126,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -21147,8 +21145,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 2,
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21167,8 +21165,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 3,
+                'section_level' => 1,
+                'section_number' => 3,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21187,8 +21185,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 4,
+                'section_level' => 1,
+                'section_number' => 4,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21207,8 +21205,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 5,
+                'section_level' => 1,
+                'section_number' => 5,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21227,8 +21225,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 6,
+                'section_level' => 1,
+                'section_number' => 6,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21247,8 +21245,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 7,
+                'section_level' => 1,
+                'section_number' => 7,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21267,8 +21265,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 8,
+                'section_level' => 1,
+                'section_number' => 8,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21287,8 +21285,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 9,
+                'section_level' => 1,
+                'section_number' => 9,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21307,8 +21305,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 10,
+                'section_level' => 1,
+                'section_number' => 10,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21327,8 +21325,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 11,
+                'section_level' => 1,
+                'section_number' => 11,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21347,8 +21345,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 12,
+                'section_level' => 1,
+                'section_number' => 12,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21367,8 +21365,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 13,
+                'section_level' => 1,
+                'section_number' => 13,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21387,8 +21385,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 14,
+                'section_level' => 1,
+                'section_number' => 14,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21407,8 +21405,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 15,
+                'section_level' => 1,
+                'section_number' => 15,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21427,8 +21425,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 16,
+                'section_level' => 1,
+                'section_number' => 16,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21447,8 +21445,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 17,
+                'section_level' => 1,
+                'section_number' => 17,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21467,8 +21465,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 18,
+                'section_level' => 1,
+                'section_number' => 18,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21487,8 +21485,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 19,
+                'section_level' => 1,
+                'section_number' => 19,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21507,8 +21505,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 20,
+                'section_level' => 1,
+                'section_number' => 20,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21527,8 +21525,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 21,
+                'section_level' => 1,
+                'section_number' => 21,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21547,8 +21545,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 22,
+                'section_level' => 1,
+                'section_number' => 22,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21567,8 +21565,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 23,
+                'section_level' => 1,
+                'section_number' => 23,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21587,8 +21585,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 24,
+                'section_level' => 1,
+                'section_number' => 24,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21607,8 +21605,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 25,
+                'section_level' => 1,
+                'section_number' => 25,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21627,8 +21625,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 26,
+                'section_level' => 1,
+                'section_number' => 26,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21647,8 +21645,8 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 27,
+                'section_level' => 1,
+                'section_number' => 27,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -21656,10 +21654,12 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'at_commands_in_refs_utf8'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'at_commands_in_refs_utf8'}{'structure'}{'section_childs'}[0];
@@ -21778,7 +21778,7 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -21797,8 +21797,8 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => '-_007b-_007d'
@@ -21811,8 +21811,8 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 2
+                'section_level' => 1,
+                'section_number' => 2
               }
             },
             'normalized' => '----_0021---_002e--_002e-_003f-_0040'
@@ -21825,8 +21825,8 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                   'cmdname' => 'chapter',
                   'extra' => {},
                   'structure' => {
-                    'level' => 1,
-                    'number' => 3
+                    'section_level' => 1,
+                    'section_number' => 3
                   }
                 },
                 'normalized' => '_0040-_007b-_007d-_005c-_0023'
@@ -21839,8 +21839,8 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                       'cmdname' => 'chapter',
                       'extra' => {},
                       'structure' => {
-                        'level' => 1,
-                        'number' => 4
+                        'section_level' => 1,
+                        'section_number' => 4
                       }
                     },
                     'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
@@ -21853,8 +21853,8 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                           'cmdname' => 'chapter',
                           'extra' => {},
                           'structure' => {
-                            'level' => 1,
-                            'number' => 5
+                            'section_level' => 1,
+                            'section_number' => 5
                           }
                         },
                         'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
@@ -21867,8 +21867,8 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                               'cmdname' => 'chapter',
                               'extra' => {},
                               'structure' => {
-                                'level' => 1,
-                                'number' => 6
+                                'section_level' => 1,
+                                'section_number' => 6
                               }
                             },
                             'normalized' => '_2265-_2264-_2192'
@@ -21881,8 +21881,8 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                   'cmdname' => 'chapter',
                                   'extra' => {},
                                   'structure' => {
-                                    'level' => 1,
-                                    'number' => 7
+                                    'section_level' => 1,
+                                    'section_number' => 7
                                   }
                                 },
                                 'normalized' => 
'_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae'
@@ -21895,8 +21895,8 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                       'cmdname' => 'chapter',
                                       'extra' => {},
                                       'structure' => {
-                                        'level' => 1,
-                                        'number' => 8
+                                        'section_level' => 1,
+                                        'section_number' => 8
                                       }
                                     },
                                     'normalized' => '_21d2-_00b0-a-b--_00e5'
@@ -21909,8 +21909,8 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                           'cmdname' => 'chapter',
                                           'extra' => {},
                                           'structure' => {
-                                            'level' => 1,
-                                            'number' => 9
+                                            'section_level' => 1,
+                                            'section_number' => 9
                                           }
                                         },
                                         'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
@@ -21923,8 +21923,8 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                               'cmdname' => 'chapter',
                                               'extra' => {},
                                               'structure' => {
-                                                'level' => 1,
-                                                'number' => 10
+                                                'section_level' => 1,
+                                                'section_number' => 10
                                               }
                                             },
                                             'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
@@ -21937,8 +21937,8 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                   'cmdname' => 'chapter',
                                                   'extra' => {},
                                                   'structure' => {
-                                                    'level' => 1,
-                                                    'number' => 11
+                                                    'section_level' => 1,
+                                                    'section_number' => 11
                                                   }
                                                 },
                                                 'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e'
@@ -21951,8 +21951,8 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                       'cmdname' => 'chapter',
                                                       'extra' => {},
                                                       'structure' => {
-                                                        'level' => 1,
-                                                        'number' => 12
+                                                        'section_level' => 1,
+                                                        'section_number' => 12
                                                       }
                                                     },
                                                     'normalized' => 
'_0131-_1e14-_1e08'
@@ -21965,8 +21965,8 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                           'cmdname' => 
'chapter',
                                                           'extra' => {},
                                                           'structure' => {
-                                                            'level' => 1,
-                                                            'number' => 13
+                                                            'section_level' => 
1,
+                                                            'section_number' 
=> 13
                                                           }
                                                         },
                                                         'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a'
@@ -21979,8 +21979,8 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                               'cmdname' => 
'chapter',
                                                               'extra' => {},
                                                               'structure' => {
-                                                                'level' => 1,
-                                                                'number' => 14
+                                                                
'section_level' => 1,
+                                                                
'section_number' => 14
                                                               }
                                                             },
                                                             'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a'
@@ -21993,8 +21993,8 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                   'cmdname' => 
'chapter',
                                                                   'extra' => 
{},
                                                                   'structure' 
=> {
-                                                                    'level' => 
1,
-                                                                    'number' 
=> 15
+                                                                    
'section_level' => 1,
+                                                                    
'section_number' => 15
                                                                   }
                                                                 },
                                                                 'normalized' 
=> '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
@@ -22007,8 +22007,8 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                       
'cmdname' => 'chapter',
                                                                       'extra' 
=> {},
                                                                       
'structure' => {
-                                                                        
'level' => 1,
-                                                                        
'number' => 16
+                                                                        
'section_level' => 1,
+                                                                        
'section_number' => 16
                                                                       }
                                                                     },
                                                                     
'normalized' => 'AAA-AAA-BBB'
@@ -22021,8 +22021,8 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                           
'cmdname' => 'chapter',
                                                                           
'extra' => {},
                                                                           
'structure' => {
-                                                                            
'level' => 1,
-                                                                            
'number' => 17
+                                                                            
'section_level' => 1,
+                                                                            
'section_number' => 17
                                                                           }
                                                                         },
                                                                         
'normalized' => 'CCC-CCC-DDD'
@@ -22035,8 +22035,8 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                               
'cmdname' => 'chapter',
                                                                               
'extra' => {},
                                                                               
'structure' => {
-                                                                               
 'level' => 1,
-                                                                               
 'number' => 18
+                                                                               
 'section_level' => 1,
+                                                                               
 'section_number' => 18
                                                                               }
                                                                             },
                                                                             
'normalized' => 'someone_0040somewher-no_005fexplain_0040there'
@@ -22049,8 +22049,8 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                                
   'cmdname' => 'chapter',
                                                                                
   'extra' => {},
                                                                                
   'structure' => {
-                                                                               
     'level' => 1,
-                                                                               
     'number' => 19
+                                                                               
     'section_level' => 1,
+                                                                               
     'section_number' => 19
                                                                                
   }
                                                                                
 },
                                                                                
 'normalized' => 'f_002d_002dile1-f_002d_002dile'
@@ -22063,8 +22063,8 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                                
       'cmdname' => 'chapter',
                                                                                
       'extra' => {},
                                                                                
       'structure' => {
-                                                                               
         'level' => 1,
-                                                                               
         'number' => 20
+                                                                               
         'section_level' => 1,
+                                                                               
         'section_number' => 20
                                                                                
       }
                                                                                
     },
                                                                                
     'normalized' => '-_0040-_007b_007d-_002e-'
@@ -22077,8 +22077,8 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                                
           'cmdname' => 'chapter',
                                                                                
           'extra' => {},
                                                                                
           'structure' => {
-                                                                               
             'level' => 1,
-                                                                               
             'number' => 21
+                                                                               
             'section_level' => 1,
+                                                                               
             'section_number' => 21
                                                                                
           }
                                                                                
         },
                                                                                
         'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
@@ -22091,8 +22091,8 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                                
               'cmdname' => 'chapter',
                                                                                
               'extra' => {},
                                                                                
               'structure' => {
-                                                                               
                 'level' => 1,
-                                                                               
                 'number' => 22
+                                                                               
                 'section_level' => 1,
+                                                                               
                 'section_number' => 22
                                                                                
               }
                                                                                
             },
                                                                                
             'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC'
@@ -22105,8 +22105,8 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                                
                   'cmdname' => 'chapter',
                                                                                
                   'extra' => {},
                                                                                
                   'structure' => {
-                                                                               
                     'level' => 1,
-                                                                               
                     'number' => 23
+                                                                               
                     'section_level' => 1,
+                                                                               
                     'section_number' => 23
                                                                                
                   }
                                                                                
                 },
                                                                                
                 'normalized' => '8_002e27in'
@@ -22119,8 +22119,8 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                                
                       'cmdname' => 'chapter',
                                                                                
                       'extra' => {},
                                                                                
                       'structure' => {
-                                                                               
                         'level' => 1,
-                                                                               
                         'number' => 24
+                                                                               
                         'section_level' => 1,
+                                                                               
                         'section_number' => 24
                                                                                
                       }
                                                                                
                     },
                                                                                
                     'normalized' => 'sansserif-slanted'
@@ -22133,8 +22133,8 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                                
                           'cmdname' => 'chapter',
                                                                                
                           'extra' => {},
                                                                                
                           'structure' => {
-                                                                               
                             'level' => 1,
-                                                                               
                             'number' => 25
+                                                                               
                             'section_level' => 1,
+                                                                               
                             'section_number' => 25
                                                                                
                           }
                                                                                
                         },
                                                                                
                         'normalized' => 'indicateurl'
@@ -22147,8 +22147,8 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                                
                               'cmdname' => 'chapter',
                                                                                
                               'extra' => {},
                                                                                
                               'structure' => {
-                                                                               
                                 'level' => 1,
-                                                                               
                                 'number' => 26
+                                                                               
                                 'section_level' => 1,
+                                                                               
                                 'section_number' => 26
                                                                                
                               }
                                                                                
                             },
                                                                                
                             'normalized' => 'gH-3rd'
@@ -22161,8 +22161,8 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                                                
                                   'cmdname' => 'chapter',
                                                                                
                                   'extra' => {},
                                                                                
                                   'structure' => {
-                                                                               
                                     'level' => 1,
-                                                                               
                                     'number' => 27
+                                                                               
                                     'section_level' => 1,
+                                                                               
                                     'section_number' => 27
                                                                                
                                   }
                                                                                
                                 },
                                                                                
                                 'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
diff --git a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs.pl 
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs.pl
index 5390e9bffc..9fcf364122 100644
--- a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs.pl
+++ b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs.pl
@@ -1715,7 +1715,6 @@ top
 
 $result_sectioning{'char_latin1_latin1_in_refs'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1730,7 +1729,6 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1744,8 +1742,8 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -1763,8 +1761,8 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 2,
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1783,8 +1781,8 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 3,
+                'section_level' => 1,
+                'section_number' => 3,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1803,8 +1801,8 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 4,
+                'section_level' => 1,
+                'section_number' => 4,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1823,8 +1821,8 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 5,
+                'section_level' => 1,
+                'section_number' => 5,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1832,10 +1830,12 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'char_latin1_latin1_in_refs'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'char_latin1_latin1_in_refs'}{'structure'}{'section_childs'}[0];
@@ -1866,7 +1866,7 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'isindex' => 1,
@@ -1886,8 +1886,8 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
@@ -1900,8 +1900,8 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 2
+                'section_level' => 1,
+                'section_number' => 2
               }
             },
             'normalized' => '_00e9'
@@ -1914,8 +1914,8 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
                   'cmdname' => 'chapter',
                   'extra' => {},
                   'structure' => {
-                    'level' => 1,
-                    'number' => 3
+                    'section_level' => 1,
+                    'section_number' => 3
                   }
                 },
                 'normalized' => '_00e0-_00e8-_00f9'
@@ -1928,8 +1928,8 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
                       'cmdname' => 'chapter',
                       'extra' => {},
                       'structure' => {
-                        'level' => 1,
-                        'number' => 4
+                        'section_level' => 1,
+                        'section_number' => 4
                       }
                     },
                     'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
@@ -1942,8 +1942,8 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
                           'cmdname' => 'chapter',
                           'extra' => {},
                           'structure' => {
-                            'level' => 1,
-                            'number' => 5
+                            'section_level' => 1,
+                            'section_number' => 5
                           }
                         },
                         'normalized' => '_00e7'
diff --git a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs.pl 
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs.pl
index eebd3aa4b2..9c895a836d 100644
--- a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs.pl
+++ b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs.pl
@@ -1715,7 +1715,6 @@ top
 
 $result_sectioning{'char_latin1_utf8_in_refs'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1730,7 +1729,6 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1744,8 +1742,8 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -1763,8 +1761,8 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 2,
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1783,8 +1781,8 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 3,
+                'section_level' => 1,
+                'section_number' => 3,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1803,8 +1801,8 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 4,
+                'section_level' => 1,
+                'section_number' => 4,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1823,8 +1821,8 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 5,
+                'section_level' => 1,
+                'section_number' => 5,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1832,10 +1830,12 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'char_latin1_utf8_in_refs'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'char_latin1_utf8_in_refs'}{'structure'}{'section_childs'}[0];
@@ -1866,7 +1866,7 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'isindex' => 1,
@@ -1886,8 +1886,8 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
@@ -1900,8 +1900,8 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 2
+                'section_level' => 1,
+                'section_number' => 2
               }
             },
             'normalized' => '_00e9'
@@ -1914,8 +1914,8 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
                   'cmdname' => 'chapter',
                   'extra' => {},
                   'structure' => {
-                    'level' => 1,
-                    'number' => 3
+                    'section_level' => 1,
+                    'section_number' => 3
                   }
                 },
                 'normalized' => '_00e0-_00e8-_00f9'
@@ -1928,8 +1928,8 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
                       'cmdname' => 'chapter',
                       'extra' => {},
                       'structure' => {
-                        'level' => 1,
-                        'number' => 4
+                        'section_level' => 1,
+                        'section_number' => 4
                       }
                     },
                     'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
@@ -1942,8 +1942,8 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
                           'cmdname' => 'chapter',
                           'extra' => {},
                           'structure' => {
-                            'level' => 1,
-                            'number' => 5
+                            'section_level' => 1,
+                            'section_number' => 5
                           }
                         },
                         'normalized' => '_00e7'
diff --git a/tp/t/results/formats_encodings/char_latin2_latin2_in_refs.pl 
b/tp/t/results/formats_encodings/char_latin2_latin2_in_refs.pl
index 82878a0fc7..e75b9f8a38 100644
--- a/tp/t/results/formats_encodings/char_latin2_latin2_in_refs.pl
+++ b/tp/t/results/formats_encodings/char_latin2_latin2_in_refs.pl
@@ -663,7 +663,6 @@ top
 
 $result_sectioning{'char_latin2_latin2_in_refs'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -678,7 +677,6 @@ $result_sectioning{'char_latin2_latin2_in_refs'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -692,18 +690,20 @@ $result_sectioning{'char_latin2_latin2_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'char_latin2_latin2_in_refs'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'char_latin2_latin2_in_refs'}{'structure'}{'section_childs'}[0];
@@ -718,7 +718,7 @@ $result_nodes{'char_latin2_latin2_in_refs'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'isindex' => 1,
@@ -738,8 +738,8 @@ $result_nodes{'char_latin2_latin2_in_refs'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => '_0104-_0105-_02db-_0118-_0119'
diff --git a/tp/t/results/formats_encodings/japanese_shift_jis.pl 
b/tp/t/results/formats_encodings/japanese_shift_jis.pl
index 9351ea5700..41dc13366e 100644
--- a/tp/t/results/formats_encodings/japanese_shift_jis.pl
+++ b/tp/t/results/formats_encodings/japanese_shift_jis.pl
@@ -1019,7 +1019,6 @@ GNU LilyPond -- 学習マニュアル
 
 $result_sectioning{'japanese_shift_jis'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1033,7 +1032,6 @@ $result_sectioning{'japanese_shift_jis'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1047,8 +1045,8 @@ $result_sectioning{'japanese_shift_jis'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -1066,8 +1064,8 @@ $result_sectioning{'japanese_shift_jis'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 2,
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1075,10 +1073,12 @@ $result_sectioning{'japanese_shift_jis'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'japanese_shift_jis'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'japanese_shift_jis'}{'structure'}{'section_childs'}[0];
@@ -1097,7 +1097,7 @@ $result_nodes{'japanese_shift_jis'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1116,8 +1116,8 @@ $result_nodes{'japanese_shift_jis'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'Preface'
@@ -1130,8 +1130,8 @@ $result_nodes{'japanese_shift_jis'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 2
+                'section_level' => 1,
+                'section_number' => 2
               }
             },
             'normalized' => 'Introduction'
diff --git a/tp/t/results/formats_encodings/sample_utf8.pl 
b/tp/t/results/formats_encodings/sample_utf8.pl
index 0e100f2e89..c73cb28bf7 100644
--- a/tp/t/results/formats_encodings/sample_utf8.pl
+++ b/tp/t/results/formats_encodings/sample_utf8.pl
@@ -1730,7 +1730,6 @@ Index
 
 $result_sectioning{'sample_utf8'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1744,7 +1743,6 @@ $result_sectioning{'sample_utf8'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1758,8 +1756,8 @@ $result_sectioning{'sample_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -1777,8 +1775,8 @@ $result_sectioning{'sample_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 2,
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1798,7 +1796,7 @@ $result_sectioning{'sample_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
+                'section_level' => 1,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1806,10 +1804,12 @@ $result_sectioning{'sample_utf8'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'sample_utf8'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'sample_utf8'}{'structure'}{'section_childs'}[0];
@@ -1832,7 +1832,7 @@ $result_nodes{'sample_utf8'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1851,8 +1851,8 @@ $result_nodes{'sample_utf8'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => '_7b2c_4e00_7ae0_ff08First-Chapter_ff09'
@@ -1865,8 +1865,8 @@ $result_nodes{'sample_utf8'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 2
+                'section_level' => 1,
+                'section_number' => 2
               }
             },
             'normalized' => 'Second-Chapter-AE-_0104_0118-ae-_0105_0119'
@@ -1879,7 +1879,7 @@ $result_nodes{'sample_utf8'} = {
                   'cmdname' => 'unnumbered',
                   'extra' => {},
                   'structure' => {
-                    'level' => 1
+                    'section_level' => 1
                   }
                 },
                 'isindex' => 1,
diff --git a/tp/t/results/formats_encodings/weird_accents.pl 
b/tp/t/results/formats_encodings/weird_accents.pl
index 6093133eeb..f519f818da 100644
--- a/tp/t/results/formats_encodings/weird_accents.pl
+++ b/tp/t/results/formats_encodings/weird_accents.pl
@@ -577,7 +577,6 @@ r`\'=
 
 $result_sectioning{'weird_accents'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -590,11 +589,12 @@ $result_sectioning{'weird_accents'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'weird_accents'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'weird_accents'};
@@ -606,7 +606,7 @@ $result_nodes{'weird_accents'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl 
b/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
index 222848d8d2..31747294b8 100644
--- a/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
+++ b/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
@@ -577,7 +577,6 @@ r`\'=
 
 $result_sectioning{'weird_accents_disable_encoding'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -590,11 +589,12 @@ $result_sectioning{'weird_accents_disable_encoding'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'weird_accents_disable_encoding'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'weird_accents_disable_encoding'};
@@ -606,7 +606,7 @@ $result_nodes{'weird_accents_disable_encoding'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/formatting/direntry_dircategory_info_split.pl 
b/tp/t/results/formatting/direntry_dircategory_info_split.pl
index dca82e5203..50f18020b4 100644
--- a/tp/t/results/formatting/direntry_dircategory_info_split.pl
+++ b/tp/t/results/formatting/direntry_dircategory_info_split.pl
@@ -1172,7 +1172,6 @@ In chapter
 
 $result_sectioning{'direntry_dircategory_info_split'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1186,7 +1185,6 @@ $result_sectioning{'direntry_dircategory_info_split'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1200,18 +1198,20 @@ $result_sectioning{'direntry_dircategory_info_split'} = 
{
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'direntry_dircategory_info_split'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'direntry_dircategory_info_split'}{'structure'}{'section_childs'}[0];
@@ -1226,7 +1226,7 @@ $result_nodes{'direntry_dircategory_info_split'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1245,8 +1245,8 @@ $result_nodes{'direntry_dircategory_info_split'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter'
diff --git a/tp/t/results/formatting/documentlanguage_set_option.pl 
b/tp/t/results/formatting/documentlanguage_set_option.pl
index a48999e423..236e46e11f 100644
--- a/tp/t/results/formatting/documentlanguage_set_option.pl
+++ b/tp/t/results/formatting/documentlanguage_set_option.pl
@@ -328,7 +328,6 @@ Text.
 
 $result_sectioning{'documentlanguage_set_option'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -341,11 +340,12 @@ $result_sectioning{'documentlanguage_set_option'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'documentlanguage_set_option'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'documentlanguage_set_option'};
@@ -357,7 +357,7 @@ $result_nodes{'documentlanguage_set_option'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/formatting/documentlanguage_set_option_info.pl 
b/tp/t/results/formatting/documentlanguage_set_option_info.pl
index 3479408f53..8ce60df83a 100644
--- a/tp/t/results/formatting/documentlanguage_set_option_info.pl
+++ b/tp/t/results/formatting/documentlanguage_set_option_info.pl
@@ -328,7 +328,6 @@ Text.
 
 $result_sectioning{'documentlanguage_set_option_info'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -341,11 +340,12 @@ $result_sectioning{'documentlanguage_set_option_info'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'documentlanguage_set_option_info'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'documentlanguage_set_option_info'};
@@ -357,7 +357,7 @@ $result_nodes{'documentlanguage_set_option_info'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/formatting/documentlanguage_set_unknown.pl 
b/tp/t/results/formatting/documentlanguage_set_unknown.pl
index 7eb9b80389..8f000fe00e 100644
--- a/tp/t/results/formatting/documentlanguage_set_unknown.pl
+++ b/tp/t/results/formatting/documentlanguage_set_unknown.pl
@@ -328,7 +328,6 @@ Text.
 
 $result_sectioning{'documentlanguage_set_unknown'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -341,11 +340,12 @@ $result_sectioning{'documentlanguage_set_unknown'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'documentlanguage_set_unknown'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'documentlanguage_set_unknown'};
@@ -357,7 +357,7 @@ $result_nodes{'documentlanguage_set_unknown'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/formatting/float_copying.pl 
b/tp/t/results/formatting/float_copying.pl
index 78b0206593..4b15447c6c 100644
--- a/tp/t/results/formatting/float_copying.pl
+++ b/tp/t/results/formatting/float_copying.pl
@@ -1799,7 +1799,6 @@ printindex
 
 $result_sectioning{'float_copying'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1813,7 +1812,6 @@ $result_sectioning{'float_copying'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'appendix',
@@ -1828,18 +1826,20 @@ $result_sectioning{'float_copying'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 'A',
+                'section_level' => 1,
+                'section_number' => 'A',
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'float_copying'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'float_copying'}{'structure'}{'section_childs'}[0];
@@ -1854,7 +1854,7 @@ $result_nodes{'float_copying'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1873,8 +1873,8 @@ $result_nodes{'float_copying'} = {
           'cmdname' => 'appendix',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 'A'
+            'section_level' => 1,
+            'section_number' => 'A'
           }
         },
         'isindex' => 1,
diff --git a/tp/t/results/formatting/split_nocopying.pl 
b/tp/t/results/formatting/split_nocopying.pl
index 2545a990c2..aa54138ff5 100644
--- a/tp/t/results/formatting/split_nocopying.pl
+++ b/tp/t/results/formatting/split_nocopying.pl
@@ -483,7 +483,6 @@ First chapter.
 
 $result_sectioning{'split_nocopying'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -497,7 +496,6 @@ $result_sectioning{'split_nocopying'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -511,18 +509,20 @@ $result_sectioning{'split_nocopying'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'split_nocopying'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'split_nocopying'}{'structure'}{'section_childs'}[0];
@@ -537,7 +537,7 @@ $result_nodes{'split_nocopying'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -556,8 +556,8 @@ $result_nodes{'split_nocopying'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'Ch1'
diff --git a/tp/t/results/formatting/split_nocopying_split.pl 
b/tp/t/results/formatting/split_nocopying_split.pl
index fc20fc1b46..73ecadaccd 100644
--- a/tp/t/results/formatting/split_nocopying_split.pl
+++ b/tp/t/results/formatting/split_nocopying_split.pl
@@ -483,7 +483,6 @@ First chapter.
 
 $result_sectioning{'split_nocopying_split'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -497,7 +496,6 @@ $result_sectioning{'split_nocopying_split'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -511,18 +509,20 @@ $result_sectioning{'split_nocopying_split'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'split_nocopying_split'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'split_nocopying_split'}{'structure'}{'section_childs'}[0];
@@ -537,7 +537,7 @@ $result_nodes{'split_nocopying_split'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -556,8 +556,8 @@ $result_nodes{'split_nocopying_split'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'Ch1'
diff --git a/tp/t/results/formatting/texi_bib_example.pl 
b/tp/t/results/formatting/texi_bib_example.pl
index 6a5db297f7..9168ec63b0 100644
--- a/tp/t/results/formatting/texi_bib_example.pl
+++ b/tp/t/results/formatting/texi_bib_example.pl
@@ -5411,7 +5411,6 @@ Massachusetts, 1994.
 
 $result_sectioning{'texi_bib_example'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -5425,7 +5424,6 @@ $result_sectioning{'texi_bib_example'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -5439,8 +5437,8 @@ $result_sectioning{'texi_bib_example'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -5458,8 +5456,8 @@ $result_sectioning{'texi_bib_example'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 2,
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -5467,10 +5465,12 @@ $result_sectioning{'texi_bib_example'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'texi_bib_example'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'texi_bib_example'}{'structure'}{'section_childs'}[0];
@@ -5489,7 +5489,7 @@ $result_nodes{'texi_bib_example'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -5508,8 +5508,8 @@ $result_nodes{'texi_bib_example'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'Introduction'
@@ -5522,8 +5522,8 @@ $result_nodes{'texi_bib_example'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 2
+                'section_level' => 1,
+                'section_number' => 2
               }
             },
             'normalized' => 'References'
diff --git a/tp/t/results/formatting/texi_glossary.pl 
b/tp/t/results/formatting/texi_glossary.pl
index 64969f814e..3dc1e58788 100644
--- a/tp/t/results/formatting/texi_glossary.pl
+++ b/tp/t/results/formatting/texi_glossary.pl
@@ -1407,7 +1407,6 @@ name2 text2
 
 $result_sectioning{'texi_glossary'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1421,7 +1420,6 @@ $result_sectioning{'texi_glossary'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1435,18 +1433,20 @@ $result_sectioning{'texi_glossary'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'texi_glossary'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'texi_glossary'}{'structure'}{'section_childs'}[0];
@@ -1461,7 +1461,7 @@ $result_nodes{'texi_glossary'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1480,8 +1480,8 @@ $result_nodes{'texi_glossary'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'glossary'
diff --git a/tp/t/results/html_tests/character_number_leading_toc_stoc.pl 
b/tp/t/results/html_tests/character_number_leading_toc_stoc.pl
index 7d3c3cee9a..30eb7017e5 100644
--- a/tp/t/results/html_tests/character_number_leading_toc_stoc.pl
+++ b/tp/t/results/html_tests/character_number_leading_toc_stoc.pl
@@ -232,20 +232,18 @@ _
 
 $result_sectioning{'character_number_leading_toc_stoc'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
         'extra' => {},
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -255,17 +253,17 @@ $result_sectioning{'character_number_leading_toc_stoc'} = 
{
               'cmdname' => 'unnumbered',
               'extra' => {},
               'structure' => {
-                'level' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
+                      'section_level' => 2,
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -273,10 +271,12 @@ $result_sectioning{'character_number_leading_toc_stoc'} = 
{
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'character_number_leading_toc_stoc'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'character_number_leading_toc_stoc'}{'structure'}{'section_childs'}[0];
diff --git a/tp/t/results/html_tests/check_htmlxref.pl 
b/tp/t/results/html_tests/check_htmlxref.pl
index f65a1b2e45..84b0a836eb 100644
--- a/tp/t/results/html_tests/check_htmlxref.pl
+++ b/tp/t/results/html_tests/check_htmlxref.pl
@@ -690,7 +690,6 @@ a
 
 $result_sectioning{'check_htmlxref'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -704,11 +703,12 @@ $result_sectioning{'check_htmlxref'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'check_htmlxref'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'check_htmlxref'};
@@ -720,7 +720,7 @@ $result_nodes{'check_htmlxref'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
diff --git a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl 
b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
index 787997bcfa..71f2ff0028 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
@@ -701,7 +701,6 @@ do something with input
 
 $result_sectioning{'deftypefnnewline_for_copying_after'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -714,11 +713,12 @@ $result_sectioning{'deftypefnnewline_for_copying_after'} 
= {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'deftypefnnewline_for_copying_after'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'deftypefnnewline_for_copying_after'};
@@ -730,7 +730,7 @@ $result_nodes{'deftypefnnewline_for_copying_after'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl 
b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
index ac0e673f64..b7931c6368 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
@@ -652,7 +652,6 @@ do something with input
 
 $result_sectioning{'deftypefnnewline_for_copying_before'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -665,11 +664,12 @@ $result_sectioning{'deftypefnnewline_for_copying_before'} 
= {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'deftypefnnewline_for_copying_before'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'deftypefnnewline_for_copying_before'};
@@ -681,7 +681,7 @@ $result_nodes{'deftypefnnewline_for_copying_before'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/html_tests/documentdescription.pl 
b/tp/t/results/html_tests/documentdescription.pl
index 9034843c3f..fd0677d76f 100644
--- a/tp/t/results/html_tests/documentdescription.pl
+++ b/tp/t/results/html_tests/documentdescription.pl
@@ -386,17 +386,17 @@ top
 
 $result_sectioning{'documentdescription'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
         'extra' => {},
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'documentdescription'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'documentdescription'};
diff --git a/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl 
b/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
index 5081147369..e83b3a3d13 100644
--- a/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
+++ b/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
@@ -200,7 +200,6 @@ top
 
 $result_sectioning{'empty_lines_at_beginning_no_setfilename'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -213,11 +212,12 @@ 
$result_sectioning{'empty_lines_at_beginning_no_setfilename'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'empty_lines_at_beginning_no_setfilename'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'empty_lines_at_beginning_no_setfilename'};
@@ -229,7 +229,7 @@ $result_nodes{'empty_lines_at_beginning_no_setfilename'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/html_tests/footnotestyle_separate_late.pl 
b/tp/t/results/html_tests/footnotestyle_separate_late.pl
index bae5890397..9af8ca8844 100644
--- a/tp/t/results/html_tests/footnotestyle_separate_late.pl
+++ b/tp/t/results/html_tests/footnotestyle_separate_late.pl
@@ -531,7 +531,6 @@ top
 
 $result_sectioning{'footnotestyle_separate_late'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -620,7 +619,6 @@ $result_sectioning{'footnotestyle_separate_late'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -629,8 +627,8 @@ $result_sectioning{'footnotestyle_separate_late'} = {
               },
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -643,8 +641,8 @@ $result_sectioning{'footnotestyle_separate_late'} = {
               },
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1,
-                'number' => 2,
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -652,10 +650,12 @@ $result_sectioning{'footnotestyle_separate_late'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'footnotestyle_separate_late'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'footnotestyle_separate_late'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'};
@@ -725,8 +725,8 @@ $result_nodes{'footnotestyle_separate_late'} = {
                         'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
-                          'level' => 1,
-                          'number' => 1
+                          'section_level' => 1,
+                          'section_number' => 1
                         }
                       },
                       'normalized' => 'chap-f'
@@ -759,8 +759,8 @@ $result_nodes{'footnotestyle_separate_late'} = {
                                 },
                                 'type' => 'unit'
                               },
-                              'level' => 1,
-                              'number' => 2
+                              'section_level' => 1,
+                              'section_number' => 2
                             }
                           },
                           'normalized' => 'chap-s'
@@ -805,7 +805,7 @@ $result_nodes{'footnotestyle_separate_late'} = {
           },
           'type' => 'unit'
         },
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/html_tests/html_in_copying.pl 
b/tp/t/results/html_tests/html_in_copying.pl
index 921ce301e9..8f5b36d8df 100644
--- a/tp/t/results/html_tests/html_in_copying.pl
+++ b/tp/t/results/html_tests/html_in_copying.pl
@@ -295,7 +295,6 @@ top
 
 $result_sectioning{'html_in_copying'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -308,11 +307,12 @@ $result_sectioning{'html_in_copying'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'html_in_copying'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'html_in_copying'};
@@ -324,7 +324,7 @@ $result_nodes{'html_in_copying'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/html_tests/index_and_node_same_name.pl 
b/tp/t/results/html_tests/index_and_node_same_name.pl
index 3536e9fc1f..c551e529d5 100644
--- a/tp/t/results/html_tests/index_and_node_same_name.pl
+++ b/tp/t/results/html_tests/index_and_node_same_name.pl
@@ -210,17 +210,17 @@ $result_texts{'index_and_node_same_name'} = 'top
 
 $result_sectioning{'index_and_node_same_name'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
         'extra' => {},
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'index_and_node_same_name'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'index_and_node_same_name'};
diff --git a/tp/t/results/html_tests/index_below.pl 
b/tp/t/results/html_tests/index_below.pl
index 83b674ac3a..ab48349825 100644
--- a/tp/t/results/html_tests/index_below.pl
+++ b/tp/t/results/html_tests/index_below.pl
@@ -276,7 +276,6 @@ $result_texts{'index_below'} = 'top
 
 $result_sectioning{'index_below'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -295,8 +294,6 @@ $result_sectioning{'index_below'} = {
                       'extra' => {},
                       'structure' => {
                         'associated_unit' => {},
-                        'level' => 1,
-                        'number' => 1,
                         'section_childs' => [
                           {
                             'cmdname' => 'section',
@@ -317,12 +314,14 @@ $result_sectioning{'index_below'} = {
                                 },
                                 'type' => 'unit'
                               },
-                              'level' => 2,
-                              'number' => '1.1',
+                              'section_level' => 2,
+                              'section_number' => '1.1',
                               'section_up' => {}
                             }
                           }
                         ],
+                        'section_level' => 1,
+                        'section_number' => 1,
                         'section_up' => {},
                         'toplevel_prev' => {},
                         'toplevel_up' => {}
@@ -349,14 +348,15 @@ $result_sectioning{'index_below'} = {
             },
             'type' => 'unit'
           },
-          'level' => 0,
           'section_childs' => [
             {}
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'index_below'}{'structure'}{'section_childs'}[0]{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = $result_sectioning{'index_below'}{'structure'}{'section_childs'}[0];
@@ -405,7 +405,7 @@ $result_elements{'index_below'} = [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 0
+          'section_level' => 0
         }
       }
     },
@@ -418,8 +418,8 @@ $result_elements{'index_below'} = [
               'extra' => {},
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1,
-                'number' => 1
+                'section_level' => 1,
+                'section_number' => 1
               }
             }
           },
@@ -434,8 +434,8 @@ $result_elements{'index_below'} = [
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 2,
-                      'number' => '1.1'
+                      'section_level' => 2,
+                      'section_number' => '1.1'
                     }
                   }
                 },
diff --git a/tp/t/results/html_tests/redirection_same_labels.pl 
b/tp/t/results/html_tests/redirection_same_labels.pl
index 1e72d19c32..80be986858 100644
--- a/tp/t/results/html_tests/redirection_same_labels.pl
+++ b/tp/t/results/html_tests/redirection_same_labels.pl
@@ -1346,7 +1346,6 @@ the top
 
 $result_sectioning{'redirection_same_labels'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1380,8 +1379,8 @@ $result_sectioning{'redirection_same_labels'} = {
                           },
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1,
-                            'number' => 1,
+                            'section_level' => 1,
+                            'section_number' => 1,
                             'section_up' => {},
                             'toplevel_prev' => {},
                             'toplevel_up' => {}
@@ -1409,8 +1408,8 @@ $result_sectioning{'redirection_same_labels'} = {
                                 },
                                 'structure' => {
                                   'associated_unit' => {},
-                                  'level' => 1,
-                                  'number' => 2,
+                                  'section_level' => 1,
+                                  'section_number' => 2,
                                   'section_prev' => {},
                                   'section_up' => {},
                                   'toplevel_prev' => {},
@@ -1463,15 +1462,16 @@ $result_sectioning{'redirection_same_labels'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0,
           'section_childs' => [
             {},
             {}
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'redirection_same_labels'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'redirection_same_labels'}{'structure'}{'section_childs'}[0];
@@ -1539,8 +1539,8 @@ $result_nodes{'redirection_same_labels'} = {
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1,
-                      'number' => 1
+                      'section_level' => 1,
+                      'section_number' => 1
                     }
                   }
                 },
@@ -1555,8 +1555,8 @@ $result_nodes{'redirection_same_labels'} = {
                           'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1,
-                            'number' => 2
+                            'section_level' => 1,
+                            'section_number' => 2
                           }
                         }
                       },
@@ -1600,7 +1600,7 @@ $result_nodes{'redirection_same_labels'} = {
           },
           'type' => 'unit'
         },
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1745,7 +1745,7 @@ $result_menus{'redirection_same_labels'} = {
           'extra' => {},
           'structure' => {
             'associated_unit' => {},
-            'level' => 0
+            'section_level' => 0
           }
         }
       },
@@ -1758,8 +1758,8 @@ $result_menus{'redirection_same_labels'} = {
                 'extra' => {},
                 'structure' => {
                   'associated_unit' => {},
-                  'level' => 1,
-                  'number' => 1
+                  'section_level' => 1,
+                  'section_number' => 1
                 }
               }
             },
@@ -1774,8 +1774,8 @@ $result_menus{'redirection_same_labels'} = {
                       'extra' => {},
                       'structure' => {
                         'associated_unit' => {},
-                        'level' => 1,
-                        'number' => 2
+                        'section_level' => 1,
+                        'section_number' => 2
                       }
                     }
                   },
@@ -1946,7 +1946,7 @@ $result_elements{'redirection_same_labels'} = [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 0
+          'section_level' => 0
         }
       }
     },
@@ -1959,8 +1959,8 @@ $result_elements{'redirection_same_labels'} = [
               'extra' => {},
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1,
-                'number' => 1
+                'section_level' => 1,
+                'section_number' => 1
               }
             }
           },
@@ -1975,8 +1975,8 @@ $result_elements{'redirection_same_labels'} = [
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1,
-                      'number' => 2
+                      'section_level' => 1,
+                      'section_number' => 2
                     }
                   }
                 },
diff --git a/tp/t/results/html_tests/shortcontents_no_top.pl 
b/tp/t/results/html_tests/shortcontents_no_top.pl
index 1ffec2c0da..6a4cd11649 100644
--- a/tp/t/results/html_tests/shortcontents_no_top.pl
+++ b/tp/t/results/html_tests/shortcontents_no_top.pl
@@ -179,14 +179,13 @@ $result_texts{'shortcontents_no_top'} = '1 chap
 
 $result_sectioning{'shortcontents_no_top'} = {
   'structure' => {
-    'level' => 0,
     'section_childs' => [
       {
         'cmdname' => 'chapter',
         'extra' => {},
         'structure' => {
-          'level' => 1,
-          'number' => 1,
+          'section_level' => 1,
+          'section_number' => 1,
           'section_up' => {}
         }
       },
@@ -194,25 +193,26 @@ $result_sectioning{'shortcontents_no_top'} = {
         'cmdname' => 'chapter',
         'extra' => {},
         'structure' => {
-          'level' => 1,
-          'number' => 2,
           'section_childs' => [
             {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => '2.1',
+                'section_level' => 2,
+                'section_number' => '2.1',
                 'section_up' => {}
               }
             }
           ],
+          'section_level' => 1,
+          'section_number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'toplevel_prev' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 0
   }
 };
 
$result_sectioning{'shortcontents_no_top'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'shortcontents_no_top'};
diff --git a/tp/t/results/html_tests/simple_menu.pl 
b/tp/t/results/html_tests/simple_menu.pl
index 1c0d22ef88..7b4b830eda 100644
--- a/tp/t/results/html_tests/simple_menu.pl
+++ b/tp/t/results/html_tests/simple_menu.pl
@@ -2084,7 +2084,6 @@ in detaildescription
 
 $result_sectioning{'simple_menu'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -2098,11 +2097,12 @@ $result_sectioning{'simple_menu'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'simple_menu'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'simple_menu'};
@@ -2114,7 +2114,7 @@ $result_nodes{'simple_menu'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
diff --git a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl 
b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
index 927680d2cb..a7ad3301a4 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
@@ -547,7 +547,6 @@ chap.
 
 $result_sectioning{'test_xrefautomaticsectiontitle'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -561,7 +560,6 @@ $result_sectioning{'test_xrefautomaticsectiontitle'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -575,18 +573,20 @@ $result_sectioning{'test_xrefautomaticsectiontitle'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'test_xrefautomaticsectiontitle'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'test_xrefautomaticsectiontitle'}{'structure'}{'section_childs'}[0];
@@ -601,7 +601,7 @@ $result_nodes{'test_xrefautomaticsectiontitle'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -620,8 +620,8 @@ $result_nodes{'test_xrefautomaticsectiontitle'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chap'
diff --git 
a/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl 
b/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
index c25304f4f9..c13bca361d 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
@@ -557,7 +557,6 @@ chap.
 
 $result_sectioning{'test_xrefautomaticsectiontitle_off_first'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -571,7 +570,6 @@ 
$result_sectioning{'test_xrefautomaticsectiontitle_off_first'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -585,18 +583,20 @@ 
$result_sectioning{'test_xrefautomaticsectiontitle_off_first'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'test_xrefautomaticsectiontitle_off_first'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'test_xrefautomaticsectiontitle_off_first'}{'structure'}{'section_childs'}[0];
@@ -611,7 +611,7 @@ $result_nodes{'test_xrefautomaticsectiontitle_off_first'} = 
{
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -630,8 +630,8 @@ $result_nodes{'test_xrefautomaticsectiontitle_off_first'} = 
{
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chap'
diff --git 
a/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl 
b/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl
index 03dd5791b1..838bcd568f 100644
--- a/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl
+++ b/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl
@@ -248,7 +248,6 @@ In top.
 
 $result_sectioning{'text_before_top_and_contents_after_title'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -261,24 +260,25 @@ 
$result_sectioning{'text_before_top_and_contents_after_title'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'text_before_top_and_contents_after_title'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'text_before_top_and_contents_after_title'}{'structure'}{'section_childs'}[0];
@@ -293,7 +293,7 @@ $result_nodes{'text_before_top_and_contents_after_title'} = 
{
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git 
a/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl 
b/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl
index 62e9f42f4b..ce1a3627cc 100644
--- a/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl
+++ b/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl
@@ -248,7 +248,6 @@ In top.
 
 $result_sectioning{'text_before_top_and_summarycontents_after_title'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -261,24 +260,25 @@ 
$result_sectioning{'text_before_top_and_summarycontents_after_title'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'text_before_top_and_summarycontents_after_title'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'text_before_top_and_summarycontents_after_title'}{'structure'}{'section_childs'}[0];
@@ -293,7 +293,7 @@ 
$result_nodes{'text_before_top_and_summarycontents_after_title'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/html_tests/titles.pl 
b/tp/t/results/html_tests/titles.pl
index ed445c271d..0183ffe0a4 100644
--- a/tp/t/results/html_tests/titles.pl
+++ b/tp/t/results/html_tests/titles.pl
@@ -355,7 +355,6 @@ Second paragraph.
 
 $result_sectioning{'titles'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -368,11 +367,12 @@ $result_sectioning{'titles'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'titles'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'titles'};
@@ -384,7 +384,7 @@ $result_nodes{'titles'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/htmlxref/htmlxref.pl 
b/tp/t/results/htmlxref/htmlxref.pl
index 7cdaa3f5b3..d1b85f9478 100644
--- a/tp/t/results/htmlxref/htmlxref.pl
+++ b/tp/t/results/htmlxref/htmlxref.pl
@@ -3460,7 +3460,6 @@ id: local-node
 
 $result_sectioning{'htmlxref'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -3474,7 +3473,6 @@ $result_sectioning{'htmlxref'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -3488,18 +3486,20 @@ $result_sectioning{'htmlxref'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'htmlxref'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'htmlxref'}{'structure'}{'section_childs'}[0];
@@ -3514,7 +3514,7 @@ $result_nodes{'htmlxref'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -3533,8 +3533,8 @@ $result_nodes{'htmlxref'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
diff --git a/tp/t/results/htmlxref/htmlxref_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_nodes.pl
index 4123cbec3c..62750fded7 100644
--- a/tp/t/results/htmlxref/htmlxref_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_nodes.pl
@@ -3460,7 +3460,6 @@ id: local-node
 
 $result_sectioning{'htmlxref_nodes'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -3474,7 +3473,6 @@ $result_sectioning{'htmlxref_nodes'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -3488,18 +3486,20 @@ $result_sectioning{'htmlxref_nodes'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'htmlxref_nodes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'htmlxref_nodes'}{'structure'}{'section_childs'}[0];
@@ -3514,7 +3514,7 @@ $result_nodes{'htmlxref_nodes'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -3533,8 +3533,8 @@ $result_nodes{'htmlxref_nodes'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono.pl 
b/tp/t/results/htmlxref/htmlxref_only_mono.pl
index 678fcc46fd..847086c211 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono.pl
@@ -3460,7 +3460,6 @@ id: local-node
 
 $result_sectioning{'htmlxref_only_mono'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -3474,7 +3473,6 @@ $result_sectioning{'htmlxref_only_mono'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -3488,18 +3486,20 @@ $result_sectioning{'htmlxref_only_mono'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'htmlxref_only_mono'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'htmlxref_only_mono'}{'structure'}{'section_childs'}[0];
@@ -3514,7 +3514,7 @@ $result_nodes{'htmlxref_only_mono'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -3533,8 +3533,8 @@ $result_nodes{'htmlxref_only_mono'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
index 39d8c17c61..5f424b6fec 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
@@ -3460,7 +3460,6 @@ id: local-node
 
 $result_sectioning{'htmlxref_only_mono_nodes'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -3474,7 +3473,6 @@ $result_sectioning{'htmlxref_only_mono_nodes'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -3488,18 +3486,20 @@ $result_sectioning{'htmlxref_only_mono_nodes'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'htmlxref_only_mono_nodes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'htmlxref_only_mono_nodes'}{'structure'}{'section_childs'}[0];
@@ -3514,7 +3514,7 @@ $result_nodes{'htmlxref_only_mono_nodes'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -3533,8 +3533,8 @@ $result_nodes{'htmlxref_only_mono_nodes'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
diff --git a/tp/t/results/htmlxref/htmlxref_only_split.pl 
b/tp/t/results/htmlxref/htmlxref_only_split.pl
index d59f355c2a..d389e39dce 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split.pl
@@ -3460,7 +3460,6 @@ id: local-node
 
 $result_sectioning{'htmlxref_only_split'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -3474,7 +3473,6 @@ $result_sectioning{'htmlxref_only_split'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -3488,18 +3486,20 @@ $result_sectioning{'htmlxref_only_split'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'htmlxref_only_split'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'htmlxref_only_split'}{'structure'}{'section_childs'}[0];
@@ -3514,7 +3514,7 @@ $result_nodes{'htmlxref_only_split'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -3533,8 +3533,8 @@ $result_nodes{'htmlxref_only_split'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
diff --git a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
index 3d0dbcf0c3..f15ff438b9 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
@@ -3460,7 +3460,6 @@ id: local-node
 
 $result_sectioning{'htmlxref_only_split_nodes'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -3474,7 +3473,6 @@ $result_sectioning{'htmlxref_only_split_nodes'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -3488,18 +3486,20 @@ $result_sectioning{'htmlxref_only_split_nodes'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'htmlxref_only_split_nodes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'htmlxref_only_split_nodes'}{'structure'}{'section_childs'}[0];
@@ -3514,7 +3514,7 @@ $result_nodes{'htmlxref_only_split_nodes'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -3533,8 +3533,8 @@ $result_nodes{'htmlxref_only_split_nodes'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
diff --git a/tp/t/results/include/macro_and_commands_in_early_commands.pl 
b/tp/t/results/include/macro_and_commands_in_early_commands.pl
index 48d71cb9a1..91f6c3a0e4 100644
--- a/tp/t/results/include/macro_and_commands_in_early_commands.pl
+++ b/tp/t/results/include/macro_and_commands_in_early_commands.pl
@@ -531,7 +531,6 @@ in themacro
 
 $result_sectioning{'macro_and_commands_in_early_commands'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -545,11 +544,12 @@ 
$result_sectioning{'macro_and_commands_in_early_commands'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'macro_and_commands_in_early_commands'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'macro_and_commands_in_early_commands'};
@@ -561,7 +561,7 @@ $result_nodes{'macro_and_commands_in_early_commands'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/include/macro_in_early_commands.pl 
b/tp/t/results/include/macro_in_early_commands.pl
index b7ab6de1f7..4fa3933e35 100644
--- a/tp/t/results/include/macro_in_early_commands.pl
+++ b/tp/t/results/include/macro_in_early_commands.pl
@@ -626,7 +626,6 @@ texi_commands.info
 
 $result_sectioning{'macro_in_early_commands'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -640,11 +639,12 @@ $result_sectioning{'macro_in_early_commands'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'macro_in_early_commands'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'macro_in_early_commands'};
@@ -656,7 +656,7 @@ $result_nodes{'macro_in_early_commands'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/indices/def_syn_indices.pl 
b/tp/t/results/indices/def_syn_indices.pl
index 339e9d1e15..f3e9cdfaf8 100644
--- a/tp/t/results/indices/def_syn_indices.pl
+++ b/tp/t/results/indices/def_syn_indices.pl
@@ -1682,7 +1682,6 @@ fn
 
 $result_sectioning{'def_syn_indices'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1696,7 +1695,6 @@ $result_sectioning{'def_syn_indices'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1711,18 +1709,20 @@ $result_sectioning{'def_syn_indices'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'def_syn_indices'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'def_syn_indices'}{'structure'}{'section_childs'}[0];
@@ -1737,7 +1737,7 @@ $result_nodes{'def_syn_indices'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -1750,8 +1750,8 @@ $result_nodes{'def_syn_indices'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'isindex' => 1,
diff --git a/tp/t/results/indices/double_seeentry_seealso.pl 
b/tp/t/results/indices/double_seeentry_seealso.pl
index 0797666564..6659bf49f7 100644
--- a/tp/t/results/indices/double_seeentry_seealso.pl
+++ b/tp/t/results/indices/double_seeentry_seealso.pl
@@ -770,7 +770,6 @@ top
 
 $result_sectioning{'double_seeentry_seealso'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -784,7 +783,6 @@ $result_sectioning{'double_seeentry_seealso'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -799,18 +797,20 @@ $result_sectioning{'double_seeentry_seealso'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'double_seeentry_seealso'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'double_seeentry_seealso'}{'structure'}{'section_childs'}[0];
@@ -825,7 +825,7 @@ $result_nodes{'double_seeentry_seealso'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -838,8 +838,8 @@ $result_nodes{'double_seeentry_seealso'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'isindex' => 1,
diff --git a/tp/t/results/indices/encoding_index_ascii.pl 
b/tp/t/results/indices/encoding_index_ascii.pl
index 995fa9e1e1..d924a588fb 100644
--- a/tp/t/results/indices/encoding_index_ascii.pl
+++ b/tp/t/results/indices/encoding_index_ascii.pl
@@ -3536,7 +3536,6 @@ top
 
 $result_sectioning{'encoding_index_ascii'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -3550,11 +3549,12 @@ $result_sectioning{'encoding_index_ascii'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'encoding_index_ascii'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'encoding_index_ascii'};
@@ -3566,7 +3566,7 @@ $result_nodes{'encoding_index_ascii'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'isindex' => 1,
diff --git a/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl 
b/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
index 2157a94c0f..79bc232619 100644
--- a/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
@@ -3536,7 +3536,6 @@ top
 
 $result_sectioning{'encoding_index_ascii_enable_encoding'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -3550,11 +3549,12 @@ 
$result_sectioning{'encoding_index_ascii_enable_encoding'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'encoding_index_ascii_enable_encoding'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'encoding_index_ascii_enable_encoding'};
@@ -3566,7 +3566,7 @@ $result_nodes{'encoding_index_ascii_enable_encoding'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'isindex' => 1,
diff --git a/tp/t/results/indices/encoding_index_latin1.pl 
b/tp/t/results/indices/encoding_index_latin1.pl
index d39ae856cd..c9c4e683f0 100644
--- a/tp/t/results/indices/encoding_index_latin1.pl
+++ b/tp/t/results/indices/encoding_index_latin1.pl
@@ -3521,7 +3521,6 @@ top
 
 $result_sectioning{'encoding_index_latin1'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -3535,11 +3534,12 @@ $result_sectioning{'encoding_index_latin1'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'encoding_index_latin1'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'encoding_index_latin1'};
@@ -3551,7 +3551,7 @@ $result_nodes{'encoding_index_latin1'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'isindex' => 1,
diff --git a/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl 
b/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
index a6ce1c55d6..f3bdbf98bb 100644
--- a/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
@@ -3521,7 +3521,6 @@ top
 
 $result_sectioning{'encoding_index_latin1_enable_encoding'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -3535,11 +3534,12 @@ 
$result_sectioning{'encoding_index_latin1_enable_encoding'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'encoding_index_latin1_enable_encoding'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'encoding_index_latin1_enable_encoding'};
@@ -3551,7 +3551,7 @@ $result_nodes{'encoding_index_latin1_enable_encoding'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'isindex' => 1,
diff --git a/tp/t/results/indices/encoding_index_utf8.pl 
b/tp/t/results/indices/encoding_index_utf8.pl
index 5d02b28a4d..a0ffb38d6e 100644
--- a/tp/t/results/indices/encoding_index_utf8.pl
+++ b/tp/t/results/indices/encoding_index_utf8.pl
@@ -3521,7 +3521,6 @@ top
 
 $result_sectioning{'encoding_index_utf8'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -3535,11 +3534,12 @@ $result_sectioning{'encoding_index_utf8'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'encoding_index_utf8'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'encoding_index_utf8'};
@@ -3551,7 +3551,7 @@ $result_nodes{'encoding_index_utf8'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'isindex' => 1,
diff --git a/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl 
b/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
index ed83f4d300..497f150d70 100644
--- a/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
@@ -3521,7 +3521,6 @@ top
 
 $result_sectioning{'encoding_index_utf8_enable_encoding'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -3535,11 +3534,12 @@ 
$result_sectioning{'encoding_index_utf8_enable_encoding'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'encoding_index_utf8_enable_encoding'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'encoding_index_utf8_enable_encoding'};
@@ -3551,7 +3551,7 @@ $result_nodes{'encoding_index_utf8_enable_encoding'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'isindex' => 1,
diff --git a/tp/t/results/indices/explicit_sort_key.pl 
b/tp/t/results/indices/explicit_sort_key.pl
index abc85dfc25..1b897adfde 100644
--- a/tp/t/results/indices/explicit_sort_key.pl
+++ b/tp/t/results/indices/explicit_sort_key.pl
@@ -800,7 +800,6 @@ and cmd.
 
 $result_sectioning{'explicit_sort_key'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -814,11 +813,12 @@ $result_sectioning{'explicit_sort_key'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'explicit_sort_key'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'explicit_sort_key'};
@@ -830,7 +830,7 @@ $result_nodes{'explicit_sort_key'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'isindex' => 1,
diff --git a/tp/t/results/indices/printindex_index_entry_in_copying.pl 
b/tp/t/results/indices/printindex_index_entry_in_copying.pl
index 1604ce34d3..1753194432 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -1143,7 +1143,6 @@ Top.
 
 $result_sectioning{'printindex_index_entry_in_copying'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1157,7 +1156,6 @@ $result_sectioning{'printindex_index_entry_in_copying'} = 
{
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1172,18 +1170,20 @@ $result_sectioning{'printindex_index_entry_in_copying'} 
= {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'printindex_index_entry_in_copying'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'printindex_index_entry_in_copying'}{'structure'}{'section_childs'}[0];
@@ -1198,7 +1198,7 @@ $result_nodes{'printindex_index_entry_in_copying'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1217,8 +1217,8 @@ $result_nodes{'printindex_index_entry_in_copying'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'isindex' => 1,
diff --git 
a/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl 
b/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
index f0282c46b9..9efb748470 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
@@ -667,7 +667,6 @@ Top.
 
 $result_sectioning{'printindex_index_entry_in_copying_in_footnote'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -681,7 +680,6 @@ 
$result_sectioning{'printindex_index_entry_in_copying_in_footnote'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -695,18 +693,20 @@ 
$result_sectioning{'printindex_index_entry_in_copying_in_footnote'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'printindex_index_entry_in_copying_in_footnote'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'printindex_index_entry_in_copying_in_footnote'}{'structure'}{'section_childs'}[0];
@@ -721,7 +721,7 @@ 
$result_nodes{'printindex_index_entry_in_copying_in_footnote'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -740,8 +740,8 @@ 
$result_nodes{'printindex_index_entry_in_copying_in_footnote'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter'
diff --git 
a/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl 
b/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
index 7e40a2d881..56cc11ed42 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
@@ -1103,7 +1103,6 @@ Top.
 
 $result_sectioning{'printindex_index_entry_in_copying_no_insertcopying'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1117,7 +1116,6 @@ 
$result_sectioning{'printindex_index_entry_in_copying_no_insertcopying'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1132,18 +1130,20 @@ 
$result_sectioning{'printindex_index_entry_in_copying_no_insertcopying'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'printindex_index_entry_in_copying_no_insertcopying'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'printindex_index_entry_in_copying_no_insertcopying'}{'structure'}{'section_childs'}[0];
@@ -1158,7 +1158,7 @@ 
$result_nodes{'printindex_index_entry_in_copying_no_insertcopying'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1177,8 +1177,8 @@ 
$result_nodes{'printindex_index_entry_in_copying_no_insertcopying'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'isindex' => 1,
diff --git a/tp/t/results/indices/same_index_entry_merged_indices.pl 
b/tp/t/results/indices/same_index_entry_merged_indices.pl
index 2e1877cd05..ebab1900dc 100644
--- a/tp/t/results/indices/same_index_entry_merged_indices.pl
+++ b/tp/t/results/indices/same_index_entry_merged_indices.pl
@@ -592,7 +592,6 @@ This variable represents MMM Mode.
 
 $result_sectioning{'same_index_entry_merged_indices'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -606,11 +605,12 @@ $result_sectioning{'same_index_entry_merged_indices'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'same_index_entry_merged_indices'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'same_index_entry_merged_indices'};
@@ -622,7 +622,7 @@ $result_nodes{'same_index_entry_merged_indices'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'isindex' => 1,
diff --git a/tp/t/results/indices/seeentry.pl b/tp/t/results/indices/seeentry.pl
index 8fe5f58399..a46654c6be 100644
--- a/tp/t/results/indices/seeentry.pl
+++ b/tp/t/results/indices/seeentry.pl
@@ -654,7 +654,6 @@ $result_texts{'seeentry'} = '
 
 $result_sectioning{'seeentry'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -668,7 +667,6 @@ $result_sectioning{'seeentry'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -683,18 +681,20 @@ $result_sectioning{'seeentry'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'seeentry'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'seeentry'}{'structure'}{'section_childs'}[0];
@@ -709,7 +709,7 @@ $result_nodes{'seeentry'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -722,8 +722,8 @@ $result_nodes{'seeentry'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'isindex' => 1,
diff --git a/tp/t/results/indices/subentries.pl 
b/tp/t/results/indices/subentries.pl
index 15a2d9397b..5ebfd2baf2 100644
--- a/tp/t/results/indices/subentries.pl
+++ b/tp/t/results/indices/subentries.pl
@@ -1118,7 +1118,6 @@ $result_texts{'subentries'} = '
 
 $result_sectioning{'subentries'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1132,7 +1131,6 @@ $result_sectioning{'subentries'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1147,18 +1145,20 @@ $result_sectioning{'subentries'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'subentries'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'subentries'}{'structure'}{'section_childs'}[0];
@@ -1173,7 +1173,7 @@ $result_nodes{'subentries'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -1186,8 +1186,8 @@ $result_nodes{'subentries'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'isindex' => 1,
diff --git a/tp/t/results/indices/subentry_and_sortas.pl 
b/tp/t/results/indices/subentry_and_sortas.pl
index 84c39cea88..e84417b0f7 100644
--- a/tp/t/results/indices/subentry_and_sortas.pl
+++ b/tp/t/results/indices/subentry_and_sortas.pl
@@ -624,7 +624,6 @@ $result_texts{'subentry_and_sortas'} = '
 
 $result_sectioning{'subentry_and_sortas'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -638,7 +637,6 @@ $result_sectioning{'subentry_and_sortas'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -653,18 +651,20 @@ $result_sectioning{'subentry_and_sortas'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'subentry_and_sortas'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'subentry_and_sortas'}{'structure'}{'section_childs'}[0];
@@ -679,7 +679,7 @@ $result_nodes{'subentry_and_sortas'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -692,8 +692,8 @@ $result_nodes{'subentry_and_sortas'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'isindex' => 1,
diff --git a/tp/t/results/indices/syncode_index_print_both.pl 
b/tp/t/results/indices/syncode_index_print_both.pl
index 4160ba3154..6be29dd964 100644
--- a/tp/t/results/indices/syncode_index_print_both.pl
+++ b/tp/t/results/indices/syncode_index_print_both.pl
@@ -549,7 +549,6 @@ Print cp
 
 $result_sectioning{'syncode_index_print_both'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -563,7 +562,6 @@ $result_sectioning{'syncode_index_print_both'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -578,18 +576,20 @@ $result_sectioning{'syncode_index_print_both'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'syncode_index_print_both'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'syncode_index_print_both'}{'structure'}{'section_childs'}[0];
@@ -604,7 +604,7 @@ $result_nodes{'syncode_index_print_both'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -617,8 +617,8 @@ $result_nodes{'syncode_index_print_both'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'isindex' => 1,
diff --git a/tp/t/results/indices/transparent_sort_chars.pl 
b/tp/t/results/indices/transparent_sort_chars.pl
index d35dd723ba..e61a602502 100644
--- a/tp/t/results/indices/transparent_sort_chars.pl
+++ b/tp/t/results/indices/transparent_sort_chars.pl
@@ -392,7 +392,6 @@ $result_texts{'transparent_sort_chars'} = '
 
 $result_sectioning{'transparent_sort_chars'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -406,11 +405,12 @@ $result_sectioning{'transparent_sort_chars'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'transparent_sort_chars'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'transparent_sort_chars'};
@@ -422,7 +422,7 @@ $result_nodes{'transparent_sort_chars'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'isindex' => 1,
diff --git a/tp/t/results/indices/w_lines_count.pl 
b/tp/t/results/indices/w_lines_count.pl
index 8d8a30cdca..d41303a853 100644
--- a/tp/t/results/indices/w_lines_count.pl
+++ b/tp/t/results/indices/w_lines_count.pl
@@ -347,7 +347,6 @@ Compilation mode also defines the keys SPC and DEL to
 
 $result_sectioning{'w_lines_count'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -361,11 +360,12 @@ $result_sectioning{'w_lines_count'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'w_lines_count'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'w_lines_count'};
@@ -377,7 +377,7 @@ $result_nodes{'w_lines_count'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'isindex' => 1,
diff --git a/tp/t/results/info_tests/anchor_and_spaces.pl 
b/tp/t/results/info_tests/anchor_and_spaces.pl
index ef5d9ec4ea..e0d5730e95 100644
--- a/tp/t/results/info_tests/anchor_and_spaces.pl
+++ b/tp/t/results/info_tests/anchor_and_spaces.pl
@@ -269,7 +269,6 @@ No space.
 
 $result_sectioning{'anchor_and_spaces'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -282,11 +281,12 @@ $result_sectioning{'anchor_and_spaces'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'anchor_and_spaces'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'anchor_and_spaces'};
@@ -298,7 +298,7 @@ $result_nodes{'anchor_and_spaces'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/info_tests/before_node_and_section.pl 
b/tp/t/results/info_tests/before_node_and_section.pl
index 98f9d78c51..a9f8c19b74 100644
--- a/tp/t/results/info_tests/before_node_and_section.pl
+++ b/tp/t/results/info_tests/before_node_and_section.pl
@@ -872,7 +872,6 @@ ref to anchor1, which is before @node Top: anchor1.
 
 $result_sectioning{'before_node_and_section'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -886,7 +885,6 @@ $result_sectioning{'before_node_and_section'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -901,18 +899,20 @@ $result_sectioning{'before_node_and_section'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'before_node_and_section'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'before_node_and_section'}{'structure'}{'section_childs'}[0];
@@ -927,7 +927,7 @@ $result_nodes{'before_node_and_section'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -946,8 +946,8 @@ $result_nodes{'before_node_and_section'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'isindex' => 1,
diff --git a/tp/t/results/info_tests/def_in_copying.pl 
b/tp/t/results/info_tests/def_in_copying.pl
index bcb5a5790e..4b115c87aa 100644
--- a/tp/t/results/info_tests/def_in_copying.pl
+++ b/tp/t/results/info_tests/def_in_copying.pl
@@ -901,7 +901,6 @@ deffnx lines
 
 $result_sectioning{'def_in_copying'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -915,11 +914,12 @@ $result_sectioning{'def_in_copying'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'def_in_copying'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'def_in_copying'};
@@ -931,7 +931,7 @@ $result_nodes{'def_in_copying'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'isindex' => 1,
diff --git a/tp/t/results/info_tests/direntry_dircategory_and_commands.pl 
b/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
index 8ca5487e49..e296c78e74 100644
--- a/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
+++ b/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
@@ -621,7 +621,6 @@ Text
 
 $result_sectioning{'direntry_dircategory_and_commands'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -634,11 +633,12 @@ $result_sectioning{'direntry_dircategory_and_commands'} = 
{
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'direntry_dircategory_and_commands'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'direntry_dircategory_and_commands'};
@@ -650,7 +650,7 @@ $result_nodes{'direntry_dircategory_and_commands'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/info_tests/index_entry_at_end_node.pl 
b/tp/t/results/info_tests/index_entry_at_end_node.pl
index d68f4e3f19..8499b4d2be 100644
--- a/tp/t/results/info_tests/index_entry_at_end_node.pl
+++ b/tp/t/results/info_tests/index_entry_at_end_node.pl
@@ -630,7 +630,6 @@ Appendix A indices
 
 $result_sectioning{'index_entry_at_end_node'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -644,7 +643,6 @@ $result_sectioning{'index_entry_at_end_node'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -658,8 +656,8 @@ $result_sectioning{'index_entry_at_end_node'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -678,8 +676,8 @@ $result_sectioning{'index_entry_at_end_node'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 'A',
+                'section_level' => 1,
+                'section_number' => 'A',
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -687,10 +685,12 @@ $result_sectioning{'index_entry_at_end_node'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'index_entry_at_end_node'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'index_entry_at_end_node'}{'structure'}{'section_childs'}[0];
@@ -709,7 +709,7 @@ $result_nodes{'index_entry_at_end_node'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -728,8 +728,8 @@ $result_nodes{'index_entry_at_end_node'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter'
@@ -742,8 +742,8 @@ $result_nodes{'index_entry_at_end_node'} = {
               'cmdname' => 'appendix',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 'A'
+                'section_level' => 1,
+                'section_number' => 'A'
               }
             },
             'isindex' => 1,
diff --git a/tp/t/results/info_tests/no_node_but_top.pl 
b/tp/t/results/info_tests/no_node_but_top.pl
index 570dd91856..994576d5fa 100644
--- a/tp/t/results/info_tests/no_node_but_top.pl
+++ b/tp/t/results/info_tests/no_node_but_top.pl
@@ -59,17 +59,17 @@ $result_texts{'no_node_but_top'} = 'top
 
 $result_sectioning{'no_node_but_top'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
         'extra' => {},
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'no_node_but_top'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'no_node_but_top'};
diff --git a/tp/t/results/info_tests/paragraphindent_and_preamble.pl 
b/tp/t/results/info_tests/paragraphindent_and_preamble.pl
index 70498cc5cd..7c34e75504 100644
--- a/tp/t/results/info_tests/paragraphindent_and_preamble.pl
+++ b/tp/t/results/info_tests/paragraphindent_and_preamble.pl
@@ -365,7 +365,6 @@ After paragraphindent.
 
 $result_sectioning{'paragraphindent_and_preamble'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -378,11 +377,12 @@ $result_sectioning{'paragraphindent_and_preamble'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'paragraphindent_and_preamble'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'paragraphindent_and_preamble'};
@@ -394,7 +394,7 @@ $result_nodes{'paragraphindent_and_preamble'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/info_tests/space_in_menu.pl 
b/tp/t/results/info_tests/space_in_menu.pl
index c880e03ba1..83dcee2171 100644
--- a/tp/t/results/info_tests/space_in_menu.pl
+++ b/tp/t/results/info_tests/space_in_menu.pl
@@ -387,7 +387,6 @@ in chapter.
 
 $result_sectioning{'space_in_menu'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -401,7 +400,6 @@ $result_sectioning{'space_in_menu'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -415,18 +413,20 @@ $result_sectioning{'space_in_menu'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'space_in_menu'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'space_in_menu'}{'structure'}{'section_childs'}[0];
@@ -441,7 +441,7 @@ $result_nodes{'space_in_menu'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -460,8 +460,8 @@ $result_nodes{'space_in_menu'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'node'
diff --git a/tp/t/results/info_tests/split_no_copying.pl 
b/tp/t/results/info_tests/split_no_copying.pl
index 568d17309f..06db0df641 100644
--- a/tp/t/results/info_tests/split_no_copying.pl
+++ b/tp/t/results/info_tests/split_no_copying.pl
@@ -469,7 +469,6 @@ First chapter.
 
 $result_sectioning{'split_no_copying'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -483,7 +482,6 @@ $result_sectioning{'split_no_copying'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -497,18 +495,20 @@ $result_sectioning{'split_no_copying'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'split_no_copying'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'split_no_copying'}{'structure'}{'section_childs'}[0];
@@ -523,7 +523,7 @@ $result_nodes{'split_no_copying'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -542,8 +542,8 @@ $result_nodes{'split_no_copying'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'Ch1'
diff --git a/tp/t/results/info_tests/split_test_before_first_node.pl 
b/tp/t/results/info_tests/split_test_before_first_node.pl
index 3b9da78675..934408955b 100644
--- a/tp/t/results/info_tests/split_test_before_first_node.pl
+++ b/tp/t/results/info_tests/split_test_before_first_node.pl
@@ -463,7 +463,6 @@ In chap1.
 
 $result_sectioning{'split_test_before_first_node'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -477,7 +476,6 @@ $result_sectioning{'split_test_before_first_node'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -491,18 +489,20 @@ $result_sectioning{'split_test_before_first_node'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'split_test_before_first_node'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'split_test_before_first_node'}{'structure'}{'section_childs'}[0];
@@ -517,7 +517,7 @@ $result_nodes{'split_test_before_first_node'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -536,8 +536,8 @@ $result_nodes{'split_test_before_first_node'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chap1'
diff --git 
a/tp/t/results/info_tests/split_test_before_first_node_no_empty_line.pl 
b/tp/t/results/info_tests/split_test_before_first_node_no_empty_line.pl
index 9f0f2af2cf..12471e5c7a 100644
--- a/tp/t/results/info_tests/split_test_before_first_node_no_empty_line.pl
+++ b/tp/t/results/info_tests/split_test_before_first_node_no_empty_line.pl
@@ -454,7 +454,6 @@ In chap1.
 
 $result_sectioning{'split_test_before_first_node_no_empty_line'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -468,7 +467,6 @@ 
$result_sectioning{'split_test_before_first_node_no_empty_line'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -482,18 +480,20 @@ 
$result_sectioning{'split_test_before_first_node_no_empty_line'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'split_test_before_first_node_no_empty_line'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'split_test_before_first_node_no_empty_line'}{'structure'}{'section_childs'}[0];
@@ -508,7 +508,7 @@ $result_nodes{'split_test_before_first_node_no_empty_line'} 
= {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -527,8 +527,8 @@ $result_nodes{'split_test_before_first_node_no_empty_line'} 
= {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chap1'
diff --git a/tp/t/results/info_tests/test_index.pl 
b/tp/t/results/info_tests/test_index.pl
index c7e9e89e25..861c147511 100644
--- a/tp/t/results/info_tests/test_index.pl
+++ b/tp/t/results/info_tests/test_index.pl
@@ -4315,7 +4315,6 @@ B chapter end
 
 $result_sectioning{'test_index'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -4329,7 +4328,6 @@ $result_sectioning{'test_index'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -4343,8 +4341,8 @@ $result_sectioning{'test_index'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -4363,41 +4361,41 @@ $result_sectioning{'test_index'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 'A',
                 'section_childs' => [
                   {
                     'cmdname' => 'appendixsec',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => 'A.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'appendixsubsec',
                           'extra' => {},
                           'structure' => {
-                            'level' => 3,
-                            'number' => 'A.1.1',
                             'section_childs' => [
                               {
                                 'cmdname' => 'appendixsubsubsec',
                                 'extra' => {},
                                 'structure' => {
-                                  'level' => 4,
-                                  'number' => 'A.1.1.1',
+                                  'section_level' => 4,
+                                  'section_number' => 'A.1.1.1',
                                   'section_up' => {}
                                 }
                               }
                             ],
+                            'section_level' => 3,
+                            'section_number' => 'A.1.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => 'A.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 'A',
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -4408,7 +4406,7 @@ $result_sectioning{'test_index'} = {
               'cmdname' => 'centerchap',
               'extra' => {},
               'structure' => {
-                'level' => 1,
+                'section_level' => 1,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -4419,8 +4417,8 @@ $result_sectioning{'test_index'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 'B',
+                'section_level' => 1,
+                'section_number' => 'B',
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -4428,10 +4426,12 @@ $result_sectioning{'test_index'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'test_index'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'test_index'}{'structure'}{'section_childs'}[0];
@@ -4461,7 +4461,7 @@ $result_nodes{'test_index'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -4480,8 +4480,8 @@ $result_nodes{'test_index'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'name'
@@ -4494,8 +4494,8 @@ $result_nodes{'test_index'} = {
               'cmdname' => 'appendix',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 'A'
+                'section_level' => 1,
+                'section_number' => 'A'
               }
             },
             'isindex' => 1,
diff --git a/tp/t/results/info_tests/text_before_node.pl 
b/tp/t/results/info_tests/text_before_node.pl
index bafb167ed5..f62b3be9ed 100644
--- a/tp/t/results/info_tests/text_before_node.pl
+++ b/tp/t/results/info_tests/text_before_node.pl
@@ -348,7 +348,6 @@ text.
 
 $result_sectioning{'text_before_node'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -362,7 +361,6 @@ $result_sectioning{'text_before_node'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -376,18 +374,20 @@ $result_sectioning{'text_before_node'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'text_before_node'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'text_before_node'}{'structure'}{'section_childs'}[0];
@@ -402,7 +402,7 @@ $result_nodes{'text_before_node'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -421,8 +421,8 @@ $result_nodes{'text_before_node'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter-node'
diff --git a/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl 
b/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl
index d1e26fb41a..c8d5c0f506 100644
--- a/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl
+++ b/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl
@@ -199,7 +199,6 @@ $result_texts{'node_in_copying_not_closed'} = 'Top section
 
 $result_sectioning{'node_in_copying_not_closed'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -213,11 +212,12 @@ $result_sectioning{'node_in_copying_not_closed'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'node_in_copying_not_closed'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'node_in_copying_not_closed'};
@@ -229,7 +229,7 @@ $result_nodes{'node_in_copying_not_closed'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/invalid_nestings/on_section_line.pl 
b/tp/t/results/invalid_nestings/on_section_line.pl
index 353850f576..9fc7599a41 100644
--- a/tp/t/results/invalid_nestings/on_section_line.pl
+++ b/tp/t/results/invalid_nestings/on_section_line.pl
@@ -205,18 +205,18 @@ $result_texts{'on_section_line'} = '1 Text in titlefont  
exdent
 
 $result_sectioning{'on_section_line'} = {
   'structure' => {
-    'level' => 1,
     'section_childs' => [
       {
         'cmdname' => 'section',
         'extra' => {},
         'structure' => {
-          'level' => 2,
-          'number' => 1,
+          'section_level' => 2,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 1
   }
 };
 
$result_sectioning{'on_section_line'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'on_section_line'};
diff --git a/tp/t/results/invalid_nestings/section_in_copying.pl 
b/tp/t/results/invalid_nestings/section_in_copying.pl
index b0498bb100..a7c3063ca1 100644
--- a/tp/t/results/invalid_nestings/section_in_copying.pl
+++ b/tp/t/results/invalid_nestings/section_in_copying.pl
@@ -114,18 +114,18 @@ $result_texts{'section_in_copying'} = '1 section
 
 $result_sectioning{'section_in_copying'} = {
   'structure' => {
-    'level' => 1,
     'section_childs' => [
       {
         'cmdname' => 'section',
         'extra' => {},
         'structure' => {
-          'level' => 2,
-          'number' => 1,
+          'section_level' => 2,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 1
   }
 };
 
$result_sectioning{'section_in_copying'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'section_in_copying'};
diff --git a/tp/t/results/invalid_nestings/section_in_flushright.pl 
b/tp/t/results/invalid_nestings/section_in_flushright.pl
index 99ba349ac3..34eaa61ac4 100644
--- a/tp/t/results/invalid_nestings/section_in_flushright.pl
+++ b/tp/t/results/invalid_nestings/section_in_flushright.pl
@@ -117,18 +117,18 @@ text flushed right
 
 $result_sectioning{'section_in_flushright'} = {
   'structure' => {
-    'level' => 1,
     'section_childs' => [
       {
         'cmdname' => 'section',
         'extra' => {},
         'structure' => {
-          'level' => 2,
-          'number' => 1,
+          'section_level' => 2,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 1
   }
 };
 
$result_sectioning{'section_in_flushright'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'section_in_flushright'};
diff --git a/tp/t/results/invalid_nestings/section_in_footnote.pl 
b/tp/t/results/invalid_nestings/section_in_footnote.pl
index e1deaa55b5..56533a3e36 100644
--- a/tp/t/results/invalid_nestings/section_in_footnote.pl
+++ b/tp/t/results/invalid_nestings/section_in_footnote.pl
@@ -114,18 +114,18 @@ Text1 a section
 
 $result_sectioning{'section_in_footnote'} = {
   'structure' => {
-    'level' => 1,
     'section_childs' => [
       {
         'cmdname' => 'section',
         'extra' => {},
         'structure' => {
-          'level' => 2,
-          'number' => 1,
+          'section_level' => 2,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 1
   }
 };
 
$result_sectioning{'section_in_footnote'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'section_in_footnote'};
diff --git a/tp/t/results/invalid_nestings/section_in_math.pl 
b/tp/t/results/invalid_nestings/section_in_math.pl
index b307d9c29c..3e3f6fd138 100644
--- a/tp/t/results/invalid_nestings/section_in_math.pl
+++ b/tp/t/results/invalid_nestings/section_in_math.pl
@@ -232,14 +232,13 @@ More in math
 
 $result_sectioning{'section_in_math'} = {
   'structure' => {
-    'level' => 1,
     'section_childs' => [
       {
         'cmdname' => 'section',
         'extra' => {},
         'structure' => {
-          'level' => 2,
-          'number' => 1,
+          'section_level' => 2,
+          'section_number' => 1,
           'section_up' => {}
         }
       },
@@ -247,14 +246,15 @@ $result_sectioning{'section_in_math'} = {
         'cmdname' => 'section',
         'extra' => {},
         'structure' => {
-          'level' => 2,
-          'number' => 2,
+          'section_level' => 2,
+          'section_number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'toplevel_prev' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 1
   }
 };
 
$result_sectioning{'section_in_math'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'section_in_math'};
diff --git a/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl 
b/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
index a8f4392c38..a191fbd24c 100644
--- a/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
+++ b/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
@@ -238,18 +238,18 @@ in quotation
 
 $result_sectioning{'section_in_nested_block_commands'} = {
   'structure' => {
-    'level' => 1,
     'section_childs' => [
       {
         'cmdname' => 'section',
         'extra' => {},
         'structure' => {
-          'level' => 2,
-          'number' => 1,
+          'section_level' => 2,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 1
   }
 };
 
$result_sectioning{'section_in_nested_block_commands'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'section_in_nested_block_commands'};
diff --git a/tp/t/results/invalid_nestings/section_in_table.pl 
b/tp/t/results/invalid_nestings/section_in_table.pl
index 1e090c99d2..8a929aea5d 100644
--- a/tp/t/results/invalid_nestings/section_in_table.pl
+++ b/tp/t/results/invalid_nestings/section_in_table.pl
@@ -206,18 +206,18 @@ After
 
 $result_sectioning{'section_in_table'} = {
   'structure' => {
-    'level' => 1,
     'section_childs' => [
       {
         'cmdname' => 'section',
         'extra' => {},
         'structure' => {
-          'level' => 2,
-          'number' => 1,
+          'section_level' => 2,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 1
   }
 };
 
$result_sectioning{'section_in_table'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'section_in_table'};
diff --git a/tp/t/results/invalid_nestings/section_on_def_line.pl 
b/tp/t/results/invalid_nestings/section_on_def_line.pl
index 095be78b90..af384371bd 100644
--- a/tp/t/results/invalid_nestings/section_on_def_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_def_line.pl
@@ -137,18 +137,18 @@ Something
 
 $result_sectioning{'section_on_def_line'} = {
   'structure' => {
-    'level' => 1,
     'section_childs' => [
       {
         'cmdname' => 'section',
         'extra' => {},
         'structure' => {
-          'level' => 2,
-          'number' => 1,
+          'section_level' => 2,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 1
   }
 };
 
$result_sectioning{'section_on_def_line'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'section_on_def_line'};
diff --git a/tp/t/results/invalid_nestings/section_on_defx_line.pl 
b/tp/t/results/invalid_nestings/section_on_defx_line.pl
index eb6786f4bb..e6fdd526f9 100644
--- a/tp/t/results/invalid_nestings/section_on_defx_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_defx_line.pl
@@ -257,18 +257,18 @@ Something
 
 $result_sectioning{'section_on_defx_line'} = {
   'structure' => {
-    'level' => 1,
     'section_childs' => [
       {
         'cmdname' => 'section',
         'extra' => {},
         'structure' => {
-          'level' => 2,
-          'number' => 1,
+          'section_level' => 2,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 1
   }
 };
 
$result_sectioning{'section_on_defx_line'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'section_on_defx_line'};
diff --git a/tp/t/results/invalid_nestings/section_on_index_entry_line.pl 
b/tp/t/results/invalid_nestings/section_on_index_entry_line.pl
index 7e6a3a3538..c8cbc16b72 100644
--- a/tp/t/results/invalid_nestings/section_on_index_entry_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_index_entry_line.pl
@@ -112,18 +112,18 @@ Somethin
 
 $result_sectioning{'section_on_index_entry_line'} = {
   'structure' => {
-    'level' => 1,
     'section_childs' => [
       {
         'cmdname' => 'section',
         'extra' => {},
         'structure' => {
-          'level' => 2,
-          'number' => 1,
+          'section_level' => 2,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 1
   }
 };
 
$result_sectioning{'section_on_index_entry_line'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'section_on_index_entry_line'};
diff --git 
a/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl 
b/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
index a54743bec2..aec1020b6d 100644
--- a/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
+++ b/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
@@ -433,7 +433,6 @@ still not closed
 
 $result_sectioning{'style_not_closed_no_newline_root_commands'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -447,7 +446,6 @@ 
$result_sectioning{'style_not_closed_no_newline_root_commands'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -461,18 +459,20 @@ 
$result_sectioning{'style_not_closed_no_newline_root_commands'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'style_not_closed_no_newline_root_commands'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'style_not_closed_no_newline_root_commands'}{'structure'}{'section_childs'}[0];
@@ -487,7 +487,7 @@ $result_nodes{'style_not_closed_no_newline_root_commands'} 
= {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -506,8 +506,8 @@ $result_nodes{'style_not_closed_no_newline_root_commands'} 
= {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter'
diff --git a/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl 
b/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl
index 59edc1ee9e..c7564c9133 100644
--- a/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl
+++ b/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl
@@ -451,7 +451,6 @@ still not closed
 
 $result_sectioning{'style_not_closed_root_commands'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -465,7 +464,6 @@ $result_sectioning{'style_not_closed_root_commands'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -479,18 +477,20 @@ $result_sectioning{'style_not_closed_root_commands'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'style_not_closed_root_commands'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'style_not_closed_root_commands'}{'structure'}{'section_childs'}[0];
@@ -505,7 +505,7 @@ $result_nodes{'style_not_closed_root_commands'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -524,8 +524,8 @@ $result_nodes{'style_not_closed_root_commands'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter'
diff --git a/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl 
b/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl
index 71f7853c34..afff59dc1d 100644
--- a/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl
+++ b/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl
@@ -103,18 +103,18 @@ Now text.
 
 $result_sectioning{'unclosed_verb_on_section_line'} = {
   'structure' => {
-    'level' => 1,
     'section_childs' => [
       {
         'cmdname' => 'section',
         'extra' => {},
         'structure' => {
-          'level' => 2,
-          'number' => 1,
+          'section_level' => 2,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 1
   }
 };
 
$result_sectioning{'unclosed_verb_on_section_line'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'unclosed_verb_on_section_line'};
diff --git a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl 
b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
index a7829a819d..5ebe1238e7 100644
--- a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
@@ -1356,7 +1356,6 @@ Title
 
 $result_sectioning{'inter_item_commands_in_enumerate'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1370,7 +1369,6 @@ $result_sectioning{'inter_item_commands_in_enumerate'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1384,18 +1382,20 @@ $result_sectioning{'inter_item_commands_in_enumerate'} 
= {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'inter_item_commands_in_enumerate'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'inter_item_commands_in_enumerate'}{'structure'}{'section_childs'}[0];
@@ -1410,7 +1410,7 @@ $result_nodes{'inter_item_commands_in_enumerate'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -1423,8 +1423,8 @@ $result_nodes{'inter_item_commands_in_enumerate'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter'
diff --git a/tp/t/results/itemize/inter_item_commands_in_itemize.pl 
b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
index ea3f7daf01..11e6288963 100644
--- a/tp/t/results/itemize/inter_item_commands_in_itemize.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
@@ -908,7 +908,6 @@ bullet item
 
 $result_sectioning{'inter_item_commands_in_itemize'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -922,7 +921,6 @@ $result_sectioning{'inter_item_commands_in_itemize'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -936,18 +934,20 @@ $result_sectioning{'inter_item_commands_in_itemize'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'inter_item_commands_in_itemize'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'inter_item_commands_in_itemize'}{'structure'}{'section_childs'}[0];
@@ -962,7 +962,7 @@ $result_nodes{'inter_item_commands_in_itemize'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -975,8 +975,8 @@ $result_nodes{'inter_item_commands_in_itemize'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter'
diff --git a/tp/t/results/languages/appendix_translated.pl 
b/tp/t/results/languages/appendix_translated.pl
index 9c5cb89ffc..8623a00376 100644
--- a/tp/t/results/languages/appendix_translated.pl
+++ b/tp/t/results/languages/appendix_translated.pl
@@ -224,7 +224,6 @@ Appendix A dernier
 
 $result_sectioning{'appendix_translated'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -237,24 +236,25 @@ $result_sectioning{'appendix_translated'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'appendix',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 'A',
+                'section_level' => 1,
+                'section_number' => 'A',
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'appendix_translated'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'appendix_translated'}{'structure'}{'section_childs'}[0];
@@ -269,7 +269,7 @@ $result_nodes{'appendix_translated'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/languages/command_translated.pl 
b/tp/t/results/languages/command_translated.pl
index 3131e28552..a4c599d30e 100644
--- a/tp/t/results/languages/command_translated.pl
+++ b/tp/t/results/languages/command_translated.pl
@@ -212,7 +212,6 @@ error-->
 
 $result_sectioning{'command_translated'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -225,11 +224,12 @@ $result_sectioning{'command_translated'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'command_translated'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'command_translated'};
@@ -241,7 +241,7 @@ $result_nodes{'command_translated'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/languages/multiple_lang_chapters.pl 
b/tp/t/results/languages/multiple_lang_chapters.pl
index 197b55fddd..9bbe265f38 100644
--- a/tp/t/results/languages/multiple_lang_chapters.pl
+++ b/tp/t/results/languages/multiple_lang_chapters.pl
@@ -2066,7 +2066,6 @@ In brazilian. chapter ja.
 
 $result_sectioning{'multiple_lang_chapters'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -2080,7 +2079,6 @@ $result_sectioning{'multiple_lang_chapters'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -2094,8 +2092,8 @@ $result_sectioning{'multiple_lang_chapters'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -2113,8 +2111,8 @@ $result_sectioning{'multiple_lang_chapters'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 2,
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -2133,8 +2131,8 @@ $result_sectioning{'multiple_lang_chapters'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 3,
+                'section_level' => 1,
+                'section_number' => 3,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -2153,8 +2151,8 @@ $result_sectioning{'multiple_lang_chapters'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 4,
+                'section_level' => 1,
+                'section_number' => 4,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -2173,8 +2171,8 @@ $result_sectioning{'multiple_lang_chapters'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 5,
+                'section_level' => 1,
+                'section_number' => 5,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -2182,10 +2180,12 @@ $result_sectioning{'multiple_lang_chapters'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'multiple_lang_chapters'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'multiple_lang_chapters'}{'structure'}{'section_childs'}[0];
@@ -2216,7 +2216,7 @@ $result_nodes{'multiple_lang_chapters'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -2235,8 +2235,8 @@ $result_nodes{'multiple_lang_chapters'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter-ja'
@@ -2249,8 +2249,8 @@ $result_nodes{'multiple_lang_chapters'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 2
+                'section_level' => 1,
+                'section_number' => 2
               }
             },
             'normalized' => 'chapter-en'
@@ -2263,8 +2263,8 @@ $result_nodes{'multiple_lang_chapters'} = {
                   'cmdname' => 'chapter',
                   'extra' => {},
                   'structure' => {
-                    'level' => 1,
-                    'number' => 3
+                    'section_level' => 1,
+                    'section_number' => 3
                   }
                 },
                 'normalized' => 'chapter-fr_005fFR'
@@ -2277,8 +2277,8 @@ $result_nodes{'multiple_lang_chapters'} = {
                       'cmdname' => 'chapter',
                       'extra' => {},
                       'structure' => {
-                        'level' => 1,
-                        'number' => 4
+                        'section_level' => 1,
+                        'section_number' => 4
                       }
                     },
                     'normalized' => 'chapter-de'
@@ -2291,8 +2291,8 @@ $result_nodes{'multiple_lang_chapters'} = {
                           'cmdname' => 'chapter',
                           'extra' => {},
                           'structure' => {
-                            'level' => 1,
-                            'number' => 5
+                            'section_level' => 1,
+                            'section_number' => 5
                           }
                         },
                         'normalized' => 'chapter-pt_005fBR'
diff --git a/tp/t/results/languages/multiple_lang_chapters_latex.pl 
b/tp/t/results/languages/multiple_lang_chapters_latex.pl
index 366cbab4a6..b11907e577 100644
--- a/tp/t/results/languages/multiple_lang_chapters_latex.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_latex.pl
@@ -2066,7 +2066,6 @@ In brazilian. chapter ja.
 
 $result_sectioning{'multiple_lang_chapters_latex'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -2080,7 +2079,6 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -2094,8 +2092,8 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -2113,8 +2111,8 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 2,
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -2133,8 +2131,8 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 3,
+                'section_level' => 1,
+                'section_number' => 3,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -2153,8 +2151,8 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 4,
+                'section_level' => 1,
+                'section_number' => 4,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -2173,8 +2171,8 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 5,
+                'section_level' => 1,
+                'section_number' => 5,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -2182,10 +2180,12 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'multiple_lang_chapters_latex'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'multiple_lang_chapters_latex'}{'structure'}{'section_childs'}[0];
@@ -2216,7 +2216,7 @@ $result_nodes{'multiple_lang_chapters_latex'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -2235,8 +2235,8 @@ $result_nodes{'multiple_lang_chapters_latex'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter-ja'
@@ -2249,8 +2249,8 @@ $result_nodes{'multiple_lang_chapters_latex'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 2
+                'section_level' => 1,
+                'section_number' => 2
               }
             },
             'normalized' => 'chapter-en'
@@ -2263,8 +2263,8 @@ $result_nodes{'multiple_lang_chapters_latex'} = {
                   'cmdname' => 'chapter',
                   'extra' => {},
                   'structure' => {
-                    'level' => 1,
-                    'number' => 3
+                    'section_level' => 1,
+                    'section_number' => 3
                   }
                 },
                 'normalized' => 'chapter-fr_005fFR'
@@ -2277,8 +2277,8 @@ $result_nodes{'multiple_lang_chapters_latex'} = {
                       'cmdname' => 'chapter',
                       'extra' => {},
                       'structure' => {
-                        'level' => 1,
-                        'number' => 4
+                        'section_level' => 1,
+                        'section_number' => 4
                       }
                     },
                     'normalized' => 'chapter-de'
@@ -2291,8 +2291,8 @@ $result_nodes{'multiple_lang_chapters_latex'} = {
                           'cmdname' => 'chapter',
                           'extra' => {},
                           'structure' => {
-                            'level' => 1,
-                            'number' => 5
+                            'section_level' => 1,
+                            'section_number' => 5
                           }
                         },
                         'normalized' => 'chapter-pt_005fBR'
diff --git a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl 
b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
index eff231376c..c61c4d05cb 100644
--- a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
@@ -2033,7 +2033,6 @@ In brazilian. chapter ja.
 
 $result_sectioning{'multiple_lang_chapters_texi2html'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -2047,7 +2046,6 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -2061,8 +2059,8 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -2080,8 +2078,8 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 2,
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -2100,8 +2098,8 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 3,
+                'section_level' => 1,
+                'section_number' => 3,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -2120,8 +2118,8 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 4,
+                'section_level' => 1,
+                'section_number' => 4,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -2140,8 +2138,8 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 5,
+                'section_level' => 1,
+                'section_number' => 5,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -2149,10 +2147,12 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} 
= {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'multiple_lang_chapters_texi2html'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'multiple_lang_chapters_texi2html'}{'structure'}{'section_childs'}[0];
@@ -2183,7 +2183,7 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -2202,8 +2202,8 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter-ja'
@@ -2216,8 +2216,8 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 2
+                'section_level' => 1,
+                'section_number' => 2
               }
             },
             'normalized' => 'chapter-en'
@@ -2230,8 +2230,8 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
                   'cmdname' => 'chapter',
                   'extra' => {},
                   'structure' => {
-                    'level' => 1,
-                    'number' => 3
+                    'section_level' => 1,
+                    'section_number' => 3
                   }
                 },
                 'normalized' => 'chapter-fr_005fFR'
@@ -2244,8 +2244,8 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
                       'cmdname' => 'chapter',
                       'extra' => {},
                       'structure' => {
-                        'level' => 1,
-                        'number' => 4
+                        'section_level' => 1,
+                        'section_number' => 4
                       }
                     },
                     'normalized' => 'chapter-de'
@@ -2258,8 +2258,8 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
                           'cmdname' => 'chapter',
                           'extra' => {},
                           'structure' => {
-                            'level' => 1,
-                            'number' => 5
+                            'section_level' => 1,
+                            'section_number' => 5
                           }
                         },
                         'normalized' => 'chapter-pt_005fBR'
diff --git a/tp/t/results/languages/unknown_language.pl 
b/tp/t/results/languages/unknown_language.pl
index 61c1d06ff7..a4b2cebb6f 100644
--- a/tp/t/results/languages/unknown_language.pl
+++ b/tp/t/results/languages/unknown_language.pl
@@ -322,7 +322,6 @@ Another unknown language. Top.
 
 $result_sectioning{'unknown_language'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -335,11 +334,12 @@ $result_sectioning{'unknown_language'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'unknown_language'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'unknown_language'};
@@ -351,7 +351,7 @@ $result_nodes{'unknown_language'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git 
a/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl 
b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
index f0e80d714b..443b882cde 100644
--- a/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
@@ -1066,7 +1066,6 @@ anch: in chap.
 
 $result_sectioning{'anchor_links_xref_xrefautomaticsectiontitle'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1080,7 +1079,6 @@ 
$result_sectioning{'anchor_links_xref_xrefautomaticsectiontitle'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1094,18 +1092,20 @@ 
$result_sectioning{'anchor_links_xref_xrefautomaticsectiontitle'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'anchor_links_xref_xrefautomaticsectiontitle'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'anchor_links_xref_xrefautomaticsectiontitle'}{'structure'}{'section_childs'}[0];
@@ -1120,7 +1120,7 @@ 
$result_nodes{'anchor_links_xref_xrefautomaticsectiontitle'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -1133,8 +1133,8 @@ 
$result_nodes{'anchor_links_xref_xrefautomaticsectiontitle'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chap'
diff --git a/tp/t/results/latex_tests/custom_headings.pl 
b/tp/t/results/latex_tests/custom_headings.pl
index fcabda01cf..ac07bb4180 100644
--- a/tp/t/results/latex_tests/custom_headings.pl
+++ b/tp/t/results/latex_tests/custom_headings.pl
@@ -942,7 +942,6 @@ after everyheading before chap 3 second page
 
 $result_sectioning{'custom_headings'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -956,7 +955,6 @@ $result_sectioning{'custom_headings'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -970,19 +968,19 @@ $result_sectioning{'custom_headings'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -992,8 +990,8 @@ $result_sectioning{'custom_headings'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 2,
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1004,8 +1002,8 @@ $result_sectioning{'custom_headings'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 3,
+                'section_level' => 1,
+                'section_number' => 3,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1013,10 +1011,12 @@ $result_sectioning{'custom_headings'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'custom_headings'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'custom_headings'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -1040,7 +1040,7 @@ $result_nodes{'custom_headings'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -1053,8 +1053,8 @@ $result_nodes{'custom_headings'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter'
diff --git a/tp/t/results/latex_tests/float_and_refs.pl 
b/tp/t/results/latex_tests/float_and_refs.pl
index 253f7f950f..8730ac1f01 100644
--- a/tp/t/results/latex_tests/float_and_refs.pl
+++ b/tp/t/results/latex_tests/float_and_refs.pl
@@ -2228,7 +2228,6 @@ my figure.
 
 $result_sectioning{'float_and_refs'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -2242,7 +2241,6 @@ $result_sectioning{'float_and_refs'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -2256,8 +2254,8 @@ $result_sectioning{'float_and_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -2267,8 +2265,8 @@ $result_sectioning{'float_and_refs'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 2,
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -2279,8 +2277,8 @@ $result_sectioning{'float_and_refs'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 3,
+                'section_level' => 1,
+                'section_number' => 3,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -2288,10 +2286,12 @@ $result_sectioning{'float_and_refs'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'float_and_refs'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'float_and_refs'}{'structure'}{'section_childs'}[0];
@@ -2314,7 +2314,7 @@ $result_nodes{'float_and_refs'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -2327,8 +2327,8 @@ $result_nodes{'float_and_refs'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter'
@@ -2369,8 +2369,8 @@ $result_floats{'float_and_refs'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'no-type',
diff --git a/tp/t/results/latex_tests/fonttextsize.pl 
b/tp/t/results/latex_tests/fonttextsize.pl
index 488df19250..3da077f190 100644
--- a/tp/t/results/latex_tests/fonttextsize.pl
+++ b/tp/t/results/latex_tests/fonttextsize.pl
@@ -699,7 +699,6 @@ In 15pts
 
 $result_sectioning{'fonttextsize'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -713,7 +712,6 @@ $result_sectioning{'fonttextsize'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -727,22 +725,18 @@ $result_sectioning{'fonttextsize'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
                           'extra' => {},
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         },
@@ -750,8 +744,8 @@ $result_sectioning{'fonttextsize'} = {
                           'cmdname' => 'subsection',
                           'extra' => {},
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.2',
+                            'section_level' => 3,
+                            'section_number' => '1.1.2',
                             'section_prev' => {},
                             'section_up' => {}
                           }
@@ -760,8 +754,8 @@ $result_sectioning{'fonttextsize'} = {
                           'cmdname' => 'subsection',
                           'extra' => {},
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.3',
+                            'section_level' => 3,
+                            'section_number' => '1.1.3',
                             'section_prev' => {},
                             'section_up' => {}
                           }
@@ -770,27 +764,33 @@ $result_sectioning{'fonttextsize'} = {
                           'cmdname' => 'subsection',
                           'extra' => {},
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.4',
+                            'section_level' => 3,
+                            'section_number' => '1.1.4',
                             'section_prev' => {},
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'fonttextsize'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'fonttextsize'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -813,7 +813,7 @@ $result_nodes{'fonttextsize'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -826,8 +826,8 @@ $result_nodes{'fonttextsize'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter'
diff --git a/tp/t/results/latex_tests/indices.pl 
b/tp/t/results/latex_tests/indices.pl
index 04fcf115ed..99e2f9ada6 100644
--- a/tp/t/results/latex_tests/indices.pl
+++ b/tp/t/results/latex_tests/indices.pl
@@ -1221,7 +1221,6 @@ top section
 
 $result_sectioning{'indices'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1235,7 +1234,6 @@ $result_sectioning{'indices'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1250,18 +1248,20 @@ $result_sectioning{'indices'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'indices'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'indices'}{'structure'}{'section_childs'}[0];
@@ -1276,7 +1276,7 @@ $result_nodes{'indices'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -1289,8 +1289,8 @@ $result_nodes{'indices'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'isindex' => 1,
diff --git a/tp/t/results/latex_tests/informative_commands_in_top_node.pl 
b/tp/t/results/latex_tests/informative_commands_in_top_node.pl
index f804b3d3bb..51c9155f3f 100644
--- a/tp/t/results/latex_tests/informative_commands_in_top_node.pl
+++ b/tp/t/results/latex_tests/informative_commands_in_top_node.pl
@@ -456,7 +456,6 @@ In chapter
 
 $result_sectioning{'informative_commands_in_top_node'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -470,7 +469,6 @@ $result_sectioning{'informative_commands_in_top_node'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -484,18 +482,20 @@ $result_sectioning{'informative_commands_in_top_node'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'informative_commands_in_top_node'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'informative_commands_in_top_node'}{'structure'}{'section_childs'}[0];
@@ -510,7 +510,7 @@ $result_nodes{'informative_commands_in_top_node'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -523,8 +523,8 @@ $result_nodes{'informative_commands_in_top_node'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'next-node'
diff --git a/tp/t/results/latex_tests/pagesizes.pl 
b/tp/t/results/latex_tests/pagesizes.pl
index 96383d2e14..c5bd63aa51 100644
--- a/tp/t/results/latex_tests/pagesizes.pl
+++ b/tp/t/results/latex_tests/pagesizes.pl
@@ -451,7 +451,6 @@ section top
 
 $result_sectioning{'pagesizes'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -465,7 +464,6 @@ $result_sectioning{'pagesizes'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -479,8 +477,8 @@ $result_sectioning{'pagesizes'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -490,8 +488,8 @@ $result_sectioning{'pagesizes'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 2,
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -499,10 +497,12 @@ $result_sectioning{'pagesizes'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'pagesizes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'pagesizes'}{'structure'}{'section_childs'}[0];
@@ -521,7 +521,7 @@ $result_nodes{'pagesizes'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -534,8 +534,8 @@ $result_nodes{'pagesizes'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter'
diff --git a/tp/t/results/latex_tests/pagetype.pl 
b/tp/t/results/latex_tests/pagetype.pl
index be23993029..d535081f76 100644
--- a/tp/t/results/latex_tests/pagetype.pl
+++ b/tp/t/results/latex_tests/pagetype.pl
@@ -490,7 +490,6 @@ In afourpaper reset
 
 $result_sectioning{'pagetype'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -504,7 +503,6 @@ $result_sectioning{'pagetype'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -518,8 +516,8 @@ $result_sectioning{'pagetype'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -529,8 +527,8 @@ $result_sectioning{'pagetype'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 2,
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -538,10 +536,12 @@ $result_sectioning{'pagetype'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'pagetype'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'pagetype'}{'structure'}{'section_childs'}[0];
@@ -560,7 +560,7 @@ $result_nodes{'pagetype'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -573,8 +573,8 @@ $result_nodes{'pagetype'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter'
diff --git a/tp/t/results/latex_tests/settitle_and_headings.pl 
b/tp/t/results/latex_tests/settitle_and_headings.pl
index 72a3ca7ee1..2ac205273c 100644
--- a/tp/t/results/latex_tests/settitle_and_headings.pl
+++ b/tp/t/results/latex_tests/settitle_and_headings.pl
@@ -287,18 +287,18 @@ Another page
 
 $result_sectioning{'settitle_and_headings'} = {
   'structure' => {
-    'level' => 0,
     'section_childs' => [
       {
         'cmdname' => 'chapter',
         'extra' => {},
         'structure' => {
-          'level' => 1,
-          'number' => 1,
+          'section_level' => 1,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 0
   }
 };
 
$result_sectioning{'settitle_and_headings'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'settitle_and_headings'};
diff --git a/tp/t/results/latex_tests/shorttitlepage.pl 
b/tp/t/results/latex_tests/shorttitlepage.pl
index 26688de4a2..3751244182 100644
--- a/tp/t/results/latex_tests/shorttitlepage.pl
+++ b/tp/t/results/latex_tests/shorttitlepage.pl
@@ -317,7 +317,6 @@ In chapter
 
 $result_sectioning{'shorttitlepage'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -331,7 +330,6 @@ $result_sectioning{'shorttitlepage'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -345,18 +343,20 @@ $result_sectioning{'shorttitlepage'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'shorttitlepage'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'shorttitlepage'}{'structure'}{'section_childs'}[0];
@@ -371,7 +371,7 @@ $result_nodes{'shorttitlepage'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -384,8 +384,8 @@ $result_nodes{'shorttitlepage'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter'
diff --git a/tp/t/results/latex_tests/titlepage_classical.pl 
b/tp/t/results/latex_tests/titlepage_classical.pl
index 8604a69446..519899ee67 100644
--- a/tp/t/results/latex_tests/titlepage_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_classical.pl
@@ -695,7 +695,6 @@ In chapter
 
 $result_sectioning{'titlepage_classical'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -709,7 +708,6 @@ $result_sectioning{'titlepage_classical'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -723,18 +721,20 @@ $result_sectioning{'titlepage_classical'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'titlepage_classical'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'titlepage_classical'}{'structure'}{'section_childs'}[0];
@@ -749,7 +749,7 @@ $result_nodes{'titlepage_classical'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -762,8 +762,8 @@ $result_nodes{'titlepage_classical'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter'
diff --git a/tp/t/results/latex_tests/titlepage_in_top_node.pl 
b/tp/t/results/latex_tests/titlepage_in_top_node.pl
index 6bca923e52..68f77d1dfe 100644
--- a/tp/t/results/latex_tests/titlepage_in_top_node.pl
+++ b/tp/t/results/latex_tests/titlepage_in_top_node.pl
@@ -393,7 +393,6 @@ in chap
 
 $result_sectioning{'titlepage_in_top_node'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -407,7 +406,6 @@ $result_sectioning{'titlepage_in_top_node'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -421,18 +419,20 @@ $result_sectioning{'titlepage_in_top_node'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'titlepage_in_top_node'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'titlepage_in_top_node'}{'structure'}{'section_childs'}[0];
@@ -447,7 +447,7 @@ $result_nodes{'titlepage_in_top_node'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -460,8 +460,8 @@ $result_nodes{'titlepage_in_top_node'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chap'
diff --git a/tp/t/results/latex_tests/titlepage_long_title.pl 
b/tp/t/results/latex_tests/titlepage_long_title.pl
index 328cc59f2a..591faa5f07 100644
--- a/tp/t/results/latex_tests/titlepage_long_title.pl
+++ b/tp/t/results/latex_tests/titlepage_long_title.pl
@@ -378,7 +378,6 @@ In chapter
 
 $result_sectioning{'titlepage_long_title'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -392,7 +391,6 @@ $result_sectioning{'titlepage_long_title'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -406,18 +404,20 @@ $result_sectioning{'titlepage_long_title'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'titlepage_long_title'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'titlepage_long_title'}{'structure'}{'section_childs'}[0];
@@ -432,7 +432,7 @@ $result_nodes{'titlepage_long_title'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -445,8 +445,8 @@ $result_nodes{'titlepage_long_title'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter'
diff --git a/tp/t/results/latex_tests/titlepage_no_author.pl 
b/tp/t/results/latex_tests/titlepage_no_author.pl
index c4e1c88731..3c435119cb 100644
--- a/tp/t/results/latex_tests/titlepage_no_author.pl
+++ b/tp/t/results/latex_tests/titlepage_no_author.pl
@@ -360,7 +360,6 @@ In chapter
 
 $result_sectioning{'titlepage_no_author'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -374,7 +373,6 @@ $result_sectioning{'titlepage_no_author'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -388,18 +386,20 @@ $result_sectioning{'titlepage_no_author'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'titlepage_no_author'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'titlepage_no_author'}{'structure'}{'section_childs'}[0];
@@ -414,7 +414,7 @@ $result_nodes{'titlepage_no_author'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -427,8 +427,8 @@ $result_nodes{'titlepage_no_author'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter'
diff --git a/tp/t/results/latex_tests/titlepage_no_title.pl 
b/tp/t/results/latex_tests/titlepage_no_title.pl
index 510048f1c5..8edd62ed8f 100644
--- a/tp/t/results/latex_tests/titlepage_no_title.pl
+++ b/tp/t/results/latex_tests/titlepage_no_title.pl
@@ -402,7 +402,6 @@ In chapter
 
 $result_sectioning{'titlepage_no_title'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -416,7 +415,6 @@ $result_sectioning{'titlepage_no_title'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -430,18 +428,20 @@ $result_sectioning{'titlepage_no_title'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'titlepage_no_title'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'titlepage_no_title'}{'structure'}{'section_childs'}[0];
@@ -456,7 +456,7 @@ $result_nodes{'titlepage_no_title'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -469,8 +469,8 @@ $result_nodes{'titlepage_no_title'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter'
diff --git a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl 
b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
index be42d690f5..3b1bd2c7f9 100644
--- a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
@@ -908,7 +908,6 @@ In chapter
 
 $result_sectioning{'titlepage_with_commands_classical'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -922,7 +921,6 @@ $result_sectioning{'titlepage_with_commands_classical'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -936,18 +934,20 @@ $result_sectioning{'titlepage_with_commands_classical'} = 
{
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'titlepage_with_commands_classical'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'titlepage_with_commands_classical'}{'structure'}{'section_childs'}[0];
@@ -962,7 +962,7 @@ $result_nodes{'titlepage_with_commands_classical'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -975,8 +975,8 @@ $result_nodes{'titlepage_with_commands_classical'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter'
diff --git a/tp/t/results/layout/navigation.pl 
b/tp/t/results/layout/navigation.pl
index 0dbf282b79..5404709ab4 100644
--- a/tp/t/results/layout/navigation.pl
+++ b/tp/t/results/layout/navigation.pl
@@ -1256,7 +1256,6 @@ b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b 
 bb  b bb.
 
 $result_sectioning{'navigation'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1270,7 +1269,6 @@ $result_sectioning{'navigation'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1284,8 +1282,6 @@ $result_sectioning{'navigation'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -1299,8 +1295,6 @@ $result_sectioning{'navigation'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -1314,26 +1308,32 @@ $result_sectioning{'navigation'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'navigation'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'navigation'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -1350,7 +1350,7 @@ $result_nodes{'navigation'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1369,8 +1369,8 @@ $result_nodes{'navigation'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
@@ -1389,8 +1389,8 @@ $result_nodes{'navigation'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'section_level' => 2,
+                'section_number' => '1.1'
               }
             },
             'menus' => [
@@ -1409,8 +1409,8 @@ $result_nodes{'navigation'} = {
                   'cmdname' => 'subsection',
                   'extra' => {},
                   'structure' => {
-                    'level' => 3,
-                    'number' => '1.1.1'
+                    'section_level' => 3,
+                    'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
diff --git a/tp/t/results/layout/navigation_chapter.pl 
b/tp/t/results/layout/navigation_chapter.pl
index 86fb2341f9..062a3f07ee 100644
--- a/tp/t/results/layout/navigation_chapter.pl
+++ b/tp/t/results/layout/navigation_chapter.pl
@@ -1256,7 +1256,6 @@ b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b 
 bb  b bb.
 
 $result_sectioning{'navigation_chapter'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1270,7 +1269,6 @@ $result_sectioning{'navigation_chapter'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1284,8 +1282,6 @@ $result_sectioning{'navigation_chapter'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -1299,8 +1295,6 @@ $result_sectioning{'navigation_chapter'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -1314,26 +1308,32 @@ $result_sectioning{'navigation_chapter'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'navigation_chapter'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'navigation_chapter'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -1350,7 +1350,7 @@ $result_nodes{'navigation_chapter'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1369,8 +1369,8 @@ $result_nodes{'navigation_chapter'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
@@ -1389,8 +1389,8 @@ $result_nodes{'navigation_chapter'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'section_level' => 2,
+                'section_number' => '1.1'
               }
             },
             'menus' => [
@@ -1409,8 +1409,8 @@ $result_nodes{'navigation_chapter'} = {
                   'cmdname' => 'subsection',
                   'extra' => {},
                   'structure' => {
-                    'level' => 3,
-                    'number' => '1.1.1'
+                    'section_level' => 3,
+                    'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
diff --git a/tp/t/results/layout/navigation_chapter_no_header.pl 
b/tp/t/results/layout/navigation_chapter_no_header.pl
index d7de675c9a..5c878b8de6 100644
--- a/tp/t/results/layout/navigation_chapter_no_header.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header.pl
@@ -1256,7 +1256,6 @@ b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b 
 bb  b bb.
 
 $result_sectioning{'navigation_chapter_no_header'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1270,7 +1269,6 @@ $result_sectioning{'navigation_chapter_no_header'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1284,8 +1282,6 @@ $result_sectioning{'navigation_chapter_no_header'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -1299,8 +1295,6 @@ $result_sectioning{'navigation_chapter_no_header'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -1314,26 +1308,32 @@ $result_sectioning{'navigation_chapter_no_header'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'navigation_chapter_no_header'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'navigation_chapter_no_header'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -1350,7 +1350,7 @@ $result_nodes{'navigation_chapter_no_header'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1369,8 +1369,8 @@ $result_nodes{'navigation_chapter_no_header'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
@@ -1389,8 +1389,8 @@ $result_nodes{'navigation_chapter_no_header'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'section_level' => 2,
+                'section_number' => '1.1'
               }
             },
             'menus' => [
@@ -1409,8 +1409,8 @@ $result_nodes{'navigation_chapter_no_header'} = {
                   'cmdname' => 'subsection',
                   'extra' => {},
                   'structure' => {
-                    'level' => 3,
-                    'number' => '1.1.1'
+                    'section_level' => 3,
+                    'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
diff --git a/tp/t/results/layout/navigation_chapter_no_header_vertical.pl 
b/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
index dd24b33138..338d97ad6a 100644
--- a/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
@@ -1256,7 +1256,6 @@ b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b 
 bb  b bb.
 
 $result_sectioning{'navigation_chapter_no_header_vertical'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1270,7 +1269,6 @@ 
$result_sectioning{'navigation_chapter_no_header_vertical'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1284,8 +1282,6 @@ 
$result_sectioning{'navigation_chapter_no_header_vertical'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -1299,8 +1295,6 @@ 
$result_sectioning{'navigation_chapter_no_header_vertical'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -1314,26 +1308,32 @@ 
$result_sectioning{'navigation_chapter_no_header_vertical'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'navigation_chapter_no_header_vertical'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'navigation_chapter_no_header_vertical'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -1350,7 +1350,7 @@ $result_nodes{'navigation_chapter_no_header_vertical'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1369,8 +1369,8 @@ $result_nodes{'navigation_chapter_no_header_vertical'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
@@ -1389,8 +1389,8 @@ $result_nodes{'navigation_chapter_no_header_vertical'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'section_level' => 2,
+                'section_number' => '1.1'
               }
             },
             'menus' => [
@@ -1409,8 +1409,8 @@ $result_nodes{'navigation_chapter_no_header_vertical'} = {
                   'cmdname' => 'subsection',
                   'extra' => {},
                   'structure' => {
-                    'level' => 3,
-                    'number' => '1.1.1'
+                    'section_level' => 3,
+                    'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
diff --git a/tp/t/results/layout/navigation_chapter_vertical.pl 
b/tp/t/results/layout/navigation_chapter_vertical.pl
index ff198fbfc2..b6d1c603b3 100644
--- a/tp/t/results/layout/navigation_chapter_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_vertical.pl
@@ -1256,7 +1256,6 @@ b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b 
 bb  b bb.
 
 $result_sectioning{'navigation_chapter_vertical'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1270,7 +1269,6 @@ $result_sectioning{'navigation_chapter_vertical'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1284,8 +1282,6 @@ $result_sectioning{'navigation_chapter_vertical'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -1299,8 +1295,6 @@ $result_sectioning{'navigation_chapter_vertical'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -1314,26 +1308,32 @@ $result_sectioning{'navigation_chapter_vertical'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'navigation_chapter_vertical'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'navigation_chapter_vertical'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -1350,7 +1350,7 @@ $result_nodes{'navigation_chapter_vertical'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1369,8 +1369,8 @@ $result_nodes{'navigation_chapter_vertical'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
@@ -1389,8 +1389,8 @@ $result_nodes{'navigation_chapter_vertical'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'section_level' => 2,
+                'section_number' => '1.1'
               }
             },
             'menus' => [
@@ -1409,8 +1409,8 @@ $result_nodes{'navigation_chapter_vertical'} = {
                   'cmdname' => 'subsection',
                   'extra' => {},
                   'structure' => {
-                    'level' => 3,
-                    'number' => '1.1.1'
+                    'section_level' => 3,
+                    'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
diff --git a/tp/t/results/layout/navigation_no_header.pl 
b/tp/t/results/layout/navigation_no_header.pl
index de3d9aec86..98758b831f 100644
--- a/tp/t/results/layout/navigation_no_header.pl
+++ b/tp/t/results/layout/navigation_no_header.pl
@@ -1256,7 +1256,6 @@ b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b 
 bb  b bb.
 
 $result_sectioning{'navigation_no_header'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1270,7 +1269,6 @@ $result_sectioning{'navigation_no_header'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1284,8 +1282,6 @@ $result_sectioning{'navigation_no_header'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -1299,8 +1295,6 @@ $result_sectioning{'navigation_no_header'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -1314,26 +1308,32 @@ $result_sectioning{'navigation_no_header'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'navigation_no_header'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'navigation_no_header'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -1350,7 +1350,7 @@ $result_nodes{'navigation_no_header'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1369,8 +1369,8 @@ $result_nodes{'navigation_no_header'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
@@ -1389,8 +1389,8 @@ $result_nodes{'navigation_no_header'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'section_level' => 2,
+                'section_number' => '1.1'
               }
             },
             'menus' => [
@@ -1409,8 +1409,8 @@ $result_nodes{'navigation_no_header'} = {
                   'cmdname' => 'subsection',
                   'extra' => {},
                   'structure' => {
-                    'level' => 3,
-                    'number' => '1.1.1'
+                    'section_level' => 3,
+                    'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
diff --git a/tp/t/results/layout/navigation_no_header_vertical.pl 
b/tp/t/results/layout/navigation_no_header_vertical.pl
index a5feb5ec66..c1900aab99 100644
--- a/tp/t/results/layout/navigation_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_no_header_vertical.pl
@@ -1256,7 +1256,6 @@ b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b 
 bb  b bb.
 
 $result_sectioning{'navigation_no_header_vertical'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1270,7 +1269,6 @@ $result_sectioning{'navigation_no_header_vertical'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1284,8 +1282,6 @@ $result_sectioning{'navigation_no_header_vertical'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -1299,8 +1295,6 @@ $result_sectioning{'navigation_no_header_vertical'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -1314,26 +1308,32 @@ $result_sectioning{'navigation_no_header_vertical'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'navigation_no_header_vertical'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'navigation_no_header_vertical'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -1350,7 +1350,7 @@ $result_nodes{'navigation_no_header_vertical'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1369,8 +1369,8 @@ $result_nodes{'navigation_no_header_vertical'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
@@ -1389,8 +1389,8 @@ $result_nodes{'navigation_no_header_vertical'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'section_level' => 2,
+                'section_number' => '1.1'
               }
             },
             'menus' => [
@@ -1409,8 +1409,8 @@ $result_nodes{'navigation_no_header_vertical'} = {
                   'cmdname' => 'subsection',
                   'extra' => {},
                   'structure' => {
-                    'level' => 3,
-                    'number' => '1.1.1'
+                    'section_level' => 3,
+                    'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
diff --git a/tp/t/results/layout/navigation_node.pl 
b/tp/t/results/layout/navigation_node.pl
index baf5b0ca5f..4b22f226a5 100644
--- a/tp/t/results/layout/navigation_node.pl
+++ b/tp/t/results/layout/navigation_node.pl
@@ -1256,7 +1256,6 @@ b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b 
 bb  b bb.
 
 $result_sectioning{'navigation_node'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1270,7 +1269,6 @@ $result_sectioning{'navigation_node'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1284,8 +1282,6 @@ $result_sectioning{'navigation_node'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -1299,8 +1295,6 @@ $result_sectioning{'navigation_node'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -1314,26 +1308,32 @@ $result_sectioning{'navigation_node'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'navigation_node'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'navigation_node'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -1350,7 +1350,7 @@ $result_nodes{'navigation_node'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1369,8 +1369,8 @@ $result_nodes{'navigation_node'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
@@ -1389,8 +1389,8 @@ $result_nodes{'navigation_node'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'section_level' => 2,
+                'section_number' => '1.1'
               }
             },
             'menus' => [
@@ -1409,8 +1409,8 @@ $result_nodes{'navigation_node'} = {
                   'cmdname' => 'subsection',
                   'extra' => {},
                   'structure' => {
-                    'level' => 3,
-                    'number' => '1.1.1'
+                    'section_level' => 3,
+                    'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
diff --git a/tp/t/results/layout/navigation_node_no_header.pl 
b/tp/t/results/layout/navigation_node_no_header.pl
index 72cac88b30..445a87f83e 100644
--- a/tp/t/results/layout/navigation_node_no_header.pl
+++ b/tp/t/results/layout/navigation_node_no_header.pl
@@ -1256,7 +1256,6 @@ b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b 
 bb  b bb.
 
 $result_sectioning{'navigation_node_no_header'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1270,7 +1269,6 @@ $result_sectioning{'navigation_node_no_header'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1284,8 +1282,6 @@ $result_sectioning{'navigation_node_no_header'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -1299,8 +1295,6 @@ $result_sectioning{'navigation_node_no_header'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -1314,26 +1308,32 @@ $result_sectioning{'navigation_node_no_header'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'navigation_node_no_header'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'navigation_node_no_header'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -1350,7 +1350,7 @@ $result_nodes{'navigation_node_no_header'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1369,8 +1369,8 @@ $result_nodes{'navigation_node_no_header'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
@@ -1389,8 +1389,8 @@ $result_nodes{'navigation_node_no_header'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'section_level' => 2,
+                'section_number' => '1.1'
               }
             },
             'menus' => [
@@ -1409,8 +1409,8 @@ $result_nodes{'navigation_node_no_header'} = {
                   'cmdname' => 'subsection',
                   'extra' => {},
                   'structure' => {
-                    'level' => 3,
-                    'number' => '1.1.1'
+                    'section_level' => 3,
+                    'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
diff --git a/tp/t/results/layout/navigation_node_no_header_vertical.pl 
b/tp/t/results/layout/navigation_node_no_header_vertical.pl
index 8ad482b80f..603aa1b638 100644
--- a/tp/t/results/layout/navigation_node_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_node_no_header_vertical.pl
@@ -1256,7 +1256,6 @@ b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b 
 bb  b bb.
 
 $result_sectioning{'navigation_node_no_header_vertical'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1270,7 +1269,6 @@ $result_sectioning{'navigation_node_no_header_vertical'} 
= {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1284,8 +1282,6 @@ $result_sectioning{'navigation_node_no_header_vertical'} 
= {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -1299,8 +1295,6 @@ $result_sectioning{'navigation_node_no_header_vertical'} 
= {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -1314,26 +1308,32 @@ 
$result_sectioning{'navigation_node_no_header_vertical'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'navigation_node_no_header_vertical'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'navigation_node_no_header_vertical'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -1350,7 +1350,7 @@ $result_nodes{'navigation_node_no_header_vertical'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1369,8 +1369,8 @@ $result_nodes{'navigation_node_no_header_vertical'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
@@ -1389,8 +1389,8 @@ $result_nodes{'navigation_node_no_header_vertical'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'section_level' => 2,
+                'section_number' => '1.1'
               }
             },
             'menus' => [
@@ -1409,8 +1409,8 @@ $result_nodes{'navigation_node_no_header_vertical'} = {
                   'cmdname' => 'subsection',
                   'extra' => {},
                   'structure' => {
-                    'level' => 3,
-                    'number' => '1.1.1'
+                    'section_level' => 3,
+                    'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
diff --git a/tp/t/results/layout/navigation_node_vertical.pl 
b/tp/t/results/layout/navigation_node_vertical.pl
index 6752724950..edb5b1348f 100644
--- a/tp/t/results/layout/navigation_node_vertical.pl
+++ b/tp/t/results/layout/navigation_node_vertical.pl
@@ -1256,7 +1256,6 @@ b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b 
 bb  b bb.
 
 $result_sectioning{'navigation_node_vertical'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1270,7 +1269,6 @@ $result_sectioning{'navigation_node_vertical'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1284,8 +1282,6 @@ $result_sectioning{'navigation_node_vertical'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -1299,8 +1295,6 @@ $result_sectioning{'navigation_node_vertical'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -1314,26 +1308,32 @@ $result_sectioning{'navigation_node_vertical'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'navigation_node_vertical'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'navigation_node_vertical'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -1350,7 +1350,7 @@ $result_nodes{'navigation_node_vertical'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1369,8 +1369,8 @@ $result_nodes{'navigation_node_vertical'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
@@ -1389,8 +1389,8 @@ $result_nodes{'navigation_node_vertical'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'section_level' => 2,
+                'section_number' => '1.1'
               }
             },
             'menus' => [
@@ -1409,8 +1409,8 @@ $result_nodes{'navigation_node_vertical'} = {
                   'cmdname' => 'subsection',
                   'extra' => {},
                   'structure' => {
-                    'level' => 3,
-                    'number' => '1.1.1'
+                    'section_level' => 3,
+                    'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
diff --git a/tp/t/results/layout/navigation_section.pl 
b/tp/t/results/layout/navigation_section.pl
index b96792afaa..1618476774 100644
--- a/tp/t/results/layout/navigation_section.pl
+++ b/tp/t/results/layout/navigation_section.pl
@@ -1256,7 +1256,6 @@ b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b 
 bb  b bb.
 
 $result_sectioning{'navigation_section'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1270,7 +1269,6 @@ $result_sectioning{'navigation_section'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1284,8 +1282,6 @@ $result_sectioning{'navigation_section'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -1299,8 +1295,6 @@ $result_sectioning{'navigation_section'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -1314,26 +1308,32 @@ $result_sectioning{'navigation_section'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'navigation_section'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'navigation_section'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -1350,7 +1350,7 @@ $result_nodes{'navigation_section'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1369,8 +1369,8 @@ $result_nodes{'navigation_section'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
@@ -1389,8 +1389,8 @@ $result_nodes{'navigation_section'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'section_level' => 2,
+                'section_number' => '1.1'
               }
             },
             'menus' => [
@@ -1409,8 +1409,8 @@ $result_nodes{'navigation_section'} = {
                   'cmdname' => 'subsection',
                   'extra' => {},
                   'structure' => {
-                    'level' => 3,
-                    'number' => '1.1.1'
+                    'section_level' => 3,
+                    'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
diff --git a/tp/t/results/layout/navigation_section_no_header.pl 
b/tp/t/results/layout/navigation_section_no_header.pl
index 74bf53cb2c..b594e4b28d 100644
--- a/tp/t/results/layout/navigation_section_no_header.pl
+++ b/tp/t/results/layout/navigation_section_no_header.pl
@@ -1256,7 +1256,6 @@ b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b 
 bb  b bb.
 
 $result_sectioning{'navigation_section_no_header'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1270,7 +1269,6 @@ $result_sectioning{'navigation_section_no_header'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1284,8 +1282,6 @@ $result_sectioning{'navigation_section_no_header'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -1299,8 +1295,6 @@ $result_sectioning{'navigation_section_no_header'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -1314,26 +1308,32 @@ $result_sectioning{'navigation_section_no_header'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'navigation_section_no_header'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'navigation_section_no_header'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -1350,7 +1350,7 @@ $result_nodes{'navigation_section_no_header'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1369,8 +1369,8 @@ $result_nodes{'navigation_section_no_header'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
@@ -1389,8 +1389,8 @@ $result_nodes{'navigation_section_no_header'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'section_level' => 2,
+                'section_number' => '1.1'
               }
             },
             'menus' => [
@@ -1409,8 +1409,8 @@ $result_nodes{'navigation_section_no_header'} = {
                   'cmdname' => 'subsection',
                   'extra' => {},
                   'structure' => {
-                    'level' => 3,
-                    'number' => '1.1.1'
+                    'section_level' => 3,
+                    'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
diff --git a/tp/t/results/layout/navigation_section_no_header_vertical.pl 
b/tp/t/results/layout/navigation_section_no_header_vertical.pl
index c52e6f7c0e..7d1cf68f10 100644
--- a/tp/t/results/layout/navigation_section_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_section_no_header_vertical.pl
@@ -1256,7 +1256,6 @@ b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b 
 bb  b bb.
 
 $result_sectioning{'navigation_section_no_header_vertical'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1270,7 +1269,6 @@ 
$result_sectioning{'navigation_section_no_header_vertical'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1284,8 +1282,6 @@ 
$result_sectioning{'navigation_section_no_header_vertical'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -1299,8 +1295,6 @@ 
$result_sectioning{'navigation_section_no_header_vertical'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -1314,26 +1308,32 @@ 
$result_sectioning{'navigation_section_no_header_vertical'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'navigation_section_no_header_vertical'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'navigation_section_no_header_vertical'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -1350,7 +1350,7 @@ $result_nodes{'navigation_section_no_header_vertical'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1369,8 +1369,8 @@ $result_nodes{'navigation_section_no_header_vertical'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
@@ -1389,8 +1389,8 @@ $result_nodes{'navigation_section_no_header_vertical'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'section_level' => 2,
+                'section_number' => '1.1'
               }
             },
             'menus' => [
@@ -1409,8 +1409,8 @@ $result_nodes{'navigation_section_no_header_vertical'} = {
                   'cmdname' => 'subsection',
                   'extra' => {},
                   'structure' => {
-                    'level' => 3,
-                    'number' => '1.1.1'
+                    'section_level' => 3,
+                    'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
diff --git a/tp/t/results/layout/navigation_section_vertical.pl 
b/tp/t/results/layout/navigation_section_vertical.pl
index fc60888e0a..632a6845b0 100644
--- a/tp/t/results/layout/navigation_section_vertical.pl
+++ b/tp/t/results/layout/navigation_section_vertical.pl
@@ -1256,7 +1256,6 @@ b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b 
 bb  b bb.
 
 $result_sectioning{'navigation_section_vertical'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1270,7 +1269,6 @@ $result_sectioning{'navigation_section_vertical'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1284,8 +1282,6 @@ $result_sectioning{'navigation_section_vertical'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -1299,8 +1295,6 @@ $result_sectioning{'navigation_section_vertical'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -1314,26 +1308,32 @@ $result_sectioning{'navigation_section_vertical'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'navigation_section_vertical'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'navigation_section_vertical'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -1350,7 +1350,7 @@ $result_nodes{'navigation_section_vertical'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1369,8 +1369,8 @@ $result_nodes{'navigation_section_vertical'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
@@ -1389,8 +1389,8 @@ $result_nodes{'navigation_section_vertical'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'section_level' => 2,
+                'section_number' => '1.1'
               }
             },
             'menus' => [
@@ -1409,8 +1409,8 @@ $result_nodes{'navigation_section_vertical'} = {
                   'cmdname' => 'subsection',
                   'extra' => {},
                   'structure' => {
-                    'level' => 3,
-                    'number' => '1.1.1'
+                    'section_level' => 3,
+                    'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
diff --git a/tp/t/results/layout/navigation_vertical.pl 
b/tp/t/results/layout/navigation_vertical.pl
index c81e8b19dd..f68a3eb805 100644
--- a/tp/t/results/layout/navigation_vertical.pl
+++ b/tp/t/results/layout/navigation_vertical.pl
@@ -1256,7 +1256,6 @@ b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b 
 bb  b bb.
 
 $result_sectioning{'navigation_vertical'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1270,7 +1269,6 @@ $result_sectioning{'navigation_vertical'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1284,8 +1282,6 @@ $result_sectioning{'navigation_vertical'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -1299,8 +1295,6 @@ $result_sectioning{'navigation_vertical'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -1314,26 +1308,32 @@ $result_sectioning{'navigation_vertical'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'navigation_vertical'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'navigation_vertical'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -1350,7 +1350,7 @@ $result_nodes{'navigation_vertical'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1369,8 +1369,8 @@ $result_nodes{'navigation_vertical'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
@@ -1389,8 +1389,8 @@ $result_nodes{'navigation_vertical'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'section_level' => 2,
+                'section_number' => '1.1'
               }
             },
             'menus' => [
@@ -1409,8 +1409,8 @@ $result_nodes{'navigation_vertical'} = {
                   'cmdname' => 'subsection',
                   'extra' => {},
                   'structure' => {
-                    'level' => 3,
-                    'number' => '1.1.1'
+                    'section_level' => 3,
+                    'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
diff --git a/tp/t/results/layout/no_monolithic.pl 
b/tp/t/results/layout/no_monolithic.pl
index bb1bcf2b55..4b3bf45171 100644
--- a/tp/t/results/layout/no_monolithic.pl
+++ b/tp/t/results/layout/no_monolithic.pl
@@ -671,7 +671,6 @@ Chapter.
 
 $result_sectioning{'no_monolithic'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -685,7 +684,6 @@ $result_sectioning{'no_monolithic'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -700,18 +698,20 @@ $result_sectioning{'no_monolithic'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'no_monolithic'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'no_monolithic'}{'structure'}{'section_childs'}[0];
@@ -726,7 +726,7 @@ $result_nodes{'no_monolithic'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -745,8 +745,8 @@ $result_nodes{'no_monolithic'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'isindex' => 1,
diff --git a/tp/t/results/macro/macro_in_misc_commands.pl 
b/tp/t/results/macro/macro_in_misc_commands.pl
index 9972a102a5..bd0b99fb19 100644
--- a/tp/t/results/macro/macro_in_misc_commands.pl
+++ b/tp/t/results/macro/macro_in_misc_commands.pl
@@ -4275,7 +4275,6 @@ line after exdent
 
 $result_sectioning{'macro_in_misc_commands'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -4289,7 +4288,6 @@ $result_sectioning{'macro_in_misc_commands'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -4303,18 +4301,20 @@ $result_sectioning{'macro_in_misc_commands'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'macro_in_misc_commands'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'macro_in_misc_commands'}{'structure'}{'section_childs'}[0];
@@ -4329,7 +4329,7 @@ $result_nodes{'macro_in_misc_commands'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -4348,8 +4348,8 @@ $result_nodes{'macro_in_misc_commands'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'node-atext'
diff --git a/tp/t/results/menu/block_commands_in_menu_description.pl 
b/tp/t/results/menu/block_commands_in_menu_description.pl
index c0d5289fef..55fed00b93 100644
--- a/tp/t/results/menu/block_commands_in_menu_description.pl
+++ b/tp/t/results/menu/block_commands_in_menu_description.pl
@@ -722,7 +722,6 @@ Text.
 
 $result_sectioning{'block_commands_in_menu_description'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -736,11 +735,12 @@ $result_sectioning{'block_commands_in_menu_description'} 
= {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'block_commands_in_menu_description'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'block_commands_in_menu_description'};
@@ -752,7 +752,7 @@ $result_nodes{'block_commands_in_menu_description'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
diff --git a/tp/t/results/menu/comment_on_menu_line.pl 
b/tp/t/results/menu/comment_on_menu_line.pl
index 57c442d9a7..47b6008201 100644
--- a/tp/t/results/menu/comment_on_menu_line.pl
+++ b/tp/t/results/menu/comment_on_menu_line.pl
@@ -323,7 +323,6 @@ $result_texts{'comment_on_menu_line'} = '
 
 $result_sectioning{'comment_on_menu_line'} = {
   'structure' => {
-    'level' => 0,
     'section_childs' => [
       {
         'cmdname' => 'chapter',
@@ -337,12 +336,13 @@ $result_sectioning{'comment_on_menu_line'} = {
           }
         },
         'structure' => {
-          'level' => 1,
-          'number' => 1,
+          'section_level' => 1,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 0
   }
 };
 
$result_sectioning{'comment_on_menu_line'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'comment_on_menu_line'};
@@ -354,8 +354,8 @@ $result_nodes{'comment_on_menu_line'} = {
       'cmdname' => 'chapter',
       'extra' => {},
       'structure' => {
-        'level' => 1,
-        'number' => 1
+        'section_level' => 1,
+        'section_number' => 1
       }
     },
     'menus' => [
diff --git a/tp/t/results/menu/detailmenu_on_subnodes.pl 
b/tp/t/results/menu/detailmenu_on_subnodes.pl
index 87d8adbd32..0404f56b14 100644
--- a/tp/t/results/menu/detailmenu_on_subnodes.pl
+++ b/tp/t/results/menu/detailmenu_on_subnodes.pl
@@ -1532,7 +1532,6 @@ unnumberedsec
 
 $result_sectioning{'detailmenu_on_subnodes'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1546,7 +1545,6 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1560,8 +1558,6 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -1575,12 +1571,14 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -1598,8 +1596,6 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 2,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -1613,8 +1609,8 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '2.1',
+                      'section_level' => 2,
+                      'section_number' => '2.1',
                       'section_up' => {}
                     }
                   },
@@ -1630,12 +1626,14 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
+                      'section_level' => 2,
                       'section_prev' => {},
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1643,10 +1641,12 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'detailmenu_on_subnodes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'detailmenu_on_subnodes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -1669,7 +1669,7 @@ $result_nodes{'detailmenu_on_subnodes'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1688,8 +1688,8 @@ $result_nodes{'detailmenu_on_subnodes'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
@@ -1708,8 +1708,8 @@ $result_nodes{'detailmenu_on_subnodes'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'section_level' => 2,
+                'section_number' => '1.1'
               }
             },
             'normalized' => 'section'
@@ -1725,8 +1725,8 @@ $result_nodes{'detailmenu_on_subnodes'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 2
+                'section_level' => 1,
+                'section_number' => 2
               }
             },
             'menus' => [
@@ -1745,8 +1745,8 @@ $result_nodes{'detailmenu_on_subnodes'} = {
                   'cmdname' => 'section',
                   'extra' => {},
                   'structure' => {
-                    'level' => 2,
-                    'number' => '2.1'
+                    'section_level' => 2,
+                    'section_number' => '2.1'
                   }
                 },
                 'normalized' => 'section-chap-2'
@@ -1759,7 +1759,7 @@ $result_nodes{'detailmenu_on_subnodes'} = {
                       'cmdname' => 'unnumberedsec',
                       'extra' => {},
                       'structure' => {
-                        'level' => 2
+                        'section_level' => 2
                       }
                     },
                     'normalized' => 'unnumberedsec'
diff --git a/tp/t/results/menu/direntry_dircategory_after_first_node.pl 
b/tp/t/results/menu/direntry_dircategory_after_first_node.pl
index 1a4b64dc1a..c4d53dd5ae 100644
--- a/tp/t/results/menu/direntry_dircategory_after_first_node.pl
+++ b/tp/t/results/menu/direntry_dircategory_after_first_node.pl
@@ -308,7 +308,6 @@ $result_texts{'direntry_dircategory_after_first_node'} = 
'direntry direcategory
 
 $result_sectioning{'direntry_dircategory_after_first_node'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -322,11 +321,12 @@ 
$result_sectioning{'direntry_dircategory_after_first_node'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'direntry_dircategory_after_first_node'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'direntry_dircategory_after_first_node'};
@@ -338,7 +338,7 @@ $result_nodes{'direntry_dircategory_after_first_node'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/menu/example_in_menu_description.pl 
b/tp/t/results/menu/example_in_menu_description.pl
index 17a5b000ad..e1629c5ac1 100644
--- a/tp/t/results/menu/example_in_menu_description.pl
+++ b/tp/t/results/menu/example_in_menu_description.pl
@@ -373,7 +373,6 @@ example
 
 $result_sectioning{'example_in_menu_description'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -387,11 +386,12 @@ $result_sectioning{'example_in_menu_description'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'example_in_menu_description'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'example_in_menu_description'};
@@ -403,7 +403,7 @@ $result_nodes{'example_in_menu_description'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
diff --git a/tp/t/results/menu/inlineraw_in_menu_description.pl 
b/tp/t/results/menu/inlineraw_in_menu_description.pl
index e91206578a..4c4ff2a659 100644
--- a/tp/t/results/menu/inlineraw_in_menu_description.pl
+++ b/tp/t/results/menu/inlineraw_in_menu_description.pl
@@ -346,7 +346,6 @@ $result_texts{'inlineraw_in_menu_description'} = 'top
 
 $result_sectioning{'inlineraw_in_menu_description'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -360,11 +359,12 @@ $result_sectioning{'inlineraw_in_menu_description'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'inlineraw_in_menu_description'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'inlineraw_in_menu_description'};
@@ -376,7 +376,7 @@ $result_nodes{'inlineraw_in_menu_description'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
diff --git a/tp/t/results/menu/menu_pointing_to_anchor.pl 
b/tp/t/results/menu/menu_pointing_to_anchor.pl
index da8fd8bd3f..c94faa49da 100644
--- a/tp/t/results/menu/menu_pointing_to_anchor.pl
+++ b/tp/t/results/menu/menu_pointing_to_anchor.pl
@@ -320,7 +320,6 @@ Text
 
 $result_sectioning{'menu_pointing_to_anchor'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -334,11 +333,12 @@ $result_sectioning{'menu_pointing_to_anchor'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'menu_pointing_to_anchor'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'menu_pointing_to_anchor'};
@@ -350,7 +350,7 @@ $result_nodes{'menu_pointing_to_anchor'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
diff --git a/tp/t/results/menu/verb_in_menu_description.pl 
b/tp/t/results/menu/verb_in_menu_description.pl
index 0042393239..44f552c3a9 100644
--- a/tp/t/results/menu/verb_in_menu_description.pl
+++ b/tp/t/results/menu/verb_in_menu_description.pl
@@ -328,7 +328,6 @@ $result_texts{'verb_in_menu_description'} = 'top
 
 $result_sectioning{'verb_in_menu_description'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -342,11 +341,12 @@ $result_sectioning{'verb_in_menu_description'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'verb_in_menu_description'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'verb_in_menu_description'};
@@ -358,7 +358,7 @@ $result_nodes{'verb_in_menu_description'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
diff --git 
a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl 
b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
index c6e3327b48..1a26d21069 100644
--- a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -5111,7 +5111,6 @@ samp: ``simple-double--three---four----\'\' `simple\' 
quotedblleft: "
 
 $result_sectioning{'codequoteundirected_codequotebacktick'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -5124,11 +5123,12 @@ 
$result_sectioning{'codequoteundirected_codequotebacktick'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'codequoteundirected_codequotebacktick'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'codequoteundirected_codequotebacktick'};
@@ -5140,7 +5140,7 @@ $result_nodes{'codequoteundirected_codequotebacktick'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/misc_commands/comment_space_command_on_line.pl 
b/tp/t/results/misc_commands/comment_space_command_on_line.pl
index e10f492eab..5dafbccb10 100644
--- a/tp/t/results/misc_commands/comment_space_command_on_line.pl
+++ b/tp/t/results/misc_commands/comment_space_command_on_line.pl
@@ -729,7 +729,6 @@ float
 
 $result_sectioning{'comment_space_command_on_line'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -743,11 +742,12 @@ $result_sectioning{'comment_space_command_on_line'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'comment_space_command_on_line'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'comment_space_command_on_line'};
@@ -759,7 +759,7 @@ $result_nodes{'comment_space_command_on_line'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'isindex' => 1,
@@ -787,7 +787,7 @@ $result_floats{'comment_space_command_on_line'} = {
           'cmdname' => 'top',
           'extra' => {},
           'structure' => {
-            'level' => 0
+            'section_level' => 0
           }
         },
         'normalized' => 'label',
diff --git a/tp/t/results/misc_commands/no_empty_line_between_headings.pl 
b/tp/t/results/misc_commands/no_empty_line_between_headings.pl
index 8941a2a03c..ad9184a1d3 100644
--- a/tp/t/results/misc_commands/no_empty_line_between_headings.pl
+++ b/tp/t/results/misc_commands/no_empty_line_between_headings.pl
@@ -164,41 +164,41 @@ Subheading
 
 $result_sectioning{'no_empty_line_between_headings'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
         'extra' => {},
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'no_empty_line_between_headings'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'no_empty_line_between_headings'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
diff --git a/tp/t/results/misc_commands/text_before_line_command.pl 
b/tp/t/results/misc_commands/text_before_line_command.pl
index 0c43f687a9..290890a312 100644
--- a/tp/t/results/misc_commands/text_before_line_command.pl
+++ b/tp/t/results/misc_commands/text_before_line_command.pl
@@ -358,7 +358,6 @@ quotation
 
 $result_sectioning{'text_before_line_command'} = {
   'structure' => {
-    'level' => 0,
     'section_childs' => [
       {
         'cmdname' => 'chapter',
@@ -372,12 +371,13 @@ $result_sectioning{'text_before_line_command'} = {
           }
         },
         'structure' => {
-          'level' => 1,
-          'number' => 1,
+          'section_level' => 1,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 0
   }
 };
 
$result_sectioning{'text_before_line_command'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'text_before_line_command'};
@@ -389,8 +389,8 @@ $result_nodes{'text_before_line_command'} = {
       'cmdname' => 'chapter',
       'extra' => {},
       'structure' => {
-        'level' => 1,
-        'number' => 1
+        'section_level' => 1,
+        'section_number' => 1
       }
     },
     'normalized' => 'LD-Version-Scripts'
diff --git a/tp/t/results/morecoverage/formatting_fr.pl 
b/tp/t/results/morecoverage/formatting_fr.pl
index 9b80f52838..89126ddb90 100644
--- a/tp/t/results/morecoverage/formatting_fr.pl
+++ b/tp/t/results/morecoverage/formatting_fr.pl
@@ -4288,7 +4288,6 @@ chapter 2
 
 $result_sectioning{'formatting_fr'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -4303,7 +4302,6 @@ $result_sectioning{'formatting_fr'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -4317,8 +4315,6 @@ $result_sectioning{'formatting_fr'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -4332,8 +4328,6 @@ $result_sectioning{'formatting_fr'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -4347,8 +4341,6 @@ $result_sectioning{'formatting_fr'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
                             'section_childs' => [
                               {
                                 'cmdname' => 'subsubsection',
@@ -4362,8 +4354,8 @@ $result_sectioning{'formatting_fr'} = {
                                   }
                                 },
                                 'structure' => {
-                                  'level' => 4,
-                                  'number' => '1.1.1.1',
+                                  'section_level' => 4,
+                                  'section_number' => '1.1.1.1',
                                   'section_up' => {}
                                 }
                               },
@@ -4379,21 +4371,27 @@ $result_sectioning{'formatting_fr'} = {
                                   }
                                 },
                                 'structure' => {
-                                  'level' => 4,
-                                  'number' => '1.1.1.2',
+                                  'section_level' => 4,
+                                  'section_number' => '1.1.1.2',
                                   'section_prev' => {},
                                   'section_up' => {}
                                 }
                               }
                             ],
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -4412,7 +4410,7 @@ $result_sectioning{'formatting_fr'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
+                'section_level' => 1,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -4420,10 +4418,12 @@ $result_sectioning{'formatting_fr'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'formatting_fr'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'formatting_fr'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -4447,7 +4447,7 @@ $result_nodes{'formatting_fr'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'isindex' => 1,
@@ -4467,8 +4467,8 @@ $result_nodes{'formatting_fr'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter'
@@ -4481,7 +4481,7 @@ $result_nodes{'formatting_fr'} = {
               'cmdname' => 'centerchap',
               'extra' => {},
               'structure' => {
-                'level' => 1
+                'section_level' => 1
               }
             },
             'isindex' => 1,
diff --git a/tp/t/results/morecoverage/texi_formatting.pl 
b/tp/t/results/morecoverage/texi_formatting.pl
index 649520ff32..28a26ad803 100644
--- a/tp/t/results/morecoverage/texi_formatting.pl
+++ b/tp/t/results/morecoverage/texi_formatting.pl
@@ -4288,7 +4288,6 @@ chapter 2
 
 $result_sectioning{'texi_formatting'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -4303,7 +4302,6 @@ $result_sectioning{'texi_formatting'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -4317,8 +4315,6 @@ $result_sectioning{'texi_formatting'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -4332,8 +4328,6 @@ $result_sectioning{'texi_formatting'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -4347,8 +4341,6 @@ $result_sectioning{'texi_formatting'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
                             'section_childs' => [
                               {
                                 'cmdname' => 'subsubsection',
@@ -4362,8 +4354,8 @@ $result_sectioning{'texi_formatting'} = {
                                   }
                                 },
                                 'structure' => {
-                                  'level' => 4,
-                                  'number' => '1.1.1.1',
+                                  'section_level' => 4,
+                                  'section_number' => '1.1.1.1',
                                   'section_up' => {}
                                 }
                               },
@@ -4379,21 +4371,27 @@ $result_sectioning{'texi_formatting'} = {
                                   }
                                 },
                                 'structure' => {
-                                  'level' => 4,
-                                  'number' => '1.1.1.2',
+                                  'section_level' => 4,
+                                  'section_number' => '1.1.1.2',
                                   'section_prev' => {},
                                   'section_up' => {}
                                 }
                               }
                             ],
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -4412,7 +4410,7 @@ $result_sectioning{'texi_formatting'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
+                'section_level' => 1,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -4420,10 +4418,12 @@ $result_sectioning{'texi_formatting'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'texi_formatting'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'texi_formatting'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -4447,7 +4447,7 @@ $result_nodes{'texi_formatting'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'isindex' => 1,
@@ -4467,8 +4467,8 @@ $result_nodes{'texi_formatting'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter'
@@ -4481,7 +4481,7 @@ $result_nodes{'texi_formatting'} = {
               'cmdname' => 'centerchap',
               'extra' => {},
               'structure' => {
-                'level' => 1
+                'section_level' => 1
               }
             },
             'isindex' => 1,
diff --git a/tp/t/results/moreindices/index_no_node.pl 
b/tp/t/results/moreindices/index_no_node.pl
index cea45c627d..3b73ec64ae 100644
--- a/tp/t/results/moreindices/index_no_node.pl
+++ b/tp/t/results/moreindices/index_no_node.pl
@@ -1433,13 +1433,12 @@ In chapter 2
 
 $result_sectioning{'index_no_node'} = {
   'structure' => {
-    'level' => 0,
     'section_childs' => [
       {
         'cmdname' => 'unnumbered',
         'extra' => {},
         'structure' => {
-          'level' => 1,
+          'section_level' => 1,
           'section_up' => {}
         }
       },
@@ -1447,17 +1446,17 @@ $result_sectioning{'index_no_node'} = {
         'cmdname' => 'top',
         'extra' => {},
         'structure' => {
-          'level' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
+                'section_level' => 2,
                 'section_up' => {}
               }
             }
           ],
+          'section_level' => 1,
           'section_prev' => {},
           'section_up' => {},
           'toplevel_prev' => {}
@@ -1467,8 +1466,8 @@ $result_sectioning{'index_no_node'} = {
         'cmdname' => 'chapter',
         'extra' => {},
         'structure' => {
-          'level' => 1,
-          'number' => 1,
+          'section_level' => 1,
+          'section_number' => 1,
           'section_prev' => {},
           'section_up' => {},
           'toplevel_prev' => {},
@@ -1479,15 +1478,16 @@ $result_sectioning{'index_no_node'} = {
         'cmdname' => 'chapter',
         'extra' => {},
         'structure' => {
-          'level' => 1,
-          'number' => 2,
+          'section_level' => 1,
+          'section_number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'toplevel_prev' => {},
           'toplevel_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 0
   }
 };
 
$result_sectioning{'index_no_node'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'index_no_node'};
diff --git a/tp/t/results/moreindices/index_split.pl 
b/tp/t/results/moreindices/index_split.pl
index 5e82ccc9ba..4384968dbb 100644
--- a/tp/t/results/moreindices/index_split.pl
+++ b/tp/t/results/moreindices/index_split.pl
@@ -3784,7 +3784,6 @@ Second chapter
 
 $result_sectioning{'index_split'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -3799,7 +3798,6 @@ $result_sectioning{'index_split'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -3814,8 +3812,6 @@ $result_sectioning{'index_split'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -3830,8 +3826,6 @@ $result_sectioning{'index_split'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -3845,8 +3839,8 @@ $result_sectioning{'index_split'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         },
@@ -3863,13 +3857,15 @@ $result_sectioning{'index_split'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.2',
+                            'section_level' => 3,
+                            'section_number' => '1.1.2',
                             'section_prev' => {},
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   },
@@ -3885,8 +3881,8 @@ $result_sectioning{'index_split'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.2',
+                      'section_level' => 2,
+                      'section_number' => '1.2',
                       'section_prev' => {},
                       'section_up' => {}
                     }
@@ -3904,13 +3900,15 @@ $result_sectioning{'index_split'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.3',
+                      'section_level' => 2,
+                      'section_number' => '1.3',
                       'section_prev' => {},
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -3928,8 +3926,8 @@ $result_sectioning{'index_split'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 2,
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -3937,10 +3935,12 @@ $result_sectioning{'index_split'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'index_split'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'index_split'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -3967,7 +3967,7 @@ $result_nodes{'index_split'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'isindex' => 1,
@@ -3988,8 +3988,8 @@ $result_nodes{'index_split'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'isindex' => 1,
@@ -4009,8 +4009,8 @@ $result_nodes{'index_split'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'section_level' => 2,
+                'section_number' => '1.1'
               }
             },
             'isindex' => 1,
@@ -4030,8 +4030,8 @@ $result_nodes{'index_split'} = {
                   'cmdname' => 'subsection',
                   'extra' => {},
                   'structure' => {
-                    'level' => 3,
-                    'number' => '1.1.1'
+                    'section_level' => 3,
+                    'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection-1'
@@ -4044,8 +4044,8 @@ $result_nodes{'index_split'} = {
                       'cmdname' => 'subsection',
                       'extra' => {},
                       'structure' => {
-                        'level' => 3,
-                        'number' => '1.1.2'
+                        'section_level' => 3,
+                        'section_number' => '1.1.2'
                       }
                     },
                     'isindex' => 1,
@@ -4066,8 +4066,8 @@ $result_nodes{'index_split'} = {
                   'cmdname' => 'section',
                   'extra' => {},
                   'structure' => {
-                    'level' => 2,
-                    'number' => '1.2'
+                    'section_level' => 2,
+                    'section_number' => '1.2'
                   }
                 },
                 'normalized' => 'section-2'
@@ -4080,8 +4080,8 @@ $result_nodes{'index_split'} = {
                       'cmdname' => 'section',
                       'extra' => {},
                       'structure' => {
-                        'level' => 2,
-                        'number' => '1.3'
+                        'section_level' => 2,
+                        'section_number' => '1.3'
                       }
                     },
                     'isindex' => 1,
@@ -4116,8 +4116,8 @@ $result_nodes{'index_split'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 2
+                'section_level' => 1,
+                'section_number' => 2
               }
             },
             'normalized' => 'second-chapter'
diff --git a/tp/t/results/moreindices/index_split_nodes.pl 
b/tp/t/results/moreindices/index_split_nodes.pl
index 645dfdeeac..1d2f700664 100644
--- a/tp/t/results/moreindices/index_split_nodes.pl
+++ b/tp/t/results/moreindices/index_split_nodes.pl
@@ -3784,7 +3784,6 @@ Second chapter
 
 $result_sectioning{'index_split_nodes'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -3799,7 +3798,6 @@ $result_sectioning{'index_split_nodes'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -3814,8 +3812,6 @@ $result_sectioning{'index_split_nodes'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -3830,8 +3826,6 @@ $result_sectioning{'index_split_nodes'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -3845,8 +3839,8 @@ $result_sectioning{'index_split_nodes'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         },
@@ -3863,13 +3857,15 @@ $result_sectioning{'index_split_nodes'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.2',
+                            'section_level' => 3,
+                            'section_number' => '1.1.2',
                             'section_prev' => {},
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   },
@@ -3885,8 +3881,8 @@ $result_sectioning{'index_split_nodes'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.2',
+                      'section_level' => 2,
+                      'section_number' => '1.2',
                       'section_prev' => {},
                       'section_up' => {}
                     }
@@ -3904,13 +3900,15 @@ $result_sectioning{'index_split_nodes'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.3',
+                      'section_level' => 2,
+                      'section_number' => '1.3',
                       'section_prev' => {},
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -3928,8 +3926,8 @@ $result_sectioning{'index_split_nodes'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 2,
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -3937,10 +3935,12 @@ $result_sectioning{'index_split_nodes'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'index_split_nodes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'index_split_nodes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -3967,7 +3967,7 @@ $result_nodes{'index_split_nodes'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'isindex' => 1,
@@ -3988,8 +3988,8 @@ $result_nodes{'index_split_nodes'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'isindex' => 1,
@@ -4009,8 +4009,8 @@ $result_nodes{'index_split_nodes'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'section_level' => 2,
+                'section_number' => '1.1'
               }
             },
             'isindex' => 1,
@@ -4030,8 +4030,8 @@ $result_nodes{'index_split_nodes'} = {
                   'cmdname' => 'subsection',
                   'extra' => {},
                   'structure' => {
-                    'level' => 3,
-                    'number' => '1.1.1'
+                    'section_level' => 3,
+                    'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection-1'
@@ -4044,8 +4044,8 @@ $result_nodes{'index_split_nodes'} = {
                       'cmdname' => 'subsection',
                       'extra' => {},
                       'structure' => {
-                        'level' => 3,
-                        'number' => '1.1.2'
+                        'section_level' => 3,
+                        'section_number' => '1.1.2'
                       }
                     },
                     'isindex' => 1,
@@ -4066,8 +4066,8 @@ $result_nodes{'index_split_nodes'} = {
                   'cmdname' => 'section',
                   'extra' => {},
                   'structure' => {
-                    'level' => 2,
-                    'number' => '1.2'
+                    'section_level' => 2,
+                    'section_number' => '1.2'
                   }
                 },
                 'normalized' => 'section-2'
@@ -4080,8 +4080,8 @@ $result_nodes{'index_split_nodes'} = {
                       'cmdname' => 'section',
                       'extra' => {},
                       'structure' => {
-                        'level' => 2,
-                        'number' => '1.3'
+                        'section_level' => 2,
+                        'section_number' => '1.3'
                       }
                     },
                     'isindex' => 1,
@@ -4116,8 +4116,8 @@ $result_nodes{'index_split_nodes'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 2
+                'section_level' => 1,
+                'section_number' => 2
               }
             },
             'normalized' => 'second-chapter'
diff --git 
a/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic.pl 
b/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic.pl
index aaed6921b4..2f40d553b0 100644
--- a/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic.pl
+++ b/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic.pl
@@ -3273,7 +3273,6 @@ Text and then index entries
 
 $result_sectioning{'nodes_before_top_and_sections_monolithic'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -3288,7 +3287,6 @@ 
$result_sectioning{'nodes_before_top_and_sections_monolithic'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -3303,18 +3301,20 @@ 
$result_sectioning{'nodes_before_top_and_sections_monolithic'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'nodes_before_top_and_sections_monolithic'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'nodes_before_top_and_sections_monolithic'}{'structure'}{'section_childs'}[0];
@@ -3329,7 +3329,7 @@ $result_nodes{'nodes_before_top_and_sections_monolithic'} 
= {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'isindex' => 1,
diff --git a/tp/t/results/moreindices/split_chapter_index.pl 
b/tp/t/results/moreindices/split_chapter_index.pl
index 15354a7b06..ce799bd731 100644
--- a/tp/t/results/moreindices/split_chapter_index.pl
+++ b/tp/t/results/moreindices/split_chapter_index.pl
@@ -1666,7 +1666,6 @@ In subsection 1
 
 $result_sectioning{'split_chapter_index'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1680,7 +1679,6 @@ $result_sectioning{'split_chapter_index'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1695,8 +1693,6 @@ $result_sectioning{'split_chapter_index'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -1710,8 +1706,6 @@ $result_sectioning{'split_chapter_index'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -1725,26 +1719,32 @@ $result_sectioning{'split_chapter_index'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'split_chapter_index'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'split_chapter_index'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -1761,7 +1761,7 @@ $result_nodes{'split_chapter_index'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1780,8 +1780,8 @@ $result_nodes{'split_chapter_index'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'isindex' => 1,
@@ -1801,8 +1801,8 @@ $result_nodes{'split_chapter_index'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'section_level' => 2,
+                'section_number' => '1.1'
               }
             },
             'menus' => [
@@ -1821,8 +1821,8 @@ $result_nodes{'split_chapter_index'} = {
                   'cmdname' => 'subsection',
                   'extra' => {},
                   'structure' => {
-                    'level' => 3,
-                    'number' => '1.1.1'
+                    'section_level' => 3,
+                    'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection-1'
diff --git a/tp/t/results/moresectioning/more_sections_than_nodes.pl 
b/tp/t/results/moresectioning/more_sections_than_nodes.pl
index 27ce48024b..d435fd231b 100644
--- a/tp/t/results/moresectioning/more_sections_than_nodes.pl
+++ b/tp/t/results/moresectioning/more_sections_than_nodes.pl
@@ -1466,7 +1466,6 @@ Appendix A appendix
 
 $result_sectioning{'more_sections_than_nodes'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1480,14 +1479,13 @@ $result_sectioning{'more_sections_than_nodes'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -1505,19 +1503,19 @@ $result_sectioning{'more_sections_than_nodes'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 2,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '2.1',
+                      'section_level' => 2,
+                      'section_number' => '2.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1536,15 +1534,13 @@ $result_sectioning{'more_sections_than_nodes'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 3,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '3.1',
+                      'section_level' => 2,
+                      'section_number' => '3.1',
                       'section_up' => {}
                     }
                   },
@@ -1560,8 +1556,8 @@ $result_sectioning{'more_sections_than_nodes'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '3.2',
+                      'section_level' => 2,
+                      'section_number' => '3.2',
                       'section_prev' => {},
                       'section_up' => {}
                     }
@@ -1570,13 +1566,15 @@ $result_sectioning{'more_sections_than_nodes'} = {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '3.3',
+                      'section_level' => 2,
+                      'section_number' => '3.3',
                       'section_prev' => {},
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 3,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1587,22 +1585,18 @@ $result_sectioning{'more_sections_than_nodes'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 4,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '4.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
                           'extra' => {},
                           'structure' => {
-                            'level' => 3,
-                            'number' => '4.1.1',
+                            'section_level' => 3,
+                            'section_number' => '4.1.1',
                             'section_up' => {}
                           }
                         },
@@ -1618,17 +1612,21 @@ $result_sectioning{'more_sections_than_nodes'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '4.1.2',
+                            'section_level' => 3,
+                            'section_number' => '4.1.2',
                             'section_prev' => {},
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '4.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 4,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1639,8 +1637,8 @@ $result_sectioning{'more_sections_than_nodes'} = {
               'cmdname' => 'appendix',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 'A',
+                'section_level' => 1,
+                'section_number' => 'A',
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1648,10 +1646,12 @@ $result_sectioning{'more_sections_than_nodes'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'more_sections_than_nodes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'more_sections_than_nodes'}{'structure'}{'section_childs'}[0];
@@ -1692,7 +1692,7 @@ $result_nodes{'more_sections_than_nodes'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1711,8 +1711,8 @@ $result_nodes{'more_sections_than_nodes'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 2
+            'section_level' => 1,
+            'section_number' => 2
           }
         },
         'normalized' => 'n-c2'
@@ -1725,8 +1725,8 @@ $result_nodes{'more_sections_than_nodes'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 3
+                'section_level' => 1,
+                'section_number' => 3
               }
             },
             'menus' => [
@@ -1745,8 +1745,8 @@ $result_nodes{'more_sections_than_nodes'} = {
                   'cmdname' => 'section',
                   'extra' => {},
                   'structure' => {
-                    'level' => 2,
-                    'number' => '3.2'
+                    'section_level' => 2,
+                    'section_number' => '3.2'
                   }
                 },
                 'normalized' => 'n-c3-s-2'
@@ -1762,8 +1762,8 @@ $result_nodes{'more_sections_than_nodes'} = {
                   'cmdname' => 'subsection',
                   'extra' => {},
                   'structure' => {
-                    'level' => 3,
-                    'number' => '4.1.2'
+                    'section_level' => 3,
+                    'section_number' => '4.1.2'
                   }
                 },
                 'normalized' => 'n-c3-s1-s2'
diff --git a/tp/t/results/moresectioning/node_footnote_end.pl 
b/tp/t/results/moresectioning/node_footnote_end.pl
index 82872f2b35..a9f40f5eef 100644
--- a/tp/t/results/moresectioning/node_footnote_end.pl
+++ b/tp/t/results/moresectioning/node_footnote_end.pl
@@ -1438,7 +1438,6 @@ Footnote 3.
 
 $result_sectioning{'node_footnote_end'} = {
   'structure' => {
-    'level' => 0,
     'section_childs' => [
       {
         'cmdname' => 'chapter',
@@ -1452,12 +1451,13 @@ $result_sectioning{'node_footnote_end'} = {
           }
         },
         'structure' => {
-          'level' => 1,
-          'number' => 1,
+          'section_level' => 1,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 0
   }
 };
 
$result_sectioning{'node_footnote_end'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'node_footnote_end'};
@@ -1493,8 +1493,8 @@ $result_nodes{'node_footnote_end'} = {
                   'cmdname' => 'chapter',
                   'extra' => {},
                   'structure' => {
-                    'level' => 1,
-                    'number' => 1
+                    'section_level' => 1,
+                    'section_number' => 1
                   }
                 },
                 'menus' => [
diff --git a/tp/t/results/moresectioning/node_footnote_separated.pl 
b/tp/t/results/moresectioning/node_footnote_separated.pl
index d4f819b183..a87d97c2e0 100644
--- a/tp/t/results/moresectioning/node_footnote_separated.pl
+++ b/tp/t/results/moresectioning/node_footnote_separated.pl
@@ -1438,7 +1438,6 @@ Footnote 3.
 
 $result_sectioning{'node_footnote_separated'} = {
   'structure' => {
-    'level' => 0,
     'section_childs' => [
       {
         'cmdname' => 'chapter',
@@ -1452,12 +1451,13 @@ $result_sectioning{'node_footnote_separated'} = {
           }
         },
         'structure' => {
-          'level' => 1,
-          'number' => 1,
+          'section_level' => 1,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 0
   }
 };
 
$result_sectioning{'node_footnote_separated'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'node_footnote_separated'};
@@ -1493,8 +1493,8 @@ $result_nodes{'node_footnote_separated'} = {
                   'cmdname' => 'chapter',
                   'extra' => {},
                   'structure' => {
-                    'level' => 1,
-                    'number' => 1
+                    'section_level' => 1,
+                    'section_number' => 1
                   }
                 },
                 'menus' => [
diff --git a/tp/t/results/moresectioning/node_footnote_use_node.pl 
b/tp/t/results/moresectioning/node_footnote_use_node.pl
index 9d756b0e6c..5b9eaa9462 100644
--- a/tp/t/results/moresectioning/node_footnote_use_node.pl
+++ b/tp/t/results/moresectioning/node_footnote_use_node.pl
@@ -1438,7 +1438,6 @@ Footnote 3.
 
 $result_sectioning{'node_footnote_use_node'} = {
   'structure' => {
-    'level' => 0,
     'section_childs' => [
       {
         'cmdname' => 'chapter',
@@ -1452,12 +1451,13 @@ $result_sectioning{'node_footnote_use_node'} = {
           }
         },
         'structure' => {
-          'level' => 1,
-          'number' => 1,
+          'section_level' => 1,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 0
   }
 };
 
$result_sectioning{'node_footnote_use_node'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'node_footnote_use_node'};
@@ -1493,8 +1493,8 @@ $result_nodes{'node_footnote_use_node'} = {
                   'cmdname' => 'chapter',
                   'extra' => {},
                   'structure' => {
-                    'level' => 1,
-                    'number' => 1
+                    'section_level' => 1,
+                    'section_number' => 1
                   }
                 },
                 'menus' => [
diff --git a/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl 
b/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
index 6ad4b335fb..4b02d67eaa 100644
--- a/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
+++ b/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
@@ -687,7 +687,6 @@ second node
 
 $result_sectioning{'nodes_after_top_before_chapter'} = {
   'structure' => {
-    'level' => 0,
     'section_childs' => [
       {
         'cmdname' => 'chapter',
@@ -701,12 +700,13 @@ $result_sectioning{'nodes_after_top_before_chapter'} = {
           }
         },
         'structure' => {
-          'level' => 1,
-          'number' => 1,
+          'section_level' => 1,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 0
   }
 };
 
$result_sectioning{'nodes_after_top_before_chapter'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'nodes_after_top_before_chapter'};
@@ -736,8 +736,8 @@ $result_nodes{'nodes_after_top_before_chapter'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 1
+                'section_level' => 1,
+                'section_number' => 1
               }
             },
             'normalized' => 'third-node'
diff --git 
a/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter.pl
 
b/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter.pl
index 60b7b920fe..a8e20322e7 100644
--- 
a/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter.pl
+++ 
b/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter.pl
@@ -687,7 +687,6 @@ second node
 
 $result_sectioning{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
   'structure' => {
-    'level' => 0,
     'section_childs' => [
       {
         'cmdname' => 'chapter',
@@ -701,12 +700,13 @@ 
$result_sectioning{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
           }
         },
         'structure' => {
-          'level' => 1,
-          'number' => 1,
+          'section_level' => 1,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 0
   }
 };
 
$result_sectioning{'nodes_after_top_before_chapter_use_nodes_chapter'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'nodes_after_top_before_chapter_use_nodes_chapter'};
@@ -736,8 +736,8 @@ 
$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 1
+                'section_level' => 1,
+                'section_number' => 1
               }
             },
             'normalized' => 'third-node'
diff --git a/tp/t/results/moresectioning/nodes_after_top_before_section.pl 
b/tp/t/results/moresectioning/nodes_after_top_before_section.pl
index a39d5e2772..9ee2bbb9d4 100644
--- a/tp/t/results/moresectioning/nodes_after_top_before_section.pl
+++ b/tp/t/results/moresectioning/nodes_after_top_before_section.pl
@@ -687,7 +687,6 @@ second node
 
 $result_sectioning{'nodes_after_top_before_section'} = {
   'structure' => {
-    'level' => 2,
     'section_childs' => [
       {
         'cmdname' => 'subsection',
@@ -701,12 +700,13 @@ $result_sectioning{'nodes_after_top_before_section'} = {
           }
         },
         'structure' => {
-          'level' => 3,
-          'number' => 1,
+          'section_level' => 3,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 2
   }
 };
 
$result_sectioning{'nodes_after_top_before_section'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'nodes_after_top_before_section'};
@@ -736,8 +736,8 @@ $result_nodes{'nodes_after_top_before_section'} = {
               'cmdname' => 'subsection',
               'extra' => {},
               'structure' => {
-                'level' => 3,
-                'number' => 1
+                'section_level' => 3,
+                'section_number' => 1
               }
             },
             'normalized' => 'third-node'
diff --git 
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes.pl 
b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes.pl
index 3d9b6737d5..d08bbc5126 100644
--- a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes.pl
+++ b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes.pl
@@ -687,7 +687,6 @@ second node
 
 $result_sectioning{'nodes_after_top_before_section_use_nodes'} = {
   'structure' => {
-    'level' => 2,
     'section_childs' => [
       {
         'cmdname' => 'subsection',
@@ -701,12 +700,13 @@ 
$result_sectioning{'nodes_after_top_before_section_use_nodes'} = {
           }
         },
         'structure' => {
-          'level' => 3,
-          'number' => 1,
+          'section_level' => 3,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 2
   }
 };
 
$result_sectioning{'nodes_after_top_before_section_use_nodes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'nodes_after_top_before_section_use_nodes'};
@@ -736,8 +736,8 @@ $result_nodes{'nodes_after_top_before_section_use_nodes'} = 
{
               'cmdname' => 'subsection',
               'extra' => {},
               'structure' => {
-                'level' => 3,
-                'number' => 1
+                'section_level' => 3,
+                'section_number' => 1
               }
             },
             'normalized' => 'third-node'
diff --git 
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter.pl
 
b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter.pl
index 1b06e28f4e..5d4e7b9b77 100644
--- 
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter.pl
+++ 
b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter.pl
@@ -687,7 +687,6 @@ second node
 
 $result_sectioning{'nodes_after_top_before_section_use_nodes_chapter'} = {
   'structure' => {
-    'level' => 2,
     'section_childs' => [
       {
         'cmdname' => 'subsection',
@@ -701,12 +700,13 @@ 
$result_sectioning{'nodes_after_top_before_section_use_nodes_chapter'} = {
           }
         },
         'structure' => {
-          'level' => 3,
-          'number' => 1,
+          'section_level' => 3,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 2
   }
 };
 
$result_sectioning{'nodes_after_top_before_section_use_nodes_chapter'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'nodes_after_top_before_section_use_nodes_chapter'};
@@ -736,8 +736,8 @@ 
$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'} = {
               'cmdname' => 'subsection',
               'extra' => {},
               'structure' => {
-                'level' => 3,
-                'number' => 1
+                'section_level' => 3,
+                'section_number' => 1
               }
             },
             'normalized' => 'third-node'
diff --git a/tp/t/results/moresectioning/placed_things_before_element.pl 
b/tp/t/results/moresectioning/placed_things_before_element.pl
index d6569ccc3e..dfdbfa6c06 100644
--- a/tp/t/results/moresectioning/placed_things_before_element.pl
+++ b/tp/t/results/moresectioning/placed_things_before_element.pl
@@ -1063,18 +1063,18 @@ Anchor in footnote
 
 $result_sectioning{'placed_things_before_element'} = {
   'structure' => {
-    'level' => 1,
     'section_childs' => [
       {
         'cmdname' => 'section',
         'extra' => {},
         'structure' => {
-          'level' => 2,
-          'number' => 1,
+          'section_level' => 2,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 1
   }
 };
 
$result_sectioning{'placed_things_before_element'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'placed_things_before_element'};
diff --git a/tp/t/results/moresectioning/sectioning_frames.pl 
b/tp/t/results/moresectioning/sectioning_frames.pl
index 96e7f0659a..e4d0172998 100644
--- a/tp/t/results/moresectioning/sectioning_frames.pl
+++ b/tp/t/results/moresectioning/sectioning_frames.pl
@@ -3116,7 +3116,6 @@ unnumbered chapter text.
 
 $result_sectioning{'sectioning_frames'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -3130,7 +3129,6 @@ $result_sectioning{'sectioning_frames'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -3144,8 +3142,6 @@ $result_sectioning{'sectioning_frames'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'unnumberedsec',
@@ -3159,7 +3155,6 @@ $result_sectioning{'sectioning_frames'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
                       'section_childs' => [
                         {
                           'cmdname' => 'unnumberedsubsec',
@@ -3173,7 +3168,7 @@ $result_sectioning{'sectioning_frames'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_up' => {}
                           }
                         },
@@ -3189,7 +3184,7 @@ $result_sectioning{'sectioning_frames'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_prev' => {},
                             'section_up' => {}
                           }
@@ -3206,7 +3201,7 @@ $result_sectioning{'sectioning_frames'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_prev' => {},
                             'section_up' => {}
                           }
@@ -3223,12 +3218,13 @@ $result_sectioning{'sectioning_frames'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_prev' => {},
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
                       'section_up' => {}
                     }
                   },
@@ -3244,7 +3240,6 @@ $result_sectioning{'sectioning_frames'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -3258,11 +3253,12 @@ $result_sectioning{'sectioning_frames'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
                       'section_prev' => {},
                       'section_up' => {}
                     }
@@ -3279,13 +3275,15 @@ $result_sectioning{'sectioning_frames'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_prev' => {},
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -3303,8 +3301,8 @@ $result_sectioning{'sectioning_frames'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 2,
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -3323,7 +3321,7 @@ $result_sectioning{'sectioning_frames'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
+                'section_level' => 1,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -3331,10 +3329,12 @@ $result_sectioning{'sectioning_frames'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'sectioning_frames'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'sectioning_frames'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -3370,7 +3370,7 @@ $result_nodes{'sectioning_frames'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -3389,8 +3389,8 @@ $result_nodes{'sectioning_frames'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
@@ -3409,7 +3409,7 @@ $result_nodes{'sectioning_frames'} = {
               'cmdname' => 'unnumberedsec',
               'extra' => {},
               'structure' => {
-                'level' => 2
+                'section_level' => 2
               }
             },
             'menus' => [
@@ -3428,7 +3428,7 @@ $result_nodes{'sectioning_frames'} = {
                   'cmdname' => 'unnumberedsubsec',
                   'extra' => {},
                   'structure' => {
-                    'level' => 3
+                    'section_level' => 3
                   }
                 },
                 'normalized' => 'unnumbered-sub'
@@ -3441,7 +3441,7 @@ $result_nodes{'sectioning_frames'} = {
                       'cmdname' => 'subsection',
                       'extra' => {},
                       'structure' => {
-                        'level' => 3
+                        'section_level' => 3
                       }
                     },
                     'normalized' => 'numbered-sub'
@@ -3454,7 +3454,7 @@ $result_nodes{'sectioning_frames'} = {
                           'cmdname' => 'unnumberedsubsec',
                           'extra' => {},
                           'structure' => {
-                            'level' => 3
+                            'section_level' => 3
                           }
                         },
                         'normalized' => 'unnumbered-sub2'
@@ -3467,7 +3467,7 @@ $result_nodes{'sectioning_frames'} = {
                               'cmdname' => 'subsection',
                               'extra' => {},
                               'structure' => {
-                                'level' => 3
+                                'section_level' => 3
                               }
                             },
                             'normalized' => 'numbered-sub2'
@@ -3495,7 +3495,7 @@ $result_nodes{'sectioning_frames'} = {
                   'cmdname' => 'unnumberedsec',
                   'extra' => {},
                   'structure' => {
-                    'level' => 2
+                    'section_level' => 2
                   }
                 },
                 'menus' => [
@@ -3514,7 +3514,7 @@ $result_nodes{'sectioning_frames'} = {
                       'cmdname' => 'subsection',
                       'extra' => {},
                       'structure' => {
-                        'level' => 3
+                        'section_level' => 3
                       }
                     },
                     'normalized' => 'numbered-sub3'
@@ -3530,8 +3530,8 @@ $result_nodes{'sectioning_frames'} = {
                       'cmdname' => 'section',
                       'extra' => {},
                       'structure' => {
-                        'level' => 2,
-                        'number' => '1.1'
+                        'section_level' => 2,
+                        'section_number' => '1.1'
                       }
                     },
                     'normalized' => 'numbered'
diff --git a/tp/t/results/moresectioning/top_node_up_explicit.pl 
b/tp/t/results/moresectioning/top_node_up_explicit.pl
index 143dfee316..9c23e109f6 100644
--- a/tp/t/results/moresectioning/top_node_up_explicit.pl
+++ b/tp/t/results/moresectioning/top_node_up_explicit.pl
@@ -625,7 +625,6 @@ Without the chapter, no up node from top is generated.
 
 $result_sectioning{'top_node_up_explicit'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -639,7 +638,6 @@ $result_sectioning{'top_node_up_explicit'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -653,18 +651,20 @@ $result_sectioning{'top_node_up_explicit'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'top_node_up_explicit'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'top_node_up_explicit'}{'structure'}{'section_childs'}[0];
@@ -679,7 +679,7 @@ $result_nodes{'top_node_up_explicit'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -698,8 +698,8 @@ $result_nodes{'top_node_up_explicit'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'Chap'
diff --git a/tp/t/results/moresectioning/top_node_up_implicit.pl 
b/tp/t/results/moresectioning/top_node_up_implicit.pl
index 4520d4d7f4..6338a68483 100644
--- a/tp/t/results/moresectioning/top_node_up_implicit.pl
+++ b/tp/t/results/moresectioning/top_node_up_implicit.pl
@@ -513,7 +513,6 @@ Without the chapter, no up node from top is generated.
 
 $result_sectioning{'top_node_up_implicit'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -527,7 +526,6 @@ $result_sectioning{'top_node_up_implicit'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -541,18 +539,20 @@ $result_sectioning{'top_node_up_implicit'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'top_node_up_implicit'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'top_node_up_implicit'}{'structure'}{'section_childs'}[0];
@@ -567,7 +567,7 @@ $result_nodes{'top_node_up_implicit'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -586,8 +586,8 @@ $result_nodes{'top_node_up_implicit'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'Chap'
diff --git a/tp/t/results/moresectioning/two_footnotes_in_nodes.pl 
b/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
index 98e5bb9ba8..76ae438d8f 100644
--- a/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
+++ b/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
@@ -775,7 +775,6 @@ D
 
 $result_sectioning{'two_footnotes_in_nodes'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -789,7 +788,6 @@ $result_sectioning{'two_footnotes_in_nodes'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -803,18 +801,20 @@ $result_sectioning{'two_footnotes_in_nodes'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'two_footnotes_in_nodes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'two_footnotes_in_nodes'}{'structure'}{'section_childs'}[0];
@@ -829,7 +829,7 @@ $result_nodes{'two_footnotes_in_nodes'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -848,8 +848,8 @@ $result_nodes{'two_footnotes_in_nodes'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter'
diff --git a/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl 
b/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl
index 64163c122c..293809d1eb 100644
--- a/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl
+++ b/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl
@@ -775,7 +775,6 @@ D
 
 $result_sectioning{'two_footnotes_in_nodes_separated'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -789,7 +788,6 @@ $result_sectioning{'two_footnotes_in_nodes_separated'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -803,18 +801,20 @@ $result_sectioning{'two_footnotes_in_nodes_separated'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'two_footnotes_in_nodes_separated'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'two_footnotes_in_nodes_separated'}{'structure'}{'section_childs'}[0];
@@ -829,7 +829,7 @@ $result_nodes{'two_footnotes_in_nodes_separated'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -848,8 +848,8 @@ $result_nodes{'two_footnotes_in_nodes_separated'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter'
diff --git a/tp/t/results/plaintext_tests/japanese_utf8.pl 
b/tp/t/results/plaintext_tests/japanese_utf8.pl
index 60f25ef254..6f223a3aec 100644
--- a/tp/t/results/plaintext_tests/japanese_utf8.pl
+++ b/tp/t/results/plaintext_tests/japanese_utf8.pl
@@ -1019,7 +1019,6 @@ GNU LilyPond -- 学習マニュアル
 
 $result_sectioning{'japanese_utf8'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1033,7 +1032,6 @@ $result_sectioning{'japanese_utf8'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1047,8 +1045,8 @@ $result_sectioning{'japanese_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -1066,8 +1064,8 @@ $result_sectioning{'japanese_utf8'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 2,
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1075,10 +1073,12 @@ $result_sectioning{'japanese_utf8'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'japanese_utf8'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'japanese_utf8'}{'structure'}{'section_childs'}[0];
@@ -1097,7 +1097,7 @@ $result_nodes{'japanese_utf8'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1116,8 +1116,8 @@ $result_nodes{'japanese_utf8'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'Preface'
@@ -1130,8 +1130,8 @@ $result_nodes{'japanese_utf8'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 2
+                'section_level' => 1,
+                'section_number' => 2
               }
             },
             'normalized' => 'Introduction'
diff --git a/tp/t/results/plaintext_tests/no_empty_line_after_section.pl 
b/tp/t/results/plaintext_tests/no_empty_line_after_section.pl
index e836c68977..83c903ca0c 100644
--- a/tp/t/results/plaintext_tests/no_empty_line_after_section.pl
+++ b/tp/t/results/plaintext_tests/no_empty_line_after_section.pl
@@ -410,27 +410,23 @@ Para indented.
 
 $result_sectioning{'no_empty_line_after_section'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
         'extra' => {},
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   },
@@ -438,23 +434,27 @@ $result_sectioning{'no_empty_line_after_section'} = {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.2',
+                      'section_level' => 2,
+                      'section_number' => '1.2',
                       'section_prev' => {},
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'no_empty_line_after_section'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'no_empty_line_after_section'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
diff --git a/tp/t/results/plaintext_tests/quote_node_names.pl 
b/tp/t/results/plaintext_tests/quote_node_names.pl
index 392785ff63..07377c0433 100644
--- a/tp/t/results/plaintext_tests/quote_node_names.pl
+++ b/tp/t/results/plaintext_tests/quote_node_names.pl
@@ -1752,7 +1752,6 @@ stuff here.
 
 $result_sectioning{'quote_node_names'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1766,7 +1765,6 @@ $result_sectioning{'quote_node_names'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1780,8 +1778,8 @@ $result_sectioning{'quote_node_names'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -1799,8 +1797,8 @@ $result_sectioning{'quote_node_names'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 2,
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1819,8 +1817,8 @@ $result_sectioning{'quote_node_names'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 3,
+                'section_level' => 1,
+                'section_number' => 3,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1839,8 +1837,8 @@ $result_sectioning{'quote_node_names'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 4,
+                'section_level' => 1,
+                'section_number' => 4,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1848,10 +1846,12 @@ $result_sectioning{'quote_node_names'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'quote_node_names'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'quote_node_names'}{'structure'}{'section_childs'}[0];
@@ -1878,7 +1878,7 @@ $result_nodes{'quote_node_names'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1897,8 +1897,8 @@ $result_nodes{'quote_node_names'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'blah_003ablah'
@@ -1911,8 +1911,8 @@ $result_nodes{'quote_node_names'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 2
+                'section_level' => 1,
+                'section_number' => 2
               }
             },
             'normalized' => 'blumpty_002efump'
@@ -1925,8 +1925,8 @@ $result_nodes{'quote_node_names'} = {
                   'cmdname' => 'chapter',
                   'extra' => {},
                   'structure' => {
-                    'level' => 1,
-                    'number' => 3
+                    'section_level' => 1,
+                    'section_number' => 3
                   }
                 },
                 'normalized' => 'normal-node'
@@ -1939,8 +1939,8 @@ $result_nodes{'quote_node_names'} = {
                       'cmdname' => 'chapter',
                       'extra' => {},
                       'structure' => {
-                        'level' => 1,
-                        'number' => 4
+                        'section_level' => 1,
+                        'section_number' => 4
                       }
                     },
                     'normalized' => 'secret_002cnode'
diff --git a/tp/t/results/plaintext_tests/settitle_and_empty_top.pl 
b/tp/t/results/plaintext_tests/settitle_and_empty_top.pl
index 29e46c61b4..e188ca67e5 100644
--- a/tp/t/results/plaintext_tests/settitle_and_empty_top.pl
+++ b/tp/t/results/plaintext_tests/settitle_and_empty_top.pl
@@ -100,16 +100,16 @@ $result_texts{'settitle_and_empty_top'} = '
 
 $result_sectioning{'settitle_and_empty_top'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'settitle_and_empty_top'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'settitle_and_empty_top'};
diff --git a/tp/t/results/regions/anchor_in_titlepage.pl 
b/tp/t/results/regions/anchor_in_titlepage.pl
index 8ff033bb40..e632b5a68b 100644
--- a/tp/t/results/regions/anchor_in_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage.pl
@@ -291,17 +291,17 @@ in titlepage.
 
 $result_sectioning{'anchor_in_titlepage'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
         'extra' => {},
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'anchor_in_titlepage'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'anchor_in_titlepage'};
diff --git a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl 
b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
index 20a9bcb9e2..cb803c68d7 100644
--- a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
@@ -291,17 +291,17 @@ in titlepage.
 
 $result_sectioning{'anchor_in_titlepage_titlepage'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
         'extra' => {},
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'anchor_in_titlepage_titlepage'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'anchor_in_titlepage_titlepage'};
diff --git a/tp/t/results/regions/ref_in_copying.pl 
b/tp/t/results/regions/ref_in_copying.pl
index be7f577d98..10416f9d51 100644
--- a/tp/t/results/regions/ref_in_copying.pl
+++ b/tp/t/results/regions/ref_in_copying.pl
@@ -499,7 +499,6 @@ top
 
 $result_sectioning{'ref_in_copying'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -513,7 +512,6 @@ $result_sectioning{'ref_in_copying'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -527,18 +525,20 @@ $result_sectioning{'ref_in_copying'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'ref_in_copying'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'ref_in_copying'}{'structure'}{'section_childs'}[0];
@@ -553,7 +553,7 @@ $result_nodes{'ref_in_copying'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -572,8 +572,8 @@ $result_nodes{'ref_in_copying'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'GFDL'
diff --git a/tp/t/results/regions/today_in_copying.pl 
b/tp/t/results/regions/today_in_copying.pl
index 409a9b2353..bf8567be57 100644
--- a/tp/t/results/regions/today_in_copying.pl
+++ b/tp/t/results/regions/today_in_copying.pl
@@ -241,7 +241,6 @@ top
 
 $result_sectioning{'today_in_copying'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -254,11 +253,12 @@ $result_sectioning{'today_in_copying'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'today_in_copying'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'today_in_copying'};
@@ -270,7 +270,7 @@ $result_nodes{'today_in_copying'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/anchor_in_footnote.pl 
b/tp/t/results/sectioning/anchor_in_footnote.pl
index f36d401e02..38c5f3480b 100644
--- a/tp/t/results/sectioning/anchor_in_footnote.pl
+++ b/tp/t/results/sectioning/anchor_in_footnote.pl
@@ -501,7 +501,6 @@ Anchor in footnote.
 
 $result_sectioning{'anchor_in_footnote'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -515,7 +514,6 @@ $result_sectioning{'anchor_in_footnote'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -529,18 +527,20 @@ $result_sectioning{'anchor_in_footnote'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'anchor_in_footnote'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'anchor_in_footnote'}{'structure'}{'section_childs'}[0];
@@ -555,7 +555,7 @@ $result_nodes{'anchor_in_footnote'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -574,8 +574,8 @@ $result_nodes{'anchor_in_footnote'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter'
diff --git a/tp/t/results/sectioning/anchor_in_footnote_separate.pl 
b/tp/t/results/sectioning/anchor_in_footnote_separate.pl
index 47d8ee7d44..b607af0e60 100644
--- a/tp/t/results/sectioning/anchor_in_footnote_separate.pl
+++ b/tp/t/results/sectioning/anchor_in_footnote_separate.pl
@@ -537,7 +537,6 @@ Anchor in footnote.
 
 $result_sectioning{'anchor_in_footnote_separate'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -551,7 +550,6 @@ $result_sectioning{'anchor_in_footnote_separate'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -565,18 +563,20 @@ $result_sectioning{'anchor_in_footnote_separate'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'anchor_in_footnote_separate'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'anchor_in_footnote_separate'}{'structure'}{'section_childs'}[0];
@@ -591,7 +591,7 @@ $result_nodes{'anchor_in_footnote_separate'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -610,8 +610,8 @@ $result_nodes{'anchor_in_footnote_separate'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter'
diff --git a/tp/t/results/sectioning/chapter_before_and_after_part.pl 
b/tp/t/results/sectioning/chapter_before_and_after_part.pl
index 1c15035f0b..7b6d5a1b87 100644
--- a/tp/t/results/sectioning/chapter_before_and_after_part.pl
+++ b/tp/t/results/sectioning/chapter_before_and_after_part.pl
@@ -207,7 +207,6 @@ part
 
 $result_sectioning{'chapter_before_and_after_part'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'chapter',
@@ -231,18 +230,18 @@ $result_sectioning{'chapter_before_and_after_part'} = {
                           },
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 0,
                             'section_childs' => [
                               {}
                             ],
+                            'section_level' => 0,
                             'section_up' => {}
                           }
                         }
                       },
                       'structure' => {
                         'associated_unit' => {},
-                        'level' => 1,
-                        'number' => 2,
+                        'section_level' => 1,
+                        'section_number' => 2,
                         'section_up' => {},
                         'toplevel_prev' => {}
                       }
@@ -265,13 +264,14 @@ $result_sectioning{'chapter_before_and_after_part'} = {
             },
             'type' => 'unit'
           },
-          'level' => 1,
-          'number' => 1,
+          'section_level' => 1,
+          'section_number' => 1,
           'section_up' => {}
         }
       },
       {}
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'chapter_before_and_after_part'}{'structure'}{'section_childs'}[0]{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'chapter_before_and_after_part'}{'structure'}{'section_childs'}[0];
@@ -306,8 +306,8 @@ $result_elements{'chapter_before_and_after_part'} = [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 1,
-          'number' => 1
+          'section_level' => 1,
+          'section_number' => 1
         }
       }
     },
@@ -323,14 +323,14 @@ $result_elements{'chapter_before_and_after_part'} = [
                   'extra' => {},
                   'structure' => {
                     'associated_unit' => {},
-                    'level' => 0
+                    'section_level' => 0
                   }
                 }
               },
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1,
-                'number' => 2
+                'section_level' => 1,
+                'section_number' => 2
               }
             }
           },
diff --git a/tp/t/results/sectioning/chapter_before_part.pl 
b/tp/t/results/sectioning/chapter_before_part.pl
index db7f7a8bd4..aa0606e6e7 100644
--- a/tp/t/results/sectioning/chapter_before_part.pl
+++ b/tp/t/results/sectioning/chapter_before_part.pl
@@ -128,7 +128,6 @@ part
 
 $result_sectioning{'chapter_before_part'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'chapter',
@@ -147,7 +146,7 @@ $result_sectioning{'chapter_before_part'} = {
                       'extra' => {},
                       'structure' => {
                         'associated_unit' => {},
-                        'level' => 0,
+                        'section_level' => 0,
                         'section_up' => {}
                       }
                     }
@@ -167,13 +166,14 @@ $result_sectioning{'chapter_before_part'} = {
             },
             'type' => 'unit'
           },
-          'level' => 1,
-          'number' => 1,
+          'section_level' => 1,
+          'section_number' => 1,
           'section_up' => {}
         }
       },
       {}
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'chapter_before_part'}{'structure'}{'section_childs'}[0]{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = $result_sectioning{'chapter_before_part'}{'structure'}{'section_childs'}[0];
@@ -211,8 +211,8 @@ $result_elements{'chapter_before_part'} = [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 1,
-          'number' => 1
+          'section_level' => 1,
+          'section_number' => 1
         }
       }
     },
@@ -225,7 +225,7 @@ $result_elements{'chapter_before_part'} = [
               'extra' => {},
               'structure' => {
                 'associated_unit' => {},
-                'level' => 0
+                'section_level' => 0
               }
             }
           },
diff --git a/tp/t/results/sectioning/chapter_between_nodes.pl 
b/tp/t/results/sectioning/chapter_between_nodes.pl
index ac1253d319..645ba79465 100644
--- a/tp/t/results/sectioning/chapter_between_nodes.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes.pl
@@ -552,7 +552,6 @@ section.
 
 $result_sectioning{'chapter_between_nodes'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -566,14 +565,11 @@ $result_sectioning{'chapter_between_nodes'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -587,22 +583,26 @@ $result_sectioning{'chapter_between_nodes'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'chapter_between_nodes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'chapter_between_nodes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -618,7 +618,7 @@ $result_nodes{'chapter_between_nodes'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -637,8 +637,8 @@ $result_nodes{'chapter_between_nodes'} = {
           'cmdname' => 'section',
           'extra' => {},
           'structure' => {
-            'level' => 2,
-            'number' => '1.1'
+            'section_level' => 2,
+            'section_number' => '1.1'
           }
         },
         'normalized' => 'section-node'
diff --git a/tp/t/results/sectioning/chapter_node_before_and_after_part.pl 
b/tp/t/results/sectioning/chapter_node_before_and_after_part.pl
index 1eab17b3d3..b7000e2e49 100644
--- a/tp/t/results/sectioning/chapter_node_before_and_after_part.pl
+++ b/tp/t/results/sectioning/chapter_node_before_and_after_part.pl
@@ -425,7 +425,6 @@ part
 
 $result_sectioning{'chapter_node_before_and_after_part'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'chapter',
@@ -439,8 +438,8 @@ $result_sectioning{'chapter_node_before_and_after_part'} = {
           }
         },
         'structure' => {
-          'level' => 1,
-          'number' => 1,
+          'section_level' => 1,
+          'section_number' => 1,
           'section_up' => {}
         }
       },
@@ -460,22 +459,23 @@ $result_sectioning{'chapter_node_before_and_after_part'} 
= {
               'associated_part' => {}
             },
             'structure' => {
-              'level' => 1,
-              'number' => 2,
+              'section_level' => 1,
+              'section_number' => 2,
               'section_up' => {},
               'toplevel_prev' => {}
             }
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {}
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'chapter_node_before_and_after_part'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'chapter_node_before_and_after_part'};
@@ -492,8 +492,8 @@ $result_nodes{'chapter_node_before_and_after_part'} = {
       'cmdname' => 'chapter',
       'extra' => {},
       'structure' => {
-        'level' => 1,
-        'number' => 1
+        'section_level' => 1,
+        'section_number' => 1
       }
     },
     'menus' => [
@@ -515,13 +515,13 @@ $result_nodes{'chapter_node_before_and_after_part'} = {
               'cmdname' => 'part',
               'extra' => {},
               'structure' => {
-                'level' => 0
+                'section_level' => 0
               }
             }
           },
           'structure' => {
-            'level' => 1,
-            'number' => 2
+            'section_level' => 1,
+            'section_number' => 2
           }
         },
         'normalized' => 'after'
diff --git a/tp/t/results/sectioning/chapter_sections.pl 
b/tp/t/results/sectioning/chapter_sections.pl
index 524a827280..fb48ec6185 100644
--- a/tp/t/results/sectioning/chapter_sections.pl
+++ b/tp/t/results/sectioning/chapter_sections.pl
@@ -464,7 +464,6 @@ $result_texts{'chapter_sections'} = 'unnumbered
 
 $result_sectioning{'chapter_sections'} = {
   'structure' => {
-    'level' => 0,
     'section_childs' => [
       {
         'cmdname' => 'unnumbered',
@@ -483,8 +482,6 @@ $result_sectioning{'chapter_sections'} = {
                       'extra' => {},
                       'structure' => {
                         'associated_unit' => {},
-                        'level' => 1,
-                        'number' => 1,
                         'section_childs' => [
                           {
                             'cmdname' => 'section',
@@ -505,8 +502,6 @@ $result_sectioning{'chapter_sections'} = {
                                           'extra' => {},
                                           'structure' => {
                                             'associated_unit' => {},
-                                            'level' => 1,
-                                            'number' => 2,
                                             'section_childs' => [
                                               {
                                                 'cmdname' => 'section',
@@ -527,8 +522,8 @@ $result_sectioning{'chapter_sections'} = {
                                                               'extra' => {},
                                                               'structure' => {
                                                                 
'associated_unit' => {},
-                                                                'level' => 1,
-                                                                'number' => 3,
+                                                                
'section_level' => 1,
+                                                                
'section_number' => 3,
                                                                 'section_prev' 
=> {},
                                                                 'section_up' 
=> {},
                                                                 
'toplevel_prev' => {}
@@ -544,8 +539,8 @@ $result_sectioning{'chapter_sections'} = {
                                                                     'extra' => 
{},
                                                                     
'structure' => {
                                                                       
'associated_unit' => {},
-                                                                      'level' 
=> 3,
-                                                                      'number' 
=> '2.1.2',
+                                                                      
'section_level' => 3,
+                                                                      
'section_number' => '2.1.2',
                                                                       
'section_prev' => {
                                                                         
'cmdname' => 'subsection',
                                                                         
'extra' => {},
@@ -569,8 +564,8 @@ $result_sectioning{'chapter_sections'} = {
                                                                             },
                                                                             
'type' => 'unit'
                                                                           },
-                                                                          
'level' => 3,
-                                                                          
'number' => '2.1.1',
+                                                                          
'section_level' => 3,
+                                                                          
'section_number' => '2.1.1',
                                                                           
'section_up' => {}
                                                                         }
                                                                       },
@@ -610,16 +605,18 @@ $result_sectioning{'chapter_sections'} = {
                                                     },
                                                     'type' => 'unit'
                                                   },
-                                                  'level' => 2,
-                                                  'number' => '2.1',
                                                   'section_childs' => [
                                                     {},
                                                     {}
                                                   ],
+                                                  'section_level' => 2,
+                                                  'section_number' => '2.1',
                                                   'section_up' => {}
                                                 }
                                               }
                                             ],
+                                            'section_level' => 1,
+                                            'section_number' => 2,
                                             'section_prev' => {},
                                             'section_up' => {},
                                             'toplevel_prev' => {}
@@ -650,12 +647,14 @@ $result_sectioning{'chapter_sections'} = {
                                 },
                                 'type' => 'unit'
                               },
-                              'level' => 2,
-                              'number' => '1.1',
+                              'section_level' => 2,
+                              'section_number' => '1.1',
                               'section_up' => {}
                             }
                           }
                         ],
+                        'section_level' => 1,
+                        'section_number' => 1,
                         'section_prev' => {},
                         'section_up' => {},
                         'toplevel_prev' => {}
@@ -685,14 +684,15 @@ $result_sectioning{'chapter_sections'} = {
             },
             'type' => 'unit'
           },
-          'level' => 1,
+          'section_level' => 1,
           'section_up' => {}
         }
       },
       {},
       {},
       {}
-    ]
+    ],
+    'section_level' => 0
   }
 };
 
$result_sectioning{'chapter_sections'}{'structure'}{'section_childs'}[0]{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = $result_sectioning{'chapter_sections'}{'structure'}{'section_childs'}[0];
@@ -795,7 +795,7 @@ $result_elements{'chapter_sections'} = [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 1
+          'section_level' => 1
         }
       }
     },
@@ -808,8 +808,8 @@ $result_elements{'chapter_sections'} = [
               'extra' => {},
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1,
-                'number' => 1
+                'section_level' => 1,
+                'section_number' => 1
               }
             }
           },
@@ -824,8 +824,8 @@ $result_elements{'chapter_sections'} = [
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1,
-                      'number' => 2
+                      'section_level' => 1,
+                      'section_number' => 2
                     }
                   }
                 },
@@ -838,8 +838,8 @@ $result_elements{'chapter_sections'} = [
                           'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 2,
-                            'number' => '1.1'
+                            'section_level' => 2,
+                            'section_number' => '1.1'
                           }
                         }
                       },
@@ -863,8 +863,8 @@ $result_elements{'chapter_sections'} = [
                           'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1,
-                            'number' => 3
+                            'section_level' => 1,
+                            'section_number' => 3
                           }
                         }
                       },
@@ -877,8 +877,8 @@ $result_elements{'chapter_sections'} = [
                                 'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {},
-                                  'level' => 3,
-                                  'number' => '2.1.2'
+                                  'section_level' => 3,
+                                  'section_number' => '2.1.2'
                                 }
                               }
                             },
@@ -891,8 +891,8 @@ $result_elements{'chapter_sections'} = [
                                       'extra' => {},
                                       'structure' => {
                                         'associated_unit' => {},
-                                        'level' => 3,
-                                        'number' => '2.1.1'
+                                        'section_level' => 3,
+                                        'section_number' => '2.1.1'
                                       }
                                     }
                                   },
@@ -905,8 +905,8 @@ $result_elements{'chapter_sections'} = [
                                             'extra' => {},
                                             'structure' => {
                                               'associated_unit' => {},
-                                              'level' => 2,
-                                              'number' => '2.1'
+                                              'section_level' => 2,
+                                              'section_number' => '2.1'
                                             }
                                           }
                                         },
diff --git a/tp/t/results/sectioning/character_and_spaces_in_refs.pl 
b/tp/t/results/sectioning/character_and_spaces_in_refs.pl
index c8ea5b0d39..b2253ef704 100644
--- a/tp/t/results/sectioning/character_and_spaces_in_refs.pl
+++ b/tp/t/results/sectioning/character_and_spaces_in_refs.pl
@@ -1680,7 +1680,6 @@ local   node
 
 $result_sectioning{'character_and_spaces_in_refs'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1694,7 +1693,6 @@ $result_sectioning{'character_and_spaces_in_refs'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1708,18 +1706,20 @@ $result_sectioning{'character_and_spaces_in_refs'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'character_and_spaces_in_refs'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'character_and_spaces_in_refs'}{'structure'}{'section_childs'}[0];
@@ -1734,7 +1734,7 @@ $result_nodes{'character_and_spaces_in_refs'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1753,8 +1753,8 @@ $result_nodes{'character_and_spaces_in_refs'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
diff --git a/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl 
b/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl
index e6b5b5f078..73b4663b36 100644
--- a/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl
+++ b/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl
@@ -1743,7 +1743,6 @@ local   node
 
 $result_sectioning{'character_and_spaces_in_refs_out'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1885,7 +1884,6 @@ $result_sectioning{'character_and_spaces_in_refs_out'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1894,18 +1892,20 @@ $result_sectioning{'character_and_spaces_in_refs_out'} 
= {
               },
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'character_and_spaces_in_refs_out'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'character_and_spaces_in_refs_out'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'};
@@ -1988,8 +1988,8 @@ $result_nodes{'character_and_spaces_in_refs_out'} = {
                         'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
-                          'level' => 1,
-                          'number' => 1
+                          'section_level' => 1,
+                          'section_number' => 1
                         }
                       },
                       'menus' => [
@@ -2125,7 +2125,7 @@ $result_nodes{'character_and_spaces_in_refs_out'} = {
           },
           'type' => 'unit'
         },
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
diff --git a/tp/t/results/sectioning/complex.pl 
b/tp/t/results/sectioning/complex.pl
index f3c82d4715..6670b8f9b7 100644
--- a/tp/t/results/sectioning/complex.pl
+++ b/tp/t/results/sectioning/complex.pl
@@ -3241,7 +3241,6 @@ directions and lone node.
 
 $result_sectioning{'complex'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -3275,8 +3274,6 @@ $result_sectioning{'complex'} = {
                           },
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1,
-                            'number' => 1,
                             'section_childs' => [
                               {
                                 'cmdname' => 'unnumberedsec',
@@ -3312,8 +3309,8 @@ $result_sectioning{'complex'} = {
                                                   },
                                                   'structure' => {
                                                     'associated_unit' => {},
-                                                    'level' => 1,
-                                                    'number' => 2,
+                                                    'section_level' => 1,
+                                                    'section_number' => 2,
                                                     'section_prev' => {},
                                                     'section_up' => {},
                                                     'toplevel_prev' => {},
@@ -3340,8 +3337,8 @@ $result_sectioning{'complex'} = {
                                                         },
                                                         'structure' => {
                                                           'associated_unit' => 
{},
-                                                          'level' => 2,
-                                                          'number' => '1.1',
+                                                          'section_level' => 2,
+                                                          'section_number' => 
'1.1',
                                                           'section_prev' => {
                                                             'cmdname' => 
'unnumberedsec',
                                                             'extra' => {
@@ -3374,7 +3371,7 @@ $result_sectioning{'complex'} = {
                                                                               
},
                                                                               
'structure' => {
                                                                                
 'associated_unit' => {},
-                                                                               
 'level' => 3,
+                                                                               
 'section_level' => 3,
                                                                                
 'section_prev' => {
                                                                                
   'cmdname' => 'unnumberedsubsec',
                                                                                
   'extra' => {
@@ -3407,7 +3404,7 @@ $result_sectioning{'complex'} = {
                                                                                
                     },
                                                                                
                     'structure' => {
                                                                                
                       'associated_unit' => {},
-                                                                               
                       'level' => 3,
+                                                                               
                       'section_level' => 3,
                                                                                
                       'section_prev' => {
                                                                                
                         'cmdname' => 'unnumberedsubsec',
                                                                                
                         'extra' => {
@@ -3445,7 +3442,7 @@ $result_sectioning{'complex'} = {
                                                                                
                         },
                                                                                
                         'structure' => {
                                                                                
                           'associated_unit' => {},
-                                                                               
                           'level' => 3,
+                                                                               
                           'section_level' => 3,
                                                                                
                           'section_up' => {}
                                                                                
                         }
                                                                                
                       },
@@ -3497,7 +3494,7 @@ $result_sectioning{'complex'} = {
                                                                                
   },
                                                                                
   'structure' => {
                                                                                
     'associated_unit' => {},
-                                                                               
     'level' => 3,
+                                                                               
     'section_level' => 3,
                                                                                
     'section_prev' => {},
                                                                                
     'section_up' => {}
                                                                                
   }
@@ -3544,7 +3541,7 @@ $result_sectioning{'complex'} = {
                                                                               
},
                                                                               
'structure' => {
                                                                                
 'associated_unit' => {},
-                                                                               
 'level' => 3,
+                                                                               
 'section_level' => 3,
                                                                                
 'section_up' => {}
                                                                               }
                                                                             }
@@ -3586,10 +3583,10 @@ $result_sectioning{'complex'} = {
                                                             },
                                                             'structure' => {
                                                               
'associated_unit' => {},
-                                                              'level' => 2,
                                                               'section_childs' 
=> [
                                                                 {}
                                                               ],
+                                                              'section_level' 
=> 2,
                                                               'section_prev' 
=> {},
                                                               'section_up' => 
{}
                                                             }
@@ -3634,7 +3631,7 @@ $result_sectioning{'complex'} = {
                                                         },
                                                         'structure' => {
                                                           'associated_unit' => 
{},
-                                                          'level' => 1,
+                                                          'section_level' => 1,
                                                           'section_prev' => {},
                                                           'section_up' => {},
                                                           'toplevel_prev' => 
{},
@@ -3663,7 +3660,7 @@ $result_sectioning{'complex'} = {
                                                               },
                                                               'structure' => {
                                                                 
'associated_unit' => {},
-                                                                'level' => 1,
+                                                                
'section_level' => 1,
                                                                 'section_prev' 
=> {},
                                                                 'section_up' 
=> {},
                                                                 
'toplevel_prev' => {},
@@ -3737,19 +3734,21 @@ $result_sectioning{'complex'} = {
                                 },
                                 'structure' => {
                                   'associated_unit' => {},
-                                  'level' => 2,
                                   'section_childs' => [
                                     {},
                                     {},
                                     {},
                                     {}
                                   ],
+                                  'section_level' => 2,
                                   'section_up' => {}
                                 }
                               },
                               {},
                               {}
                             ],
+                            'section_level' => 1,
+                            'section_number' => 1,
                             'section_up' => {},
                             'toplevel_prev' => {},
                             'toplevel_up' => {}
@@ -3793,17 +3792,18 @@ $result_sectioning{'complex'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0,
           'section_childs' => [
             {},
             {},
             {},
             {}
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'complex'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = $result_sectioning{'complex'}{'structure'}{'section_childs'}[0];
@@ -4047,8 +4047,8 @@ $result_nodes{'complex'} = {
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1,
-                      'number' => 1
+                      'section_level' => 1,
+                      'section_number' => 1
                     }
                   }
                 },
@@ -4063,8 +4063,8 @@ $result_nodes{'complex'} = {
                           'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1,
-                            'number' => 2
+                            'section_level' => 1,
+                            'section_number' => 2
                           }
                         }
                       },
@@ -4077,8 +4077,8 @@ $result_nodes{'complex'} = {
                                 'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {},
-                                  'level' => 2,
-                                  'number' => '1.1'
+                                  'section_level' => 2,
+                                  'section_number' => '1.1'
                                 }
                               }
                             },
@@ -4091,7 +4091,7 @@ $result_nodes{'complex'} = {
                                       'extra' => {},
                                       'structure' => {
                                         'associated_unit' => {},
-                                        'level' => 3
+                                        'section_level' => 3
                                       }
                                     }
                                   },
@@ -4104,7 +4104,7 @@ $result_nodes{'complex'} = {
                                             'extra' => {},
                                             'structure' => {
                                               'associated_unit' => {},
-                                              'level' => 2
+                                              'section_level' => 2
                                             }
                                           }
                                         },
@@ -4117,7 +4117,7 @@ $result_nodes{'complex'} = {
                                                   'extra' => {},
                                                   'structure' => {
                                                     'associated_unit' => {},
-                                                    'level' => 3
+                                                    'section_level' => 3
                                                   }
                                                 }
                                               },
@@ -4130,7 +4130,7 @@ $result_nodes{'complex'} = {
                                                         'extra' => {},
                                                         'structure' => {
                                                           'associated_unit' => 
{},
-                                                          'level' => 3
+                                                          'section_level' => 3
                                                         }
                                                       }
                                                     },
@@ -4143,7 +4143,7 @@ $result_nodes{'complex'} = {
                                                               'extra' => {},
                                                               'structure' => {
                                                                 
'associated_unit' => {},
-                                                                'level' => 3
+                                                                
'section_level' => 3
                                                               }
                                                             }
                                                           },
@@ -4156,7 +4156,7 @@ $result_nodes{'complex'} = {
                                                                     'extra' => 
{},
                                                                     
'structure' => {
                                                                       
'associated_unit' => {},
-                                                                      'level' 
=> 3
+                                                                      
'section_level' => 3
                                                                     }
                                                                   }
                                                                 },
@@ -4169,7 +4169,7 @@ $result_nodes{'complex'} = {
                                                                           
'extra' => {},
                                                                           
'structure' => {
                                                                             
'associated_unit' => {},
-                                                                            
'level' => 2
+                                                                            
'section_level' => 2
                                                                           }
                                                                         }
                                                                       },
@@ -4315,7 +4315,7 @@ $result_nodes{'complex'} = {
                                 'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {},
-                                  'level' => 1
+                                  'section_level' => 1
                                 }
                               }
                             },
@@ -4330,7 +4330,7 @@ $result_nodes{'complex'} = {
                                       'extra' => {},
                                       'structure' => {
                                         'associated_unit' => {},
-                                        'level' => 1
+                                        'section_level' => 1
                                       }
                                     }
                                   },
@@ -4414,7 +4414,7 @@ $result_nodes{'complex'} = {
           },
           'type' => 'unit'
         },
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -4774,7 +4774,7 @@ $result_menus{'complex'} = {
           'extra' => {},
           'structure' => {
             'associated_unit' => {},
-            'level' => 0
+            'section_level' => 0
           }
         }
       },
@@ -4787,8 +4787,8 @@ $result_menus{'complex'} = {
                 'extra' => {},
                 'structure' => {
                   'associated_unit' => {},
-                  'level' => 1,
-                  'number' => 1
+                  'section_level' => 1,
+                  'section_number' => 1
                 }
               }
             },
@@ -4803,8 +4803,8 @@ $result_menus{'complex'} = {
                       'extra' => {},
                       'structure' => {
                         'associated_unit' => {},
-                        'level' => 1,
-                        'number' => 2
+                        'section_level' => 1,
+                        'section_number' => 2
                       }
                     }
                   },
@@ -4817,8 +4817,8 @@ $result_menus{'complex'} = {
                             'extra' => {},
                             'structure' => {
                               'associated_unit' => {},
-                              'level' => 2,
-                              'number' => '1.1'
+                              'section_level' => 2,
+                              'section_number' => '1.1'
                             }
                           }
                         },
@@ -4831,7 +4831,7 @@ $result_menus{'complex'} = {
                                   'extra' => {},
                                   'structure' => {
                                     'associated_unit' => {},
-                                    'level' => 3
+                                    'section_level' => 3
                                   }
                                 }
                               },
@@ -4844,7 +4844,7 @@ $result_menus{'complex'} = {
                                         'extra' => {},
                                         'structure' => {
                                           'associated_unit' => {},
-                                          'level' => 2
+                                          'section_level' => 2
                                         }
                                       }
                                     },
@@ -4857,7 +4857,7 @@ $result_menus{'complex'} = {
                                               'extra' => {},
                                               'structure' => {
                                                 'associated_unit' => {},
-                                                'level' => 3
+                                                'section_level' => 3
                                               }
                                             }
                                           },
@@ -4870,7 +4870,7 @@ $result_menus{'complex'} = {
                                                     'extra' => {},
                                                     'structure' => {
                                                       'associated_unit' => {},
-                                                      'level' => 3
+                                                      'section_level' => 3
                                                     }
                                                   }
                                                 },
@@ -4883,7 +4883,7 @@ $result_menus{'complex'} = {
                                                           'extra' => {},
                                                           'structure' => {
                                                             'associated_unit' 
=> {},
-                                                            'level' => 3
+                                                            'section_level' => 
3
                                                           }
                                                         }
                                                       },
@@ -4896,7 +4896,7 @@ $result_menus{'complex'} = {
                                                                 'extra' => {},
                                                                 'structure' => 
{
                                                                   
'associated_unit' => {},
-                                                                  'level' => 3
+                                                                  
'section_level' => 3
                                                                 }
                                                               }
                                                             },
@@ -4909,7 +4909,7 @@ $result_menus{'complex'} = {
                                                                       'extra' 
=> {},
                                                                       
'structure' => {
                                                                         
'associated_unit' => {},
-                                                                        
'level' => 2
+                                                                        
'section_level' => 2
                                                                       }
                                                                     }
                                                                   },
@@ -5055,7 +5055,7 @@ $result_menus{'complex'} = {
                             'extra' => {},
                             'structure' => {
                               'associated_unit' => {},
-                              'level' => 1
+                              'section_level' => 1
                             }
                           }
                         },
@@ -5070,7 +5070,7 @@ $result_menus{'complex'} = {
                                   'extra' => {},
                                   'structure' => {
                                     'associated_unit' => {},
-                                    'level' => 1
+                                    'section_level' => 1
                                   }
                                 }
                               },
@@ -5567,7 +5567,7 @@ $result_elements{'complex'} = [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 0
+          'section_level' => 0
         }
       }
     },
@@ -5580,8 +5580,8 @@ $result_elements{'complex'} = [
               'extra' => {},
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1,
-                'number' => 1
+                'section_level' => 1,
+                'section_number' => 1
               }
             }
           },
@@ -5596,8 +5596,8 @@ $result_elements{'complex'} = [
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1,
-                      'number' => 2
+                      'section_level' => 1,
+                      'section_number' => 2
                     }
                   }
                 },
@@ -5610,8 +5610,8 @@ $result_elements{'complex'} = [
                           'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 2,
-                            'number' => '1.1'
+                            'section_level' => 2,
+                            'section_number' => '1.1'
                           }
                         }
                       },
@@ -5624,7 +5624,7 @@ $result_elements{'complex'} = [
                                 'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {},
-                                  'level' => 3
+                                  'section_level' => 3
                                 }
                               }
                             },
@@ -5637,7 +5637,7 @@ $result_elements{'complex'} = [
                                       'extra' => {},
                                       'structure' => {
                                         'associated_unit' => {},
-                                        'level' => 2
+                                        'section_level' => 2
                                       }
                                     }
                                   },
@@ -5650,7 +5650,7 @@ $result_elements{'complex'} = [
                                             'extra' => {},
                                             'structure' => {
                                               'associated_unit' => {},
-                                              'level' => 3
+                                              'section_level' => 3
                                             }
                                           }
                                         },
@@ -5663,7 +5663,7 @@ $result_elements{'complex'} = [
                                                   'extra' => {},
                                                   'structure' => {
                                                     'associated_unit' => {},
-                                                    'level' => 3
+                                                    'section_level' => 3
                                                   }
                                                 }
                                               },
@@ -5676,7 +5676,7 @@ $result_elements{'complex'} = [
                                                         'extra' => {},
                                                         'structure' => {
                                                           'associated_unit' => 
{},
-                                                          'level' => 3
+                                                          'section_level' => 3
                                                         }
                                                       }
                                                     },
@@ -5689,7 +5689,7 @@ $result_elements{'complex'} = [
                                                               'extra' => {},
                                                               'structure' => {
                                                                 
'associated_unit' => {},
-                                                                'level' => 3
+                                                                
'section_level' => 3
                                                               }
                                                             }
                                                           },
@@ -5702,7 +5702,7 @@ $result_elements{'complex'} = [
                                                                     'extra' => 
{},
                                                                     
'structure' => {
                                                                       
'associated_unit' => {},
-                                                                      'level' 
=> 2
+                                                                      
'section_level' => 2
                                                                     }
                                                                   }
                                                                 },
@@ -5832,7 +5832,7 @@ $result_elements{'complex'} = [
                           'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1
+                            'section_level' => 1
                           }
                         }
                       },
@@ -5847,7 +5847,7 @@ $result_elements{'complex'} = [
                                 'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {},
-                                  'level' => 1
+                                  'section_level' => 1
                                 }
                               }
                             },
diff --git a/tp/t/results/sectioning/complex_split_at_node.pl 
b/tp/t/results/sectioning/complex_split_at_node.pl
index 1b065b6d8a..06a6f31cff 100644
--- a/tp/t/results/sectioning/complex_split_at_node.pl
+++ b/tp/t/results/sectioning/complex_split_at_node.pl
@@ -3259,7 +3259,6 @@ directions and lone node.
 
 $result_sectioning{'complex_split_at_node'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -3707,7 +3706,6 @@ $result_sectioning{'complex_split_at_node'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -3716,8 +3714,6 @@ $result_sectioning{'complex_split_at_node'} = {
               },
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'unnumberedsec',
@@ -3726,7 +3722,6 @@ $result_sectioning{'complex_split_at_node'} = {
                     },
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 2,
                       'section_childs' => [
                         {
                           'cmdname' => 'unnumberedsubsec',
@@ -3735,7 +3730,7 @@ $result_sectioning{'complex_split_at_node'} = {
                           },
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_up' => {}
                           }
                         },
@@ -3746,7 +3741,7 @@ $result_sectioning{'complex_split_at_node'} = {
                           },
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_prev' => {},
                             'section_up' => {}
                           }
@@ -3758,7 +3753,7 @@ $result_sectioning{'complex_split_at_node'} = {
                           },
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_prev' => {},
                             'section_up' => {}
                           }
@@ -3770,12 +3765,13 @@ $result_sectioning{'complex_split_at_node'} = {
                           },
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_prev' => {},
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
                       'section_up' => {}
                     }
                   },
@@ -3786,7 +3782,6 @@ $result_sectioning{'complex_split_at_node'} = {
                     },
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 2,
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -3795,11 +3790,12 @@ $result_sectioning{'complex_split_at_node'} = {
                           },
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
                       'section_prev' => {},
                       'section_up' => {}
                     }
@@ -3811,13 +3807,15 @@ $result_sectioning{'complex_split_at_node'} = {
                     },
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 2,
-                      'number' => '1.1',
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_prev' => {},
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -3830,8 +3828,8 @@ $result_sectioning{'complex_split_at_node'} = {
               },
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1,
-                'number' => 2,
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -3845,7 +3843,7 @@ $result_sectioning{'complex_split_at_node'} = {
               },
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1,
+                'section_level' => 1,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -3859,7 +3857,7 @@ $result_sectioning{'complex_split_at_node'} = {
               },
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1,
+                'section_level' => 1,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -3867,10 +3865,12 @@ $result_sectioning{'complex_split_at_node'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'complex_split_at_node'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'complex_split_at_node'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'};
@@ -4132,8 +4132,8 @@ $result_nodes{'complex_split_at_node'} = {
                         'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
-                          'level' => 1,
-                          'number' => 1
+                          'section_level' => 1,
+                          'section_number' => 1
                         }
                       },
                       'menus' => [
@@ -4171,8 +4171,8 @@ $result_nodes{'complex_split_at_node'} = {
                                               'extra' => {},
                                               'structure' => {
                                                 'associated_unit' => {},
-                                                'level' => 1,
-                                                'number' => 2
+                                                'section_level' => 1,
+                                                'section_number' => 2
                                               }
                                             },
                                             'normalized' => 'Second-node'
@@ -4204,7 +4204,7 @@ $result_nodes{'complex_split_at_node'} = {
                                                                     'extra' => 
{},
                                                                     
'structure' => {
                                                                       
'associated_unit' => {},
-                                                                      'level' 
=> 1
+                                                                      
'section_level' => 1
                                                                     }
                                                                   },
                                                                   'normalized' 
=> 'continuity'
@@ -4277,7 +4277,7 @@ $result_nodes{'complex_split_at_node'} = {
                                                       },
                                                       'type' => 'unit'
                                                     },
-                                                    'level' => 1
+                                                    'section_level' => 1
                                                   }
                                                 },
                                                 'normalized' => 
'Third-node-unnumbered'
@@ -4320,8 +4320,8 @@ $result_nodes{'complex_split_at_node'} = {
                                                           'extra' => {},
                                                           'structure' => {
                                                             'associated_unit' 
=> {},
-                                                            'level' => 2,
-                                                            'number' => '1.1'
+                                                            'section_level' => 
2,
+                                                            'section_number' 
=> '1.1'
                                                           }
                                                         },
                                                         'normalized' => 
'numbered'
@@ -4351,7 +4351,7 @@ $result_nodes{'complex_split_at_node'} = {
                                                                                
 'extra' => {},
                                                                                
 'structure' => {
                                                                                
   'associated_unit' => {},
-                                                                               
   'level' => 3
+                                                                               
   'section_level' => 3
                                                                                
 }
                                                                               
},
                                                                               
'normalized' => 'numbered-sub2'
@@ -4381,7 +4381,7 @@ $result_nodes{'complex_split_at_node'} = {
                                                                                
                       'extra' => {},
                                                                                
                       'structure' => {
                                                                                
                         'associated_unit' => {},
-                                                                               
                         'level' => 3
+                                                                               
                         'section_level' => 3
                                                                                
                       }
                                                                                
                     },
                                                                                
                     'normalized' => 'numbered-sub'
@@ -4419,7 +4419,7 @@ $result_nodes{'complex_split_at_node'} = {
                                                                                
                               },
                                                                                
                               'type' => 'unit'
                                                                                
                             },
-                                                                               
                             'level' => 3
+                                                                               
                             'section_level' => 3
                                                                                
                           }
                                                                                
                         },
                                                                                
                         'normalized' => 'unnumbered-sub'
@@ -4473,7 +4473,7 @@ $result_nodes{'complex_split_at_node'} = {
                                                                                
         },
                                                                                
         'type' => 'unit'
                                                                                
       },
-                                                                               
       'level' => 3
+                                                                               
       'section_level' => 3
                                                                                
     }
                                                                                
   },
                                                                                
   'normalized' => 'unnumbered-sub2'
@@ -4520,7 +4520,7 @@ $result_nodes{'complex_split_at_node'} = {
                                                                                
 'extra' => {},
                                                                                
 'structure' => {
                                                                                
   'associated_unit' => {},
-                                                                               
   'level' => 3
+                                                                               
   'section_level' => 3
                                                                                
 }
                                                                               
},
                                                                               
'normalized' => 'numbered-sub3'
@@ -4563,7 +4563,7 @@ $result_nodes{'complex_split_at_node'} = {
                                                                   },
                                                                   'type' => 
'unit'
                                                                 },
-                                                                'level' => 2
+                                                                
'section_level' => 2
                                                               }
                                                             },
                                                             'menus' => [
@@ -4644,7 +4644,7 @@ $result_nodes{'complex_split_at_node'} = {
                                 },
                                 'type' => 'unit'
                               },
-                              'level' => 2
+                              'section_level' => 2
                             }
                           },
                           'menus' => [
@@ -4705,7 +4705,7 @@ $result_nodes{'complex_split_at_node'} = {
           },
           'type' => 'unit'
         },
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
diff --git a/tp/t/results/sectioning/contents.pl 
b/tp/t/results/sectioning/contents.pl
index 6ef0feba47..f6545e83ad 100644
--- a/tp/t/results/sectioning/contents.pl
+++ b/tp/t/results/sectioning/contents.pl
@@ -541,59 +541,58 @@ A.1 appendixsec
 
 $result_sectioning{'contents'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
         'extra' => {},
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
                           'extra' => {},
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
                             'section_childs' => [
                               {
                                 'cmdname' => 'subsubsection',
                                 'extra' => {},
                                 'structure' => {
-                                  'level' => 4,
-                                  'number' => '1.1.1.1',
+                                  'section_level' => 4,
+                                  'section_number' => '1.1.1.1',
                                   'section_up' => {}
                                 }
                               }
                             ],
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       },
@@ -606,8 +605,8 @@ $result_sectioning{'contents'} = {
               'associated_part' => {}
             },
             'structure' => {
-              'level' => 1,
-              'number' => 2,
+              'section_level' => 1,
+              'section_number' => 2,
               'section_up' => {},
               'toplevel_prev' => {},
               'toplevel_up' => {}
@@ -615,15 +614,14 @@ $result_sectioning{'contents'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {},
             {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 3,
+                'section_level' => 1,
+                'section_number' => 3,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -634,7 +632,7 @@ $result_sectioning{'contents'} = {
               'cmdname' => 'unnumbered',
               'extra' => {},
               'structure' => {
-                'level' => 1,
+                'section_level' => 1,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -642,6 +640,7 @@ $result_sectioning{'contents'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_prev' => {},
           'section_up' => {}
         }
@@ -650,26 +649,27 @@ $result_sectioning{'contents'} = {
         'cmdname' => 'appendix',
         'extra' => {},
         'structure' => {
-          'level' => 1,
-          'number' => 'A',
           'section_childs' => [
             {
               'cmdname' => 'appendixsec',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => 'A.1',
+                'section_level' => 2,
+                'section_number' => 'A.1',
                 'section_up' => {}
               }
             }
           ],
+          'section_level' => 1,
+          'section_number' => 'A',
           'section_prev' => {},
           'section_up' => {},
           'toplevel_prev' => {},
           'toplevel_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'contents'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'contents'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
diff --git a/tp/t/results/sectioning/contents_and_shortcontents.pl 
b/tp/t/results/sectioning/contents_and_shortcontents.pl
index 4652b0d301..ea46a45ed5 100644
--- a/tp/t/results/sectioning/contents_and_shortcontents.pl
+++ b/tp/t/results/sectioning/contents_and_shortcontents.pl
@@ -570,59 +570,58 @@ A.1 appendixsec
 
 $result_sectioning{'contents_and_shortcontents'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
         'extra' => {},
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
                           'extra' => {},
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
                             'section_childs' => [
                               {
                                 'cmdname' => 'subsubsection',
                                 'extra' => {},
                                 'structure' => {
-                                  'level' => 4,
-                                  'number' => '1.1.1.1',
+                                  'section_level' => 4,
+                                  'section_number' => '1.1.1.1',
                                   'section_up' => {}
                                 }
                               }
                             ],
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       },
@@ -635,8 +634,8 @@ $result_sectioning{'contents_and_shortcontents'} = {
               'associated_part' => {}
             },
             'structure' => {
-              'level' => 1,
-              'number' => 2,
+              'section_level' => 1,
+              'section_number' => 2,
               'section_up' => {},
               'toplevel_prev' => {},
               'toplevel_up' => {}
@@ -644,15 +643,14 @@ $result_sectioning{'contents_and_shortcontents'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {},
             {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 3,
+                'section_level' => 1,
+                'section_number' => 3,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -663,7 +661,7 @@ $result_sectioning{'contents_and_shortcontents'} = {
               'cmdname' => 'unnumbered',
               'extra' => {},
               'structure' => {
-                'level' => 1,
+                'section_level' => 1,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -671,6 +669,7 @@ $result_sectioning{'contents_and_shortcontents'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_prev' => {},
           'section_up' => {}
         }
@@ -679,26 +678,27 @@ $result_sectioning{'contents_and_shortcontents'} = {
         'cmdname' => 'appendix',
         'extra' => {},
         'structure' => {
-          'level' => 1,
-          'number' => 'A',
           'section_childs' => [
             {
               'cmdname' => 'appendixsec',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => 'A.1',
+                'section_level' => 2,
+                'section_number' => 'A.1',
                 'section_up' => {}
               }
             }
           ],
+          'section_level' => 1,
+          'section_number' => 'A',
           'section_prev' => {},
           'section_up' => {},
           'toplevel_prev' => {},
           'toplevel_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'contents_and_shortcontents'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'contents_and_shortcontents'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
diff --git a/tp/t/results/sectioning/contents_at_document_begin.pl 
b/tp/t/results/sectioning/contents_at_document_begin.pl
index 68f7b5e104..bf69b7bf0a 100644
--- a/tp/t/results/sectioning/contents_at_document_begin.pl
+++ b/tp/t/results/sectioning/contents_at_document_begin.pl
@@ -285,7 +285,6 @@ top
 
 $result_sectioning{'contents_at_document_begin'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -299,24 +298,25 @@ $result_sectioning{'contents_at_document_begin'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'contents_at_document_begin'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'contents_at_document_begin'}{'structure'}{'section_childs'}[0];
@@ -331,7 +331,7 @@ $result_nodes{'contents_at_document_begin'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/contents_at_end_document.pl 
b/tp/t/results/sectioning/contents_at_end_document.pl
index 033241ed58..36b4b41670 100644
--- a/tp/t/results/sectioning/contents_at_end_document.pl
+++ b/tp/t/results/sectioning/contents_at_end_document.pl
@@ -285,7 +285,6 @@ top
 
 $result_sectioning{'contents_at_end_document'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -299,24 +298,25 @@ $result_sectioning{'contents_at_end_document'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'contents_at_end_document'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'contents_at_end_document'}{'structure'}{'section_childs'}[0];
@@ -331,7 +331,7 @@ $result_nodes{'contents_at_end_document'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/contents_at_end_document_after_node.pl 
b/tp/t/results/sectioning/contents_at_end_document_after_node.pl
index d7a6c5a349..21003e65a0 100644
--- a/tp/t/results/sectioning/contents_at_end_document_after_node.pl
+++ b/tp/t/results/sectioning/contents_at_end_document_after_node.pl
@@ -515,7 +515,6 @@ top
 
 $result_sectioning{'contents_at_end_document_after_node'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -529,24 +528,25 @@ $result_sectioning{'contents_at_end_document_after_node'} 
= {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'contents_at_end_document_after_node'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'contents_at_end_document_after_node'}{'structure'}{'section_childs'}[0];
@@ -561,7 +561,7 @@ $result_nodes{'contents_at_end_document_after_node'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
diff --git a/tp/t/results/sectioning/contents_in_document.pl 
b/tp/t/results/sectioning/contents_in_document.pl
index 6d30d751aa..c6b0b57207 100644
--- a/tp/t/results/sectioning/contents_in_document.pl
+++ b/tp/t/results/sectioning/contents_in_document.pl
@@ -285,7 +285,6 @@ top
 
 $result_sectioning{'contents_in_document'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -299,24 +298,25 @@ $result_sectioning{'contents_in_document'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'contents_in_document'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'contents_in_document'}{'structure'}{'section_childs'}[0];
@@ -331,7 +331,7 @@ $result_nodes{'contents_in_document'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/contents_in_html_text.pl 
b/tp/t/results/sectioning/contents_in_html_text.pl
index 1cb894c3b6..75d706ad7c 100644
--- a/tp/t/results/sectioning/contents_in_html_text.pl
+++ b/tp/t/results/sectioning/contents_in_html_text.pl
@@ -244,31 +244,29 @@ $result_texts{'contents_in_html_text'} = 'top
 
 $result_sectioning{'contents_in_html_text'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
         'extra' => {},
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -278,8 +276,8 @@ $result_sectioning{'contents_in_html_text'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 2,
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -287,10 +285,12 @@ $result_sectioning{'contents_in_html_text'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'contents_in_html_text'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'contents_in_html_text'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
diff --git a/tp/t/results/sectioning/double_part.pl 
b/tp/t/results/sectioning/double_part.pl
index 840fe05362..f367e86dab 100644
--- a/tp/t/results/sectioning/double_part.pl
+++ b/tp/t/results/sectioning/double_part.pl
@@ -517,7 +517,6 @@ Text part second.
 
 $result_sectioning{'double_part'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -557,10 +556,10 @@ $result_sectioning{'double_part'} = {
                               },
                               'structure' => {
                                 'associated_unit' => {},
-                                'level' => 0,
                                 'section_childs' => [
                                   {}
                                 ],
+                                'section_level' => 0,
                                 'section_prev' => {
                                   'cmdname' => 'part',
                                   'extra' => {},
@@ -584,7 +583,7 @@ $result_sectioning{'double_part'} = {
                                       },
                                       'type' => 'unit'
                                     },
-                                    'level' => 0,
+                                    'section_level' => 0,
                                     'section_prev' => {},
                                     'section_up' => {}
                                   }
@@ -595,8 +594,8 @@ $result_sectioning{'double_part'} = {
                           },
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1,
-                            'number' => 1,
+                            'section_level' => 1,
+                            'section_number' => 1,
                             'section_up' => {},
                             'toplevel_prev' => {},
                             'toplevel_up' => {}
@@ -631,13 +630,14 @@ $result_sectioning{'double_part'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       },
       {},
       {}
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'double_part'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'first_in_page'}
 = 
$result_sectioning{'double_part'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'};
@@ -707,14 +707,14 @@ $result_nodes{'double_part'} = {
                         'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
-                          'level' => 0
+                          'section_level' => 0
                         }
                       }
                     },
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1,
-                      'number' => 1
+                      'section_level' => 1,
+                      'section_number' => 1
                     }
                   }
                 },
@@ -728,7 +728,7 @@ $result_nodes{'double_part'} = {
                           'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 0
+                            'section_level' => 0
                           }
                         }
                       },
@@ -766,7 +766,7 @@ $result_nodes{'double_part'} = {
           },
           'type' => 'unit'
         },
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -842,7 +842,7 @@ $result_menus{'double_part'} = {
           'extra' => {},
           'structure' => {
             'associated_unit' => {},
-            'level' => 0
+            'section_level' => 0
           }
         }
       },
@@ -859,14 +859,14 @@ $result_menus{'double_part'} = {
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 0
+                      'section_level' => 0
                     }
                   }
                 },
                 'structure' => {
                   'associated_unit' => {},
-                  'level' => 1,
-                  'number' => 1
+                  'section_level' => 1,
+                  'section_number' => 1
                 }
               }
             },
@@ -880,7 +880,7 @@ $result_menus{'double_part'} = {
                       'extra' => {},
                       'structure' => {
                         'associated_unit' => {},
-                        'level' => 0
+                        'section_level' => 0
                       }
                     }
                   },
@@ -1006,7 +1006,7 @@ $result_elements{'double_part'} = [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 0
+          'section_level' => 0
         }
       }
     },
@@ -1023,14 +1023,14 @@ $result_elements{'double_part'} = [
                   'extra' => {},
                   'structure' => {
                     'associated_unit' => {},
-                    'level' => 0
+                    'section_level' => 0
                   }
                 }
               },
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1,
-                'number' => 1
+                'section_level' => 1,
+                'section_number' => 1
               }
             }
           },
@@ -1044,7 +1044,7 @@ $result_elements{'double_part'} = [
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 0
+                      'section_level' => 0
                     }
                   }
                 },
diff --git a/tp/t/results/sectioning/double_top_section.pl 
b/tp/t/results/sectioning/double_top_section.pl
index 121e47c038..411c581f68 100644
--- a/tp/t/results/sectioning/double_top_section.pl
+++ b/tp/t/results/sectioning/double_top_section.pl
@@ -153,13 +153,12 @@ Second top.
 
 $result_sectioning{'double_top_section'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
         'extra' => {},
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       },
@@ -167,14 +166,15 @@ $result_sectioning{'double_top_section'} = {
         'cmdname' => 'top',
         'extra' => {},
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_prev' => {},
           'section_up' => {},
           'toplevel_prev' => {},
           'toplevel_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'double_top_section'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'double_top_section'};
diff --git a/tp/t/results/sectioning/empty_top_node_up.pl 
b/tp/t/results/sectioning/empty_top_node_up.pl
index a65bc56bb1..3e3d0233ff 100644
--- a/tp/t/results/sectioning/empty_top_node_up.pl
+++ b/tp/t/results/sectioning/empty_top_node_up.pl
@@ -303,7 +303,6 @@ $result_texts{'empty_top_node_up'} = 'empty top node up
 
 $result_sectioning{'empty_top_node_up'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -317,11 +316,12 @@ $result_sectioning{'empty_top_node_up'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'empty_top_node_up'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'empty_top_node_up'};
@@ -333,7 +333,7 @@ $result_nodes{'empty_top_node_up'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
diff --git a/tp/t/results/sectioning/external_node_in_menu.pl 
b/tp/t/results/sectioning/external_node_in_menu.pl
index 1580de6cc9..6cb4c985cd 100644
--- a/tp/t/results/sectioning/external_node_in_menu.pl
+++ b/tp/t/results/sectioning/external_node_in_menu.pl
@@ -587,7 +587,6 @@ $result_texts{'external_node_in_menu'} = 'top
 
 $result_sectioning{'external_node_in_menu'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -601,7 +600,6 @@ $result_sectioning{'external_node_in_menu'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -615,8 +613,8 @@ $result_sectioning{'external_node_in_menu'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -634,8 +632,8 @@ $result_sectioning{'external_node_in_menu'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 2,
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -643,10 +641,12 @@ $result_sectioning{'external_node_in_menu'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'external_node_in_menu'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'external_node_in_menu'}{'structure'}{'section_childs'}[0];
@@ -665,7 +665,7 @@ $result_nodes{'external_node_in_menu'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -684,8 +684,8 @@ $result_nodes{'external_node_in_menu'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'nchapter1'
@@ -698,8 +698,8 @@ $result_nodes{'external_node_in_menu'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 2
+                'section_level' => 1,
+                'section_number' => 2
               }
             },
             'normalized' => 'nchapter2'
diff --git a/tp/t/results/sectioning/hole_in_sectioning.pl 
b/tp/t/results/sectioning/hole_in_sectioning.pl
index 03e03dbb91..968a35dfbf 100644
--- a/tp/t/results/sectioning/hole_in_sectioning.pl
+++ b/tp/t/results/sectioning/hole_in_sectioning.pl
@@ -239,34 +239,28 @@ $result_texts{'hole_in_sectioning'} = 'Top
 
 $result_sectioning{'hole_in_sectioning'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
         'extra' => {},
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsubsection',
                           'extra' => {},
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         },
@@ -274,27 +268,33 @@ $result_sectioning{'hole_in_sectioning'} = {
                           'cmdname' => 'subsection',
                           'extra' => {},
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.2',
+                            'section_level' => 3,
+                            'section_number' => '1.1.2',
                             'section_prev' => {},
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'hole_in_sectioning'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'hole_in_sectioning'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
diff --git a/tp/t/results/sectioning/internal_top_node_up.pl 
b/tp/t/results/sectioning/internal_top_node_up.pl
index 1f5cbd1cc0..2651af8dbd 100644
--- a/tp/t/results/sectioning/internal_top_node_up.pl
+++ b/tp/t/results/sectioning/internal_top_node_up.pl
@@ -329,7 +329,6 @@ $result_texts{'internal_top_node_up'} = 'internal top node 
up
 
 $result_sectioning{'internal_top_node_up'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -384,11 +383,12 @@ $result_sectioning{'internal_top_node_up'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'internal_top_node_up'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'internal_top_node_up'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'};
@@ -455,7 +455,7 @@ $result_nodes{'internal_top_node_up'} = {
           },
           'type' => 'unit'
         },
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
diff --git a/tp/t/results/sectioning/lone_Top_node.pl 
b/tp/t/results/sectioning/lone_Top_node.pl
index 04e885c831..8967b53444 100644
--- a/tp/t/results/sectioning/lone_Top_node.pl
+++ b/tp/t/results/sectioning/lone_Top_node.pl
@@ -363,7 +363,6 @@ $result_texts{'lone_Top_node'} = '
 
 $result_sectioning{'lone_Top_node'} = {
   'structure' => {
-    'level' => 0,
     'section_childs' => [
       {
         'cmdname' => 'chapter',
@@ -392,12 +391,13 @@ $result_sectioning{'lone_Top_node'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 1,
-          'number' => 1,
+          'section_level' => 1,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 0
   }
 };
 
$result_sectioning{'lone_Top_node'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = $result_sectioning{'lone_Top_node'}{'structure'}{'section_childs'}[0];
@@ -426,8 +426,8 @@ $result_nodes{'lone_Top_node'} = {
           'extra' => {},
           'structure' => {
             'associated_unit' => {},
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         }
       },
@@ -478,8 +478,8 @@ $result_menus{'lone_Top_node'} = {
           'extra' => {},
           'structure' => {
             'associated_unit' => {},
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         }
       },
@@ -538,8 +538,8 @@ $result_elements{'lone_Top_node'} = [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 1,
-          'number' => 1
+          'section_level' => 1,
+          'section_number' => 1
         }
       }
     },
diff --git a/tp/t/results/sectioning/loop_nodes.pl 
b/tp/t/results/sectioning/loop_nodes.pl
index b2018ea7fd..a3c943fd09 100644
--- a/tp/t/results/sectioning/loop_nodes.pl
+++ b/tp/t/results/sectioning/loop_nodes.pl
@@ -806,7 +806,6 @@ top
 
 $result_sectioning{'loop_nodes'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -820,11 +819,12 @@ $result_sectioning{'loop_nodes'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'loop_nodes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'loop_nodes'};
@@ -836,7 +836,7 @@ $result_nodes{'loop_nodes'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
diff --git a/tp/t/results/sectioning/lowered_subsubsection.pl 
b/tp/t/results/sectioning/lowered_subsubsection.pl
index 4d178d7cf3..884eb65112 100644
--- a/tp/t/results/sectioning/lowered_subsubsection.pl
+++ b/tp/t/results/sectioning/lowered_subsubsection.pl
@@ -1494,7 +1494,6 @@ $result_texts{'lowered_subsubsection'} = '
 
 $result_sectioning{'lowered_subsubsection'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1508,7 +1507,6 @@ $result_sectioning{'lowered_subsubsection'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1522,8 +1520,6 @@ $result_sectioning{'lowered_subsubsection'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -1537,8 +1533,6 @@ $result_sectioning{'lowered_subsubsection'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -1552,8 +1546,6 @@ $result_sectioning{'lowered_subsubsection'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
                             'section_childs' => [
                               {
                                 'cmdname' => 'subsubsection',
@@ -1567,8 +1559,8 @@ $result_sectioning{'lowered_subsubsection'} = {
                                   }
                                 },
                                 'structure' => {
-                                  'level' => 4,
-                                  'number' => '1.1.1.1',
+                                  'section_level' => 4,
+                                  'section_number' => '1.1.1.1',
                                   'section_up' => {}
                                 }
                               },
@@ -1585,8 +1577,8 @@ $result_sectioning{'lowered_subsubsection'} = {
                                   'sections_level' => -1
                                 },
                                 'structure' => {
-                                  'level' => 4,
-                                  'number' => '1.1.1.2',
+                                  'section_level' => 4,
+                                  'section_number' => '1.1.1.2',
                                   'section_prev' => {},
                                   'section_up' => {}
                                 }
@@ -1604,31 +1596,39 @@ $result_sectioning{'lowered_subsubsection'} = {
                                   'sections_level' => -1
                                 },
                                 'structure' => {
-                                  'level' => 4,
-                                  'number' => '1.1.1.3',
+                                  'section_level' => 4,
+                                  'section_number' => '1.1.1.3',
                                   'section_prev' => {},
                                   'section_up' => {}
                                 }
                               }
                             ],
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'lowered_subsubsection'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'lowered_subsubsection'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -1650,7 +1650,7 @@ $result_nodes{'lowered_subsubsection'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1669,8 +1669,8 @@ $result_nodes{'lowered_subsubsection'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
@@ -1689,8 +1689,8 @@ $result_nodes{'lowered_subsubsection'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'section_level' => 2,
+                'section_number' => '1.1'
               }
             },
             'menus' => [
@@ -1709,8 +1709,8 @@ $result_nodes{'lowered_subsubsection'} = {
                   'cmdname' => 'subsection',
                   'extra' => {},
                   'structure' => {
-                    'level' => 3,
-                    'number' => '1.1.1'
+                    'section_level' => 3,
+                    'section_number' => '1.1.1'
                   }
                 },
                 'menus' => [
@@ -1729,8 +1729,8 @@ $result_nodes{'lowered_subsubsection'} = {
                       'cmdname' => 'subsubsection',
                       'extra' => {},
                       'structure' => {
-                        'level' => 4,
-                        'number' => '1.1.1.1'
+                        'section_level' => 4,
+                        'section_number' => '1.1.1.1'
                       }
                     },
                     'normalized' => 'Subsubsection'
@@ -1745,8 +1745,8 @@ $result_nodes{'lowered_subsubsection'} = {
                             'sections_level' => -1
                           },
                           'structure' => {
-                            'level' => 4,
-                            'number' => '1.1.1.2'
+                            'section_level' => 4,
+                            'section_number' => '1.1.1.2'
                           }
                         },
                         'menus' => [
@@ -1767,8 +1767,8 @@ $result_nodes{'lowered_subsubsection'} = {
                                 'sections_level' => -1
                               },
                               'structure' => {
-                                'level' => 4,
-                                'number' => '1.1.1.3'
+                                'section_level' => 4,
+                                'section_number' => '1.1.1.3'
                               }
                             },
                             'normalized' => 'Lowered-subsubsection'
diff --git a/tp/t/results/sectioning/loweredheading.pl 
b/tp/t/results/sectioning/loweredheading.pl
index d564791f5f..e08f2094c3 100644
--- a/tp/t/results/sectioning/loweredheading.pl
+++ b/tp/t/results/sectioning/loweredheading.pl
@@ -127,7 +127,6 @@ Bar
 
 $result_sectioning{'loweredheading'} = {
   'structure' => {
-    'level' => 2,
     'section_childs' => [
       {
         'cmdname' => 'section',
@@ -135,12 +134,13 @@ $result_sectioning{'loweredheading'} = {
           'sections_level' => -1
         },
         'structure' => {
-          'level' => 3,
-          'number' => 1,
+          'section_level' => 3,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 2
   }
 };
 
$result_sectioning{'loweredheading'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'loweredheading'};
diff --git a/tp/t/results/sectioning/menutextorder.pl 
b/tp/t/results/sectioning/menutextorder.pl
index 03a5c8dce3..11159f6225 100644
--- a/tp/t/results/sectioning/menutextorder.pl
+++ b/tp/t/results/sectioning/menutextorder.pl
@@ -1295,7 +1295,6 @@ $result_texts{'menutextorder'} = '* foo::
 
 $result_sectioning{'menutextorder'} = {
   'structure' => {
-    'level' => 0,
     'section_childs' => [
       {
         'cmdname' => 'chapter',
@@ -1309,8 +1308,6 @@ $result_sectioning{'menutextorder'} = {
           }
         },
         'structure' => {
-          'level' => 1,
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -1324,8 +1321,8 @@ $result_sectioning{'menutextorder'} = {
                 }
               },
               'structure' => {
-                'level' => 2,
-                'number' => '1.1',
+                'section_level' => 2,
+                'section_number' => '1.1',
                 'section_up' => {}
               }
             },
@@ -1341,13 +1338,15 @@ $result_sectioning{'menutextorder'} = {
                 }
               },
               'structure' => {
-                'level' => 2,
-                'number' => '1.2',
+                'section_level' => 2,
+                'section_number' => '1.2',
                 'section_prev' => {},
                 'section_up' => {}
               }
             }
           ],
+          'section_level' => 1,
+          'section_number' => 1,
           'section_up' => {}
         }
       },
@@ -1363,8 +1362,6 @@ $result_sectioning{'menutextorder'} = {
           }
         },
         'structure' => {
-          'level' => 1,
-          'number' => 2,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -1378,8 +1375,8 @@ $result_sectioning{'menutextorder'} = {
                 }
               },
               'structure' => {
-                'level' => 2,
-                'number' => '2.1',
+                'section_level' => 2,
+                'section_number' => '2.1',
                 'section_up' => {}
               }
             },
@@ -1395,8 +1392,8 @@ $result_sectioning{'menutextorder'} = {
                 }
               },
               'structure' => {
-                'level' => 2,
-                'number' => '2.2',
+                'section_level' => 2,
+                'section_number' => '2.2',
                 'section_prev' => {},
                 'section_up' => {}
               }
@@ -1413,19 +1410,22 @@ $result_sectioning{'menutextorder'} = {
                 }
               },
               'structure' => {
-                'level' => 2,
-                'number' => '2.3',
+                'section_level' => 2,
+                'section_number' => '2.3',
                 'section_prev' => {},
                 'section_up' => {}
               }
             }
           ],
+          'section_level' => 1,
+          'section_number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'toplevel_prev' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 0
   }
 };
 
$result_sectioning{'menutextorder'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'menutextorder'}{'structure'}{'section_childs'}[0];
@@ -1448,8 +1448,8 @@ $result_nodes{'menutextorder'} = {
       'cmdname' => 'chapter',
       'extra' => {},
       'structure' => {
-        'level' => 1,
-        'number' => 1
+        'section_level' => 1,
+        'section_number' => 1
       }
     },
     'menus' => [
@@ -1468,8 +1468,8 @@ $result_nodes{'menutextorder'} = {
           'cmdname' => 'section',
           'extra' => {},
           'structure' => {
-            'level' => 2,
-            'number' => '1.2'
+            'section_level' => 2,
+            'section_number' => '1.2'
           }
         },
         'normalized' => 'onesub2'
@@ -1482,8 +1482,8 @@ $result_nodes{'menutextorder'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'section_level' => 2,
+                'section_number' => '1.1'
               }
             },
             'normalized' => 'onesub1'
@@ -1503,8 +1503,8 @@ $result_nodes{'menutextorder'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 2
+            'section_level' => 1,
+            'section_number' => 2
           }
         },
         'menus' => [
@@ -1523,8 +1523,8 @@ $result_nodes{'menutextorder'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => '2.1'
+                'section_level' => 2,
+                'section_number' => '2.1'
               }
             },
             'normalized' => 'sub1'
@@ -1537,8 +1537,8 @@ $result_nodes{'menutextorder'} = {
                   'cmdname' => 'section',
                   'extra' => {},
                   'structure' => {
-                    'level' => 2,
-                    'number' => '2.2'
+                    'section_level' => 2,
+                    'section_number' => '2.2'
                   }
                 },
                 'normalized' => 'sub2'
@@ -1551,8 +1551,8 @@ $result_nodes{'menutextorder'} = {
                       'cmdname' => 'section',
                       'extra' => {},
                       'structure' => {
-                        'level' => 2,
-                        'number' => '2.3'
+                        'section_level' => 2,
+                        'section_number' => '2.3'
                       }
                     },
                     'normalized' => 'sub3'
diff --git a/tp/t/results/sectioning/more_sections_than_nodes.pl 
b/tp/t/results/sectioning/more_sections_than_nodes.pl
index 3042f617ee..b58b2d3525 100644
--- a/tp/t/results/sectioning/more_sections_than_nodes.pl
+++ b/tp/t/results/sectioning/more_sections_than_nodes.pl
@@ -1361,7 +1361,6 @@ Appendix A appendix
 
 $result_sectioning{'more_sections_than_nodes'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1375,14 +1374,13 @@ $result_sectioning{'more_sections_than_nodes'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -1400,19 +1398,19 @@ $result_sectioning{'more_sections_than_nodes'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 2,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '2.1',
+                      'section_level' => 2,
+                      'section_number' => '2.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1431,15 +1429,13 @@ $result_sectioning{'more_sections_than_nodes'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 3,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '3.1',
+                      'section_level' => 2,
+                      'section_number' => '3.1',
                       'section_up' => {}
                     }
                   },
@@ -1455,8 +1451,8 @@ $result_sectioning{'more_sections_than_nodes'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '3.2',
+                      'section_level' => 2,
+                      'section_number' => '3.2',
                       'section_prev' => {},
                       'section_up' => {}
                     }
@@ -1465,13 +1461,15 @@ $result_sectioning{'more_sections_than_nodes'} = {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '3.3',
+                      'section_level' => 2,
+                      'section_number' => '3.3',
                       'section_prev' => {},
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 3,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1482,22 +1480,18 @@ $result_sectioning{'more_sections_than_nodes'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 4,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '4.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
                           'extra' => {},
                           'structure' => {
-                            'level' => 3,
-                            'number' => '4.1.1',
+                            'section_level' => 3,
+                            'section_number' => '4.1.1',
                             'section_up' => {}
                           }
                         },
@@ -1513,17 +1507,21 @@ $result_sectioning{'more_sections_than_nodes'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '4.1.2',
+                            'section_level' => 3,
+                            'section_number' => '4.1.2',
                             'section_prev' => {},
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '4.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 4,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1534,8 +1532,8 @@ $result_sectioning{'more_sections_than_nodes'} = {
               'cmdname' => 'appendix',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 'A',
+                'section_level' => 1,
+                'section_number' => 'A',
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1543,10 +1541,12 @@ $result_sectioning{'more_sections_than_nodes'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'more_sections_than_nodes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'more_sections_than_nodes'}{'structure'}{'section_childs'}[0];
@@ -1587,7 +1587,7 @@ $result_nodes{'more_sections_than_nodes'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1606,8 +1606,8 @@ $result_nodes{'more_sections_than_nodes'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 2
+            'section_level' => 1,
+            'section_number' => 2
           }
         },
         'normalized' => 'n-c2'
@@ -1620,8 +1620,8 @@ $result_nodes{'more_sections_than_nodes'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 3
+                'section_level' => 1,
+                'section_number' => 3
               }
             },
             'menus' => [
@@ -1640,8 +1640,8 @@ $result_nodes{'more_sections_than_nodes'} = {
                   'cmdname' => 'section',
                   'extra' => {},
                   'structure' => {
-                    'level' => 2,
-                    'number' => '3.2'
+                    'section_level' => 2,
+                    'section_number' => '3.2'
                   }
                 },
                 'normalized' => 'n-c3-s-2'
@@ -1657,8 +1657,8 @@ $result_nodes{'more_sections_than_nodes'} = {
                   'cmdname' => 'subsection',
                   'extra' => {},
                   'structure' => {
-                    'level' => 3,
-                    'number' => '4.1.2'
+                    'section_level' => 3,
+                    'section_number' => '4.1.2'
                   }
                 },
                 'normalized' => 'n-c3-s1-s2'
diff --git a/tp/t/results/sectioning/next_in_menu_is_below.pl 
b/tp/t/results/sectioning/next_in_menu_is_below.pl
index 509b082302..63a4302335 100644
--- a/tp/t/results/sectioning/next_in_menu_is_below.pl
+++ b/tp/t/results/sectioning/next_in_menu_is_below.pl
@@ -871,7 +871,6 @@ $result_texts{'next_in_menu_is_below'} = 'top
 
 $result_sectioning{'next_in_menu_is_below'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -885,7 +884,6 @@ $result_sectioning{'next_in_menu_is_below'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -899,8 +897,6 @@ $result_sectioning{'next_in_menu_is_below'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -914,8 +910,6 @@ $result_sectioning{'next_in_menu_is_below'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -929,26 +923,32 @@ $result_sectioning{'next_in_menu_is_below'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'next_in_menu_is_below'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'next_in_menu_is_below'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -965,7 +965,7 @@ $result_nodes{'next_in_menu_is_below'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -984,8 +984,8 @@ $result_nodes{'next_in_menu_is_below'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
@@ -1004,8 +1004,8 @@ $result_nodes{'next_in_menu_is_below'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'section_level' => 2,
+                'section_number' => '1.1'
               }
             },
             'menus' => [
@@ -1024,8 +1024,8 @@ $result_nodes{'next_in_menu_is_below'} = {
                   'cmdname' => 'subsection',
                   'extra' => {},
                   'structure' => {
-                    'level' => 3,
-                    'number' => '1.1.1'
+                    'section_level' => 3,
+                    'section_number' => '1.1.1'
                   }
                 },
                 'normalized' => 'subsection'
diff --git a/tp/t/results/sectioning/no_argument_and_contents.pl 
b/tp/t/results/sectioning/no_argument_and_contents.pl
index 8e47a176d3..0672e48689 100644
--- a/tp/t/results/sectioning/no_argument_and_contents.pl
+++ b/tp/t/results/sectioning/no_argument_and_contents.pl
@@ -158,30 +158,30 @@ for example
 
 $result_sectioning{'no_argument_and_contents'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
         'extra' => {},
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'no_argument_and_contents'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'no_argument_and_contents'}{'structure'}{'section_childs'}[0];
diff --git a/tp/t/results/sectioning/no_menu.pl 
b/tp/t/results/sectioning/no_menu.pl
index ea5b60e1b8..f61de157e3 100644
--- a/tp/t/results/sectioning/no_menu.pl
+++ b/tp/t/results/sectioning/no_menu.pl
@@ -372,7 +372,6 @@ $result_texts{'no_menu'} = '
 
 $result_sectioning{'no_menu'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -386,7 +385,6 @@ $result_sectioning{'no_menu'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -400,8 +398,8 @@ $result_sectioning{'no_menu'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -419,8 +417,8 @@ $result_sectioning{'no_menu'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 2,
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -439,8 +437,8 @@ $result_sectioning{'no_menu'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 3,
+                'section_level' => 1,
+                'section_number' => 3,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -448,10 +446,12 @@ $result_sectioning{'no_menu'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'no_menu'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'no_menu'}{'structure'}{'section_childs'}[0];
@@ -474,7 +474,7 @@ $result_nodes{'no_menu'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -487,8 +487,8 @@ $result_nodes{'no_menu'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'c1'
@@ -501,8 +501,8 @@ $result_nodes{'no_menu'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 2
+                'section_level' => 1,
+                'section_number' => 2
               }
             },
             'normalized' => 'c2'
@@ -515,8 +515,8 @@ $result_nodes{'no_menu'} = {
                   'cmdname' => 'chapter',
                   'extra' => {},
                   'structure' => {
-                    'level' => 1,
-                    'number' => 3
+                    'section_level' => 1,
+                    'section_number' => 3
                   }
                 },
                 'normalized' => 'c3'
diff --git a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl 
b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
index b5e2bb9767..f211751ceb 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
@@ -629,7 +629,6 @@ part
 
 $result_sectioning{'node_part_chapter_after_chapter'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -663,8 +662,8 @@ $result_sectioning{'node_part_chapter_after_chapter'} = {
                           },
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1,
-                            'number' => 1,
+                            'section_level' => 1,
+                            'section_number' => 1,
                             'section_up' => {},
                             'toplevel_prev' => {},
                             'toplevel_up' => {}
@@ -696,10 +695,10 @@ $result_sectioning{'node_part_chapter_after_chapter'} = {
                                     },
                                     'structure' => {
                                       'associated_unit' => {},
-                                      'level' => 0,
                                       'section_childs' => [
                                         {}
                                       ],
+                                      'section_level' => 0,
                                       'section_prev' => {},
                                       'section_up' => {}
                                     }
@@ -707,8 +706,8 @@ $result_sectioning{'node_part_chapter_after_chapter'} = {
                                 },
                                 'structure' => {
                                   'associated_unit' => {},
-                                  'level' => 1,
-                                  'number' => 2,
+                                  'section_level' => 1,
+                                  'section_number' => 2,
                                   'section_up' => {},
                                   'toplevel_prev' => {},
                                   'toplevel_up' => {}
@@ -757,15 +756,16 @@ $result_sectioning{'node_part_chapter_after_chapter'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0,
           'section_childs' => [
             {}
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       },
       {}
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'node_part_chapter_after_chapter'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'node_part_chapter_after_chapter'}{'structure'}{'section_childs'}[0];
@@ -834,8 +834,8 @@ $result_nodes{'node_part_chapter_after_chapter'} = {
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1,
-                      'number' => 1
+                      'section_level' => 1,
+                      'section_number' => 1
                     }
                   }
                 },
@@ -853,14 +853,14 @@ $result_nodes{'node_part_chapter_after_chapter'} = {
                               'extra' => {},
                               'structure' => {
                                 'associated_unit' => {},
-                                'level' => 0
+                                'section_level' => 0
                               }
                             }
                           },
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1,
-                            'number' => 2
+                            'section_level' => 1,
+                            'section_number' => 2
                           }
                         }
                       },
@@ -901,7 +901,7 @@ $result_nodes{'node_part_chapter_after_chapter'} = {
           },
           'type' => 'unit'
         },
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -994,7 +994,7 @@ $result_menus{'node_part_chapter_after_chapter'} = {
           'extra' => {},
           'structure' => {
             'associated_unit' => {},
-            'level' => 0
+            'section_level' => 0
           }
         }
       },
@@ -1007,8 +1007,8 @@ $result_menus{'node_part_chapter_after_chapter'} = {
                 'extra' => {},
                 'structure' => {
                   'associated_unit' => {},
-                  'level' => 1,
-                  'number' => 1
+                  'section_level' => 1,
+                  'section_number' => 1
                 }
               }
             },
@@ -1026,14 +1026,14 @@ $result_menus{'node_part_chapter_after_chapter'} = {
                           'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 0
+                            'section_level' => 0
                           }
                         }
                       },
                       'structure' => {
                         'associated_unit' => {},
-                        'level' => 1,
-                        'number' => 2
+                        'section_level' => 1,
+                        'section_number' => 2
                       }
                     }
                   },
@@ -1162,7 +1162,7 @@ $result_elements{'node_part_chapter_after_chapter'} = [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 0
+          'section_level' => 0
         }
       }
     },
@@ -1175,8 +1175,8 @@ $result_elements{'node_part_chapter_after_chapter'} = [
               'extra' => {},
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1,
-                'number' => 1
+                'section_level' => 1,
+                'section_number' => 1
               }
             }
           },
@@ -1194,14 +1194,14 @@ $result_elements{'node_part_chapter_after_chapter'} = [
                         'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
-                          'level' => 0
+                          'section_level' => 0
                         }
                       }
                     },
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1,
-                      'number' => 2
+                      'section_level' => 1,
+                      'section_number' => 2
                     }
                   }
                 },
diff --git a/tp/t/results/sectioning/node_part_chapter_after_top.pl 
b/tp/t/results/sectioning/node_part_chapter_after_top.pl
index 1476833074..a0211fef1d 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_top.pl
@@ -415,7 +415,6 @@ part
 
 $result_sectioning{'node_part_chapter_after_top'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -453,10 +452,10 @@ $result_sectioning{'node_part_chapter_after_top'} = {
                               },
                               'structure' => {
                                 'associated_unit' => {},
-                                'level' => 0,
                                 'section_childs' => [
                                   {}
                                 ],
+                                'section_level' => 0,
                                 'section_prev' => {},
                                 'section_up' => {}
                               }
@@ -464,8 +463,8 @@ $result_sectioning{'node_part_chapter_after_top'} = {
                           },
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1,
-                            'number' => 1,
+                            'section_level' => 1,
+                            'section_number' => 1,
                             'section_up' => {},
                             'toplevel_prev' => {},
                             'toplevel_up' => {}
@@ -500,12 +499,13 @@ $result_sectioning{'node_part_chapter_after_top'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       },
       {}
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'node_part_chapter_after_top'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'node_part_chapter_after_top'}{'structure'}{'section_childs'}[0];
@@ -559,14 +559,14 @@ $result_nodes{'node_part_chapter_after_top'} = {
                         'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
-                          'level' => 0
+                          'section_level' => 0
                         }
                       }
                     },
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1,
-                      'number' => 1
+                      'section_level' => 1,
+                      'section_number' => 1
                     }
                   }
                 },
@@ -593,7 +593,7 @@ $result_nodes{'node_part_chapter_after_top'} = {
           },
           'type' => 'unit'
         },
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -657,7 +657,7 @@ $result_menus{'node_part_chapter_after_top'} = {
           'extra' => {},
           'structure' => {
             'associated_unit' => {},
-            'level' => 0
+            'section_level' => 0
           }
         }
       },
@@ -673,14 +673,14 @@ $result_menus{'node_part_chapter_after_top'} = {
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 0
+                      'section_level' => 0
                     }
                   }
                 },
                 'structure' => {
                   'associated_unit' => {},
-                  'level' => 1,
-                  'number' => 1
+                  'section_level' => 1,
+                  'section_number' => 1
                 }
               }
             },
@@ -765,7 +765,7 @@ $result_elements{'node_part_chapter_after_top'} = [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 0
+          'section_level' => 0
         }
       }
     },
@@ -781,14 +781,14 @@ $result_elements{'node_part_chapter_after_top'} = [
                   'extra' => {},
                   'structure' => {
                     'associated_unit' => {},
-                    'level' => 0
+                    'section_level' => 0
                   }
                 }
               },
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1,
-                'number' => 1
+                'section_level' => 1,
+                'section_number' => 1
               }
             }
           },
diff --git a/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl 
b/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl
index ae7add8daa..1b66820d2f 100644
--- a/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl
+++ b/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl
@@ -194,7 +194,6 @@ top section
 
 $result_sectioning{'node_sectop_before_chapter_no_node'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -207,24 +206,25 @@ $result_sectioning{'node_sectop_before_chapter_no_node'} 
= {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'node_sectop_before_chapter_no_node'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'node_sectop_before_chapter_no_node'}{'structure'}{'section_childs'}[0];
@@ -239,7 +239,7 @@ $result_nodes{'node_sectop_before_chapter_no_node'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl 
b/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
index a63b9bbb6b..21eb365873 100644
--- a/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
+++ b/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
@@ -371,7 +371,6 @@ in chap
 
 $result_sectioning{'node_sectop_before_lone_node_Top'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -385,7 +384,6 @@ $result_sectioning{'node_sectop_before_lone_node_Top'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -399,18 +397,20 @@ $result_sectioning{'node_sectop_before_lone_node_Top'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'node_sectop_before_lone_node_Top'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'node_sectop_before_lone_node_Top'}{'structure'}{'section_childs'}[0];
@@ -431,7 +431,7 @@ $result_nodes{'node_sectop_before_lone_node_Top'} = {
           'cmdname' => 'top',
           'extra' => {},
           'structure' => {
-            'level' => 0
+            'section_level' => 0
           }
         },
         'normalized' => 'node-before'
@@ -444,8 +444,8 @@ $result_nodes{'node_sectop_before_lone_node_Top'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 1
+                'section_level' => 1,
+                'section_number' => 1
               }
             },
             'normalized' => 'chap'
diff --git a/tp/t/results/sectioning/nodename_parentheses.pl 
b/tp/t/results/sectioning/nodename_parentheses.pl
index a521929883..d5736148a9 100644
--- a/tp/t/results/sectioning/nodename_parentheses.pl
+++ b/tp/t/results/sectioning/nodename_parentheses.pl
@@ -973,7 +973,6 @@ Dummy section with (manual)node node syntax.
 
 $result_sectioning{'nodename_parentheses'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -987,7 +986,6 @@ $result_sectioning{'nodename_parentheses'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1001,8 +999,8 @@ $result_sectioning{'nodename_parentheses'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -1020,8 +1018,8 @@ $result_sectioning{'nodename_parentheses'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 2,
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1040,8 +1038,8 @@ $result_sectioning{'nodename_parentheses'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 3,
+                'section_level' => 1,
+                'section_number' => 3,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1049,10 +1047,12 @@ $result_sectioning{'nodename_parentheses'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'nodename_parentheses'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'nodename_parentheses'}{'structure'}{'section_childs'}[0];
@@ -1075,7 +1075,7 @@ $result_nodes{'nodename_parentheses'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1094,8 +1094,8 @@ $result_nodes{'nodename_parentheses'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'Node-_0028with-parentheses_0029'
@@ -1108,8 +1108,8 @@ $result_nodes{'nodename_parentheses'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 2
+                'section_level' => 1,
+                'section_number' => 2
               }
             },
             'normalized' => 'Other-node'
@@ -1122,8 +1122,8 @@ $result_nodes{'nodename_parentheses'} = {
                   'cmdname' => 'chapter',
                   'extra' => {},
                   'structure' => {
-                    'level' => 1,
-                    'number' => 3
+                    'section_level' => 1,
+                    'section_number' => 3
                   }
                 },
                 'normalized' => 'node'
diff --git a/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
index fa1e236c82..0c47c64611 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
@@ -601,7 +601,6 @@ second node
 
 $result_sectioning{'nodes_after_top_before_chapter_nodes'} = {
   'structure' => {
-    'level' => 0,
     'section_childs' => [
       {
         'cmdname' => 'chapter',
@@ -682,12 +681,13 @@ 
$result_sectioning{'nodes_after_top_before_chapter_nodes'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 1,
-          'number' => 1,
+          'section_level' => 1,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 0
   }
 };
 
$result_sectioning{'nodes_after_top_before_chapter_nodes'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'nodes_after_top_before_chapter_nodes'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'};
@@ -765,8 +765,8 @@ $result_nodes{'nodes_after_top_before_chapter_nodes'} = {
                             },
                             'type' => 'unit'
                           },
-                          'level' => 1,
-                          'number' => 1
+                          'section_level' => 1,
+                          'section_number' => 1
                         }
                       },
                       'normalized' => 'third-node'
diff --git 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl
index d1a16cc5a1..69342c4197 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl
@@ -564,7 +564,6 @@ second node
 
 $result_sectioning{'nodes_after_top_before_chapter_not_split'} = {
   'structure' => {
-    'level' => 0,
     'section_childs' => [
       {
         'cmdname' => 'chapter',
@@ -578,12 +577,13 @@ 
$result_sectioning{'nodes_after_top_before_chapter_not_split'} = {
           }
         },
         'structure' => {
-          'level' => 1,
-          'number' => 1,
+          'section_level' => 1,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 0
   }
 };
 
$result_sectioning{'nodes_after_top_before_chapter_not_split'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'nodes_after_top_before_chapter_not_split'};
@@ -613,8 +613,8 @@ $result_nodes{'nodes_after_top_before_chapter_not_split'} = 
{
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 1
+                'section_level' => 1,
+                'section_number' => 1
               }
             },
             'normalized' => 'third-node'
diff --git 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split_no_use_node_directions.pl
 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split_no_use_node_directions.pl
index f6094e3689..b92cdd14bb 100644
--- 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split_no_use_node_directions.pl
+++ 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split_no_use_node_directions.pl
@@ -564,7 +564,6 @@ second node
 
 
$result_sectioning{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
 = {
   'structure' => {
-    'level' => 0,
     'section_childs' => [
       {
         'cmdname' => 'chapter',
@@ -578,12 +577,13 @@ 
$result_sectioning{'nodes_after_top_before_chapter_not_split_no_use_node_directi
           }
         },
         'structure' => {
-          'level' => 1,
-          'number' => 1,
+          'section_level' => 1,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 0
   }
 };
 
$result_sectioning{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'nodes_after_top_before_chapter_not_split_no_use_node_directions'};
@@ -613,8 +613,8 @@ 
$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 1
+                'section_level' => 1,
+                'section_number' => 1
               }
             },
             'normalized' => 'third-node'
diff --git a/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
index c4b5cd8b7a..32dd037eaf 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
@@ -583,7 +583,6 @@ second node
 
 $result_sectioning{'nodes_after_top_before_chapter_sections'} = {
   'structure' => {
-    'level' => 0,
     'section_childs' => [
       {
         'cmdname' => 'chapter',
@@ -612,12 +611,13 @@ 
$result_sectioning{'nodes_after_top_before_chapter_sections'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 1,
-          'number' => 1,
+          'section_level' => 1,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 0
   }
 };
 
$result_sectioning{'nodes_after_top_before_chapter_sections'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'nodes_after_top_before_chapter_sections'}{'structure'}{'section_childs'}[0];
@@ -646,8 +646,8 @@ $result_nodes{'nodes_after_top_before_chapter_sections'} = {
           'extra' => {},
           'structure' => {
             'associated_unit' => {},
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         }
       },
@@ -712,8 +712,8 @@ $result_menus{'nodes_after_top_before_chapter_sections'} = {
           'extra' => {},
           'structure' => {
             'associated_unit' => {},
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         }
       },
@@ -779,8 +779,8 @@ $result_elements{'nodes_after_top_before_chapter_sections'} 
= [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 1,
-          'number' => 1
+          'section_level' => 1,
+          'section_number' => 1
         }
       }
     },
diff --git a/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl 
b/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
index 135ff305d3..4361c47c62 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
@@ -601,7 +601,6 @@ second node
 
 $result_sectioning{'nodes_after_top_before_section_nodes'} = {
   'structure' => {
-    'level' => 2,
     'section_childs' => [
       {
         'cmdname' => 'subsection',
@@ -683,12 +682,13 @@ 
$result_sectioning{'nodes_after_top_before_section_nodes'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 3,
-          'number' => 1,
+          'section_level' => 3,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 2
   }
 };
 
$result_sectioning{'nodes_after_top_before_section_nodes'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'nodes_after_top_before_section_nodes'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'};
@@ -767,8 +767,8 @@ $result_nodes{'nodes_after_top_before_section_nodes'} = {
                             },
                             'type' => 'unit'
                           },
-                          'level' => 3,
-                          'number' => 1
+                          'section_level' => 3,
+                          'section_number' => 1
                         }
                       },
                       'normalized' => 'third-node'
diff --git a/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl 
b/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl
index bf725d13ab..2f617c740a 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl
@@ -583,7 +583,6 @@ second node
 
 $result_sectioning{'nodes_after_top_before_section_sections'} = {
   'structure' => {
-    'level' => 2,
     'section_childs' => [
       {
         'cmdname' => 'subsection',
@@ -613,12 +612,13 @@ 
$result_sectioning{'nodes_after_top_before_section_sections'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 3,
-          'number' => 1,
+          'section_level' => 3,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 2
   }
 };
 
$result_sectioning{'nodes_after_top_before_section_sections'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'nodes_after_top_before_section_sections'}{'structure'}{'section_childs'}[0];
@@ -647,8 +647,8 @@ $result_nodes{'nodes_after_top_before_section_sections'} = {
           'extra' => {},
           'structure' => {
             'associated_unit' => {},
-            'level' => 3,
-            'number' => 1
+            'section_level' => 3,
+            'section_number' => 1
           }
         }
       },
@@ -714,8 +714,8 @@ $result_menus{'nodes_after_top_before_section_sections'} = {
           'extra' => {},
           'structure' => {
             'associated_unit' => {},
-            'level' => 3,
-            'number' => 1
+            'section_level' => 3,
+            'section_number' => 1
           }
         }
       },
@@ -782,8 +782,8 @@ $result_elements{'nodes_after_top_before_section_sections'} 
= [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 3,
-          'number' => 1
+          'section_level' => 3,
+          'section_number' => 1
         }
       }
     },
diff --git a/tp/t/results/sectioning/nodes_before_after_top.pl 
b/tp/t/results/sectioning/nodes_before_after_top.pl
index 218b198f98..3994647786 100644
--- a/tp/t/results/sectioning/nodes_before_after_top.pl
+++ b/tp/t/results/sectioning/nodes_before_after_top.pl
@@ -452,7 +452,6 @@ in chap
 
 $result_sectioning{'nodes_before_after_top'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -466,7 +465,6 @@ $result_sectioning{'nodes_before_after_top'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -480,18 +478,20 @@ $result_sectioning{'nodes_before_after_top'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'nodes_before_after_top'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'nodes_before_after_top'}{'structure'}{'section_childs'}[0];
@@ -506,7 +506,7 @@ $result_nodes{'nodes_before_after_top'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -519,8 +519,8 @@ $result_nodes{'nodes_before_after_top'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chap'
diff --git a/tp/t/results/sectioning/nodes_before_after_top_xref.pl 
b/tp/t/results/sectioning/nodes_before_after_top_xref.pl
index 9f638e8c6b..570745379e 100644
--- a/tp/t/results/sectioning/nodes_before_after_top_xref.pl
+++ b/tp/t/results/sectioning/nodes_before_after_top_xref.pl
@@ -739,7 +739,6 @@ after.
 
 $result_sectioning{'nodes_before_after_top_xref'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -753,7 +752,6 @@ $result_sectioning{'nodes_before_after_top_xref'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -767,18 +765,20 @@ $result_sectioning{'nodes_before_after_top_xref'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'nodes_before_after_top_xref'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'nodes_before_after_top_xref'}{'structure'}{'section_childs'}[0];
@@ -793,7 +793,7 @@ $result_nodes{'nodes_before_after_top_xref'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -806,8 +806,8 @@ $result_nodes{'nodes_before_after_top_xref'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chap'
diff --git a/tp/t/results/sectioning/nodes_before_top.pl 
b/tp/t/results/sectioning/nodes_before_top.pl
index bfe0efb259..f77e2646a1 100644
--- a/tp/t/results/sectioning/nodes_before_top.pl
+++ b/tp/t/results/sectioning/nodes_before_top.pl
@@ -754,7 +754,6 @@ top section
 
 $result_sectioning{'nodes_before_top'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -768,7 +767,6 @@ $result_sectioning{'nodes_before_top'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -782,18 +780,20 @@ $result_sectioning{'nodes_before_top'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'nodes_before_top'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'nodes_before_top'}{'structure'}{'section_childs'}[0];
@@ -808,7 +808,7 @@ $result_nodes{'nodes_before_top'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -827,8 +827,8 @@ $result_nodes{'nodes_before_top'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'second-node'
diff --git a/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl 
b/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
index 8ebd0c996c..9dc1349ded 100644
--- a/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
+++ b/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
@@ -657,7 +657,6 @@ $result_texts{'non_automatic_internal_top_node_up'} = 
'internal top node up
 
 $result_sectioning{'non_automatic_internal_top_node_up'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -711,11 +710,12 @@ $result_sectioning{'non_automatic_internal_top_node_up'} 
= {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'non_automatic_internal_top_node_up'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'non_automatic_internal_top_node_up'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'};
@@ -779,7 +779,7 @@ $result_nodes{'non_automatic_internal_top_node_up'} = {
           },
           'type' => 'unit'
         },
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
diff --git a/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl 
b/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
index 812f4d21ae..5324d414f6 100644
--- a/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
+++ b/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
@@ -657,7 +657,6 @@ $result_texts{'non_automatic_top_node_up_and_url'} = 
'internal top node up
 
 $result_sectioning{'non_automatic_top_node_up_and_url'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -711,11 +710,12 @@ $result_sectioning{'non_automatic_top_node_up_and_url'} = 
{
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'non_automatic_top_node_up_and_url'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'non_automatic_top_node_up_and_url'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'};
@@ -779,7 +779,7 @@ $result_nodes{'non_automatic_top_node_up_and_url'} = {
           },
           'type' => 'unit'
         },
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
diff --git a/tp/t/results/sectioning/non_automatic_top_node_up_url.pl 
b/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
index 3d8bf1acc0..f5d15cd2d2 100644
--- a/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
+++ b/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
@@ -472,7 +472,6 @@ $result_texts{'non_automatic_top_node_up_url'} = 'internal 
top node up
 
 $result_sectioning{'non_automatic_top_node_up_url'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -538,11 +537,12 @@ $result_sectioning{'non_automatic_top_node_up_url'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'non_automatic_top_node_up_url'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'non_automatic_top_node_up_url'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'};
@@ -642,7 +642,7 @@ $result_nodes{'non_automatic_top_node_up_url'} = {
           },
           'type' => 'unit'
         },
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
diff --git a/tp/t/results/sectioning/one_subsection.pl 
b/tp/t/results/sectioning/one_subsection.pl
index e1e2adccf9..5692cd8916 100644
--- a/tp/t/results/sectioning/one_subsection.pl
+++ b/tp/t/results/sectioning/one_subsection.pl
@@ -59,18 +59,18 @@ $result_texts{'one_subsection'} = '1 The subsection
 
 $result_sectioning{'one_subsection'} = {
   'structure' => {
-    'level' => 2,
     'section_childs' => [
       {
         'cmdname' => 'subsection',
         'extra' => {},
         'structure' => {
-          'level' => 3,
-          'number' => 1,
+          'section_level' => 3,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 2
   }
 };
 
$result_sectioning{'one_subsection'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'one_subsection'};
diff --git a/tp/t/results/sectioning/one_subsection_and_node.pl 
b/tp/t/results/sectioning/one_subsection_and_node.pl
index 9824ba349d..55acd4a5b2 100644
--- a/tp/t/results/sectioning/one_subsection_and_node.pl
+++ b/tp/t/results/sectioning/one_subsection_and_node.pl
@@ -106,7 +106,6 @@ $result_texts{'one_subsection_and_node'} = '1 The subsection
 
 $result_sectioning{'one_subsection_and_node'} = {
   'structure' => {
-    'level' => 2,
     'section_childs' => [
       {
         'cmdname' => 'subsection',
@@ -119,12 +118,13 @@ $result_sectioning{'one_subsection_and_node'} = {
           }
         },
         'structure' => {
-          'level' => 3,
-          'number' => 1,
+          'section_level' => 3,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 2
   }
 };
 
$result_sectioning{'one_subsection_and_node'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'one_subsection_and_node'};
@@ -136,8 +136,8 @@ $result_nodes{'one_subsection_and_node'} = {
       'cmdname' => 'subsection',
       'extra' => {},
       'structure' => {
-        'level' => 3,
-        'number' => 1
+        'section_level' => 3,
+        'section_number' => 1
       }
     },
     'normalized' => 'one-node'
diff --git a/tp/t/results/sectioning/part_before_chapter.pl 
b/tp/t/results/sectioning/part_before_chapter.pl
index 73a75c302e..7b2956f512 100644
--- a/tp/t/results/sectioning/part_before_chapter.pl
+++ b/tp/t/results/sectioning/part_before_chapter.pl
@@ -121,7 +121,6 @@ $result_texts{'part_before_chapter'} = 'part
 
 $result_sectioning{'part_before_chapter'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'part',
@@ -143,22 +142,23 @@ $result_sectioning{'part_before_chapter'} = {
                 },
                 'type' => 'unit'
               },
-              'level' => 1,
-              'number' => 1,
+              'section_level' => 1,
+              'section_number' => 1,
               'section_up' => {}
             }
           }
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0,
           'section_childs' => [
             {}
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'part_before_chapter'}{'structure'}{'section_childs'}[0]{'extra'}{'part_associated_section'}{'extra'}{'associated_part'}
 = $result_sectioning{'part_before_chapter'}{'structure'}{'section_childs'}[0];
@@ -186,14 +186,14 @@ $result_elements{'part_before_chapter'} = [
             'extra' => {},
             'structure' => {
               'associated_unit' => {},
-              'level' => 0
+              'section_level' => 0
             }
           }
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 1,
-          'number' => 1
+          'section_level' => 1,
+          'section_number' => 1
         }
       }
     },
diff --git a/tp/t/results/sectioning/part_before_section.pl 
b/tp/t/results/sectioning/part_before_section.pl
index f5bffd58fd..99507cd7d1 100644
--- a/tp/t/results/sectioning/part_before_section.pl
+++ b/tp/t/results/sectioning/part_before_section.pl
@@ -121,7 +121,6 @@ $result_texts{'part_before_section'} = 'part
 
 $result_sectioning{'part_before_section'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'part',
@@ -143,22 +142,23 @@ $result_sectioning{'part_before_section'} = {
                 },
                 'type' => 'unit'
               },
-              'level' => 1,
-              'number' => 1,
+              'section_level' => 1,
+              'section_number' => 1,
               'section_up' => {}
             }
           }
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0,
           'section_childs' => [
             {}
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'part_before_section'}{'structure'}{'section_childs'}[0]{'extra'}{'part_associated_section'}{'extra'}{'associated_part'}
 = $result_sectioning{'part_before_section'}{'structure'}{'section_childs'}[0];
@@ -196,14 +196,14 @@ $result_elements{'part_before_section'} = [
             'extra' => {},
             'structure' => {
               'associated_unit' => {},
-              'level' => 0
+              'section_level' => 0
             }
           }
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 1,
-          'number' => 1
+          'section_level' => 1,
+          'section_number' => 1
         }
       }
     },
diff --git a/tp/t/results/sectioning/part_before_top.pl 
b/tp/t/results/sectioning/part_before_top.pl
index a188878b66..120a2cba84 100644
--- a/tp/t/results/sectioning/part_before_top.pl
+++ b/tp/t/results/sectioning/part_before_top.pl
@@ -121,7 +121,6 @@ top
 
 $result_sectioning{'part_before_top'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'part',
@@ -143,7 +142,7 @@ $result_sectioning{'part_before_top'} = {
                 },
                 'type' => 'unit'
               },
-              'level' => 0,
+              'section_level' => 0,
               'section_prev' => {},
               'section_up' => {}
             }
@@ -151,12 +150,13 @@ $result_sectioning{'part_before_top'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       },
       {}
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'part_before_top'}{'structure'}{'section_childs'}[0]{'extra'}{'part_associated_section'}{'extra'}{'associated_part'}
 = $result_sectioning{'part_before_top'}{'structure'}{'section_childs'}[0];
@@ -195,13 +195,13 @@ $result_elements{'part_before_top'} = [
             'extra' => {},
             'structure' => {
               'associated_unit' => {},
-              'level' => 0
+              'section_level' => 0
             }
           }
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0
+          'section_level' => 0
         }
       }
     },
diff --git a/tp/t/results/sectioning/part_chapter_after_top.pl 
b/tp/t/results/sectioning/part_chapter_after_top.pl
index ac067daac8..58d7c526e6 100644
--- a/tp/t/results/sectioning/part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_chapter_after_top.pl
@@ -415,7 +415,6 @@ part
 
 $result_sectioning{'part_chapter_after_top'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -453,10 +452,10 @@ $result_sectioning{'part_chapter_after_top'} = {
                               },
                               'structure' => {
                                 'associated_unit' => {},
-                                'level' => 0,
                                 'section_childs' => [
                                   {}
                                 ],
+                                'section_level' => 0,
                                 'section_prev' => {},
                                 'section_up' => {}
                               }
@@ -464,8 +463,8 @@ $result_sectioning{'part_chapter_after_top'} = {
                           },
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1,
-                            'number' => 1,
+                            'section_level' => 1,
+                            'section_number' => 1,
                             'section_up' => {},
                             'toplevel_prev' => {},
                             'toplevel_up' => {}
@@ -500,12 +499,13 @@ $result_sectioning{'part_chapter_after_top'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       },
       {}
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'part_chapter_after_top'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'part_chapter_after_top'}{'structure'}{'section_childs'}[0];
@@ -559,14 +559,14 @@ $result_nodes{'part_chapter_after_top'} = {
                         'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
-                          'level' => 0
+                          'section_level' => 0
                         }
                       }
                     },
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1,
-                      'number' => 1
+                      'section_level' => 1,
+                      'section_number' => 1
                     }
                   }
                 },
@@ -593,7 +593,7 @@ $result_nodes{'part_chapter_after_top'} = {
           },
           'type' => 'unit'
         },
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -657,7 +657,7 @@ $result_menus{'part_chapter_after_top'} = {
           'extra' => {},
           'structure' => {
             'associated_unit' => {},
-            'level' => 0
+            'section_level' => 0
           }
         }
       },
@@ -673,14 +673,14 @@ $result_menus{'part_chapter_after_top'} = {
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 0
+                      'section_level' => 0
                     }
                   }
                 },
                 'structure' => {
                   'associated_unit' => {},
-                  'level' => 1,
-                  'number' => 1
+                  'section_level' => 1,
+                  'section_number' => 1
                 }
               }
             },
@@ -755,7 +755,7 @@ $result_elements{'part_chapter_after_top'} = [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 0
+          'section_level' => 0
         }
       }
     },
@@ -771,14 +771,14 @@ $result_elements{'part_chapter_after_top'} = [
                   'extra' => {},
                   'structure' => {
                     'associated_unit' => {},
-                    'level' => 0
+                    'section_level' => 0
                   }
                 }
               },
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1,
-                'number' => 1
+                'section_level' => 1,
+                'section_number' => 1
               }
             }
           },
diff --git a/tp/t/results/sectioning/part_chapter_appendix.pl 
b/tp/t/results/sectioning/part_chapter_appendix.pl
index e4e0c74322..414465d73a 100644
--- a/tp/t/results/sectioning/part_chapter_appendix.pl
+++ b/tp/t/results/sectioning/part_chapter_appendix.pl
@@ -161,7 +161,6 @@ Appendix A Appendix
 
 $result_sectioning{'part_chapter_appendix'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'part',
@@ -172,17 +171,17 @@ $result_sectioning{'part_chapter_appendix'} = {
               'associated_part' => {}
             },
             'structure' => {
-              'level' => 1,
-              'number' => 1,
+              'section_level' => 1,
+              'section_number' => 1,
               'section_up' => {}
             }
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {}
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       },
@@ -190,14 +189,15 @@ $result_sectioning{'part_chapter_appendix'} = {
         'cmdname' => 'appendix',
         'extra' => {},
         'structure' => {
-          'level' => 1,
-          'number' => 'A',
+          'section_level' => 1,
+          'section_number' => 'A',
           'section_prev' => {},
           'section_up' => {},
           'toplevel_prev' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'part_chapter_appendix'}{'structure'}{'section_childs'}[0]{'extra'}{'part_associated_section'}{'extra'}{'associated_part'}
 = 
$result_sectioning{'part_chapter_appendix'}{'structure'}{'section_childs'}[0];
diff --git a/tp/t/results/sectioning/part_node_after_top.pl 
b/tp/t/results/sectioning/part_node_after_top.pl
index 00b63477ae..3b0b952bbd 100644
--- a/tp/t/results/sectioning/part_node_after_top.pl
+++ b/tp/t/results/sectioning/part_node_after_top.pl
@@ -366,7 +366,6 @@ part
 
 $result_sectioning{'part_node_after_top'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -390,7 +389,7 @@ $result_sectioning{'part_node_after_top'} = {
                           'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 0,
+                            'section_level' => 0,
                             'section_prev' => {},
                             'section_up' => {}
                           }
@@ -423,12 +422,13 @@ $result_sectioning{'part_node_after_top'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       },
       {}
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'part_node_after_top'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = $result_sectioning{'part_node_after_top'}{'structure'}{'section_childs'}[0];
@@ -471,7 +471,7 @@ $result_nodes{'part_node_after_top'} = {
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 0
+                      'section_level' => 0
                     }
                   }
                 },
@@ -497,7 +497,7 @@ $result_nodes{'part_node_after_top'} = {
           },
           'type' => 'unit'
         },
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -557,7 +557,7 @@ $result_menus{'part_node_after_top'} = {
           'extra' => {},
           'structure' => {
             'associated_unit' => {},
-            'level' => 0
+            'section_level' => 0
           }
         }
       },
@@ -570,7 +570,7 @@ $result_menus{'part_node_after_top'} = {
                 'extra' => {},
                 'structure' => {
                   'associated_unit' => {},
-                  'level' => 0
+                  'section_level' => 0
                 }
               }
             },
@@ -661,7 +661,7 @@ $result_elements{'part_node_after_top'} = [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 0
+          'section_level' => 0
         }
       }
     },
@@ -674,7 +674,7 @@ $result_elements{'part_node_after_top'} = [
               'extra' => {},
               'structure' => {
                 'associated_unit' => {},
-                'level' => 0
+                'section_level' => 0
               }
             }
           },
diff --git a/tp/t/results/sectioning/part_node_before_top.pl 
b/tp/t/results/sectioning/part_node_before_top.pl
index 9c09f50d23..44d4d01a20 100644
--- a/tp/t/results/sectioning/part_node_before_top.pl
+++ b/tp/t/results/sectioning/part_node_before_top.pl
@@ -408,7 +408,6 @@ top
 
 $result_sectioning{'part_node_before_top'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'part',
@@ -442,7 +441,7 @@ $result_sectioning{'part_node_before_top'} = {
             },
             'structure' => {
               'associated_unit' => {},
-              'level' => 0,
+              'section_level' => 0,
               'section_prev' => {},
               'section_up' => {}
             }
@@ -450,12 +449,13 @@ $result_sectioning{'part_node_before_top'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       },
       {}
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'part_node_before_top'}{'structure'}{'section_childs'}[0]{'extra'}{'part_associated_section'}{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'part_node_before_top'}{'structure'}{'section_childs'}[0]{'extra'}{'part_associated_section'};
@@ -495,13 +495,13 @@ $result_nodes{'part_node_before_top'} = {
               },
               'type' => 'unit'
             },
-            'level' => 0
+            'section_level' => 0
           }
         }
       },
       'structure' => {
         'associated_unit' => {},
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -558,13 +558,13 @@ $result_menus{'part_node_before_top'} = {
               'extra' => {},
               'structure' => {
                 'associated_unit' => {},
-                'level' => 0
+                'section_level' => 0
               }
             }
           },
           'structure' => {
             'associated_unit' => {},
-            'level' => 0
+            'section_level' => 0
           }
         }
       },
@@ -638,13 +638,13 @@ $result_elements{'part_node_before_top'} = [
             'extra' => {},
             'structure' => {
               'associated_unit' => {},
-              'level' => 0
+              'section_level' => 0
             }
           }
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0
+          'section_level' => 0
         }
       }
     },
diff --git a/tp/t/results/sectioning/part_node_chapter_after_top.pl 
b/tp/t/results/sectioning/part_node_chapter_after_top.pl
index c976d80a15..558f591a48 100644
--- a/tp/t/results/sectioning/part_node_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_node_chapter_after_top.pl
@@ -671,7 +671,6 @@ After a node after part
 
 $result_sectioning{'part_node_chapter_after_top'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -709,10 +708,10 @@ $result_sectioning{'part_node_chapter_after_top'} = {
                               },
                               'structure' => {
                                 'associated_unit' => {},
-                                'level' => 0,
                                 'section_childs' => [
                                   {}
                                 ],
+                                'section_level' => 0,
                                 'section_prev' => {},
                                 'section_up' => {}
                               }
@@ -720,8 +719,8 @@ $result_sectioning{'part_node_chapter_after_top'} = {
                           },
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1,
-                            'number' => 1,
+                            'section_level' => 1,
+                            'section_number' => 1,
                             'section_up' => {},
                             'toplevel_prev' => {},
                             'toplevel_up' => {}
@@ -757,12 +756,13 @@ $result_sectioning{'part_node_chapter_after_top'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       },
       {}
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'part_node_chapter_after_top'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'part_node_chapter_after_top'}{'structure'}{'section_childs'}[0];
@@ -817,14 +817,14 @@ $result_nodes{'part_node_chapter_after_top'} = {
                         'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
-                          'level' => 0
+                          'section_level' => 0
                         }
                       }
                     },
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1,
-                      'number' => 1
+                      'section_level' => 1,
+                      'section_number' => 1
                     }
                   }
                 },
@@ -852,7 +852,7 @@ $result_nodes{'part_node_chapter_after_top'} = {
           },
           'type' => 'unit'
         },
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -931,7 +931,7 @@ $result_menus{'part_node_chapter_after_top'} = {
           'extra' => {},
           'structure' => {
             'associated_unit' => {},
-            'level' => 0
+            'section_level' => 0
           }
         }
       },
@@ -947,14 +947,14 @@ $result_menus{'part_node_chapter_after_top'} = {
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 0
+                      'section_level' => 0
                     }
                   }
                 },
                 'structure' => {
                   'associated_unit' => {},
-                  'level' => 1,
-                  'number' => 1
+                  'section_level' => 1,
+                  'section_number' => 1
                 }
               }
             },
@@ -1048,7 +1048,7 @@ $result_elements{'part_node_chapter_after_top'} = [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 0
+          'section_level' => 0
         }
       }
     },
@@ -1064,14 +1064,14 @@ $result_elements{'part_node_chapter_after_top'} = [
                   'extra' => {},
                   'structure' => {
                     'associated_unit' => {},
-                    'level' => 0
+                    'section_level' => 0
                   }
                 }
               },
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1,
-                'number' => 1
+                'section_level' => 1,
+                'section_number' => 1
               }
             }
           },
diff --git a/tp/t/results/sectioning/part_node_chapter_appendix.pl 
b/tp/t/results/sectioning/part_node_chapter_appendix.pl
index 2480c14f1b..da14d92d71 100644
--- a/tp/t/results/sectioning/part_node_chapter_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_appendix.pl
@@ -471,7 +471,6 @@ Appendix A Appendix
 
 $result_sectioning{'part_node_chapter_appendix'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -509,10 +508,10 @@ $result_sectioning{'part_node_chapter_appendix'} = {
                               },
                               'structure' => {
                                 'associated_unit' => {},
-                                'level' => 0,
                                 'section_childs' => [
                                   {}
                                 ],
+                                'section_level' => 0,
                                 'section_prev' => {},
                                 'section_up' => {}
                               }
@@ -520,8 +519,8 @@ $result_sectioning{'part_node_chapter_appendix'} = {
                           },
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1,
-                            'number' => 1,
+                            'section_level' => 1,
+                            'section_number' => 1,
                             'section_up' => {},
                             'toplevel_prev' => {},
                             'toplevel_up' => {}
@@ -539,8 +538,8 @@ $result_sectioning{'part_node_chapter_appendix'} = {
                                 'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {},
-                                  'level' => 1,
-                                  'number' => 'A',
+                                  'section_level' => 1,
+                                  'section_number' => 'A',
                                   'section_prev' => {},
                                   'section_up' => {},
                                   'toplevel_prev' => {},
@@ -585,13 +584,14 @@ $result_sectioning{'part_node_chapter_appendix'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       },
       {},
       {}
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'part_node_chapter_appendix'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'part_node_chapter_appendix'}{'structure'}{'section_childs'}[0];
@@ -658,14 +658,14 @@ $result_nodes{'part_node_chapter_appendix'} = {
                         'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
-                          'level' => 0
+                          'section_level' => 0
                         }
                       }
                     },
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1,
-                      'number' => 1
+                      'section_level' => 1,
+                      'section_number' => 1
                     }
                   }
                 },
@@ -680,8 +680,8 @@ $result_nodes{'part_node_chapter_appendix'} = {
                           'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1,
-                            'number' => 'A'
+                            'section_level' => 1,
+                            'section_number' => 'A'
                           }
                         }
                       },
@@ -717,7 +717,7 @@ $result_nodes{'part_node_chapter_appendix'} = {
           },
           'type' => 'unit'
         },
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -789,7 +789,7 @@ $result_menus{'part_node_chapter_appendix'} = {
           'extra' => {},
           'structure' => {
             'associated_unit' => {},
-            'level' => 0
+            'section_level' => 0
           }
         }
       },
@@ -805,14 +805,14 @@ $result_menus{'part_node_chapter_appendix'} = {
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 0
+                      'section_level' => 0
                     }
                   }
                 },
                 'structure' => {
                   'associated_unit' => {},
-                  'level' => 1,
-                  'number' => 1
+                  'section_level' => 1,
+                  'section_number' => 1
                 }
               }
             },
@@ -827,8 +827,8 @@ $result_menus{'part_node_chapter_appendix'} = {
                       'extra' => {},
                       'structure' => {
                         'associated_unit' => {},
-                        'level' => 1,
-                        'number' => 'A'
+                        'section_level' => 1,
+                        'section_number' => 'A'
                       }
                     }
                   },
@@ -920,7 +920,7 @@ $result_elements{'part_node_chapter_appendix'} = [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 0
+          'section_level' => 0
         }
       }
     },
@@ -936,14 +936,14 @@ $result_elements{'part_node_chapter_appendix'} = [
                   'extra' => {},
                   'structure' => {
                     'associated_unit' => {},
-                    'level' => 0
+                    'section_level' => 0
                   }
                 }
               },
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1,
-                'number' => 1
+                'section_level' => 1,
+                'section_number' => 1
               }
             }
           },
@@ -958,8 +958,8 @@ $result_elements{'part_node_chapter_appendix'} = [
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1,
-                      'number' => 'A'
+                      'section_level' => 1,
+                      'section_number' => 'A'
                     }
                   }
                 },
diff --git a/tp/t/results/sectioning/part_node_chapter_node_appendix.pl 
b/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
index 7314639a00..61f036407b 100644
--- a/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
@@ -589,7 +589,6 @@ Appendix A Appendix
 
 $result_sectioning{'part_node_chapter_node_appendix'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -627,10 +626,10 @@ $result_sectioning{'part_node_chapter_node_appendix'} = {
                               },
                               'structure' => {
                                 'associated_unit' => {},
-                                'level' => 0,
                                 'section_childs' => [
                                   {}
                                 ],
+                                'section_level' => 0,
                                 'section_prev' => {},
                                 'section_up' => {}
                               }
@@ -638,8 +637,8 @@ $result_sectioning{'part_node_chapter_node_appendix'} = {
                           },
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1,
-                            'number' => 1,
+                            'section_level' => 1,
+                            'section_number' => 1,
                             'section_up' => {},
                             'toplevel_prev' => {},
                             'toplevel_up' => {}
@@ -667,8 +666,8 @@ $result_sectioning{'part_node_chapter_node_appendix'} = {
                                 },
                                 'structure' => {
                                   'associated_unit' => {},
-                                  'level' => 1,
-                                  'number' => 'A',
+                                  'section_level' => 1,
+                                  'section_number' => 'A',
                                   'section_prev' => {},
                                   'section_up' => {},
                                   'toplevel_prev' => {},
@@ -718,13 +717,14 @@ $result_sectioning{'part_node_chapter_node_appendix'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       },
       {},
       {}
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'part_node_chapter_node_appendix'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'part_node_chapter_node_appendix'}{'structure'}{'section_childs'}[0];
@@ -797,14 +797,14 @@ $result_nodes{'part_node_chapter_node_appendix'} = {
                         'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
-                          'level' => 0
+                          'section_level' => 0
                         }
                       }
                     },
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1,
-                      'number' => 1
+                      'section_level' => 1,
+                      'section_number' => 1
                     }
                   }
                 },
@@ -819,8 +819,8 @@ $result_nodes{'part_node_chapter_node_appendix'} = {
                           'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1,
-                            'number' => 'A'
+                            'section_level' => 1,
+                            'section_number' => 'A'
                           }
                         }
                       },
@@ -861,7 +861,7 @@ $result_nodes{'part_node_chapter_node_appendix'} = {
           },
           'type' => 'unit'
         },
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -954,7 +954,7 @@ $result_menus{'part_node_chapter_node_appendix'} = {
           'extra' => {},
           'structure' => {
             'associated_unit' => {},
-            'level' => 0
+            'section_level' => 0
           }
         }
       },
@@ -970,14 +970,14 @@ $result_menus{'part_node_chapter_node_appendix'} = {
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 0
+                      'section_level' => 0
                     }
                   }
                 },
                 'structure' => {
                   'associated_unit' => {},
-                  'level' => 1,
-                  'number' => 1
+                  'section_level' => 1,
+                  'section_number' => 1
                 }
               }
             },
@@ -992,8 +992,8 @@ $result_menus{'part_node_chapter_node_appendix'} = {
                       'extra' => {},
                       'structure' => {
                         'associated_unit' => {},
-                        'level' => 1,
-                        'number' => 'A'
+                        'section_level' => 1,
+                        'section_number' => 'A'
                       }
                     }
                   },
@@ -1112,7 +1112,7 @@ $result_elements{'part_node_chapter_node_appendix'} = [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 0
+          'section_level' => 0
         }
       }
     },
@@ -1128,14 +1128,14 @@ $result_elements{'part_node_chapter_node_appendix'} = [
                   'extra' => {},
                   'structure' => {
                     'associated_unit' => {},
-                    'level' => 0
+                    'section_level' => 0
                   }
                 }
               },
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1,
-                'number' => 1
+                'section_level' => 1,
+                'section_number' => 1
               }
             }
           },
@@ -1150,8 +1150,8 @@ $result_elements{'part_node_chapter_node_appendix'} = [
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1,
-                      'number' => 'A'
+                      'section_level' => 1,
+                      'section_number' => 'A'
                     }
                   }
                 },
diff --git a/tp/t/results/sectioning/part_node_node_part_appendix.pl 
b/tp/t/results/sectioning/part_node_node_part_appendix.pl
index a54228288d..c295b7ddea 100644
--- a/tp/t/results/sectioning/part_node_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_node_part_appendix.pl
@@ -638,7 +638,6 @@ Appendix A Appendix
 
 $result_sectioning{'part_node_node_part_appendix'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -676,10 +675,10 @@ $result_sectioning{'part_node_node_part_appendix'} = {
                               },
                               'structure' => {
                                 'associated_unit' => {},
-                                'level' => 0,
                                 'section_childs' => [
                                   {}
                                 ],
+                                'section_level' => 0,
                                 'section_prev' => {},
                                 'section_up' => {}
                               }
@@ -687,8 +686,8 @@ $result_sectioning{'part_node_node_part_appendix'} = {
                           },
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1,
-                            'number' => 1,
+                            'section_level' => 1,
+                            'section_number' => 1,
                             'section_up' => {},
                             'toplevel_prev' => {},
                             'toplevel_up' => {}
@@ -720,10 +719,10 @@ $result_sectioning{'part_node_node_part_appendix'} = {
                                     },
                                     'structure' => {
                                       'associated_unit' => {},
-                                      'level' => 0,
                                       'section_childs' => [
                                         {}
                                       ],
+                                      'section_level' => 0,
                                       'section_prev' => {},
                                       'section_up' => {}
                                     }
@@ -731,8 +730,8 @@ $result_sectioning{'part_node_node_part_appendix'} = {
                                 },
                                 'structure' => {
                                   'associated_unit' => {},
-                                  'level' => 1,
-                                  'number' => 'A',
+                                  'section_level' => 1,
+                                  'section_number' => 'A',
                                   'section_up' => {},
                                   'toplevel_prev' => {},
                                   'toplevel_up' => {}
@@ -780,13 +779,14 @@ $result_sectioning{'part_node_node_part_appendix'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       },
       {},
       {}
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'part_node_node_part_appendix'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'part_node_node_part_appendix'}{'structure'}{'section_childs'}[0];
@@ -862,14 +862,14 @@ $result_nodes{'part_node_node_part_appendix'} = {
                         'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
-                          'level' => 0
+                          'section_level' => 0
                         }
                       }
                     },
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1,
-                      'number' => 1
+                      'section_level' => 1,
+                      'section_number' => 1
                     }
                   }
                 },
@@ -887,14 +887,14 @@ $result_nodes{'part_node_node_part_appendix'} = {
                               'extra' => {},
                               'structure' => {
                                 'associated_unit' => {},
-                                'level' => 0
+                                'section_level' => 0
                               }
                             }
                           },
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1,
-                            'number' => 'A'
+                            'section_level' => 1,
+                            'section_number' => 'A'
                           }
                         }
                       },
@@ -934,7 +934,7 @@ $result_nodes{'part_node_node_part_appendix'} = {
           },
           'type' => 'unit'
         },
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1027,7 +1027,7 @@ $result_menus{'part_node_node_part_appendix'} = {
           'extra' => {},
           'structure' => {
             'associated_unit' => {},
-            'level' => 0
+            'section_level' => 0
           }
         }
       },
@@ -1043,14 +1043,14 @@ $result_menus{'part_node_node_part_appendix'} = {
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 0
+                      'section_level' => 0
                     }
                   }
                 },
                 'structure' => {
                   'associated_unit' => {},
-                  'level' => 1,
-                  'number' => 1
+                  'section_level' => 1,
+                  'section_number' => 1
                 }
               }
             },
@@ -1068,14 +1068,14 @@ $result_menus{'part_node_node_part_appendix'} = {
                           'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 0
+                            'section_level' => 0
                           }
                         }
                       },
                       'structure' => {
                         'associated_unit' => {},
-                        'level' => 1,
-                        'number' => 'A'
+                        'section_level' => 1,
+                        'section_number' => 'A'
                       }
                     }
                   },
@@ -1203,7 +1203,7 @@ $result_elements{'part_node_node_part_appendix'} = [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 0
+          'section_level' => 0
         }
       }
     },
@@ -1219,14 +1219,14 @@ $result_elements{'part_node_node_part_appendix'} = [
                   'extra' => {},
                   'structure' => {
                     'associated_unit' => {},
-                    'level' => 0
+                    'section_level' => 0
                   }
                 }
               },
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1,
-                'number' => 1
+                'section_level' => 1,
+                'section_number' => 1
               }
             }
           },
@@ -1244,14 +1244,14 @@ $result_elements{'part_node_node_part_appendix'} = [
                         'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
-                          'level' => 0
+                          'section_level' => 0
                         }
                       }
                     },
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1,
-                      'number' => 'A'
+                      'section_level' => 1,
+                      'section_number' => 'A'
                     }
                   }
                 },
diff --git a/tp/t/results/sectioning/part_node_part_appendix.pl 
b/tp/t/results/sectioning/part_node_part_appendix.pl
index 06385c884c..b42c3f882b 100644
--- a/tp/t/results/sectioning/part_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_appendix.pl
@@ -520,7 +520,6 @@ Appendix A Appendix
 
 $result_sectioning{'part_node_part_appendix'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -558,10 +557,10 @@ $result_sectioning{'part_node_part_appendix'} = {
                               },
                               'structure' => {
                                 'associated_unit' => {},
-                                'level' => 0,
                                 'section_childs' => [
                                   {}
                                 ],
+                                'section_level' => 0,
                                 'section_prev' => {},
                                 'section_up' => {}
                               }
@@ -569,8 +568,8 @@ $result_sectioning{'part_node_part_appendix'} = {
                           },
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1,
-                            'number' => 1,
+                            'section_level' => 1,
+                            'section_number' => 1,
                             'section_up' => {},
                             'toplevel_prev' => {},
                             'toplevel_up' => {}
@@ -593,10 +592,10 @@ $result_sectioning{'part_node_part_appendix'} = {
                                     },
                                     'structure' => {
                                       'associated_unit' => {},
-                                      'level' => 0,
                                       'section_childs' => [
                                         {}
                                       ],
+                                      'section_level' => 0,
                                       'section_prev' => {},
                                       'section_up' => {}
                                     }
@@ -604,8 +603,8 @@ $result_sectioning{'part_node_part_appendix'} = {
                                 },
                                 'structure' => {
                                   'associated_unit' => {},
-                                  'level' => 1,
-                                  'number' => 'A',
+                                  'section_level' => 1,
+                                  'section_number' => 'A',
                                   'section_up' => {},
                                   'toplevel_prev' => {},
                                   'toplevel_up' => {}
@@ -648,13 +647,14 @@ $result_sectioning{'part_node_part_appendix'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       },
       {},
       {}
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'part_node_part_appendix'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'part_node_part_appendix'}{'structure'}{'section_childs'}[0];
@@ -724,14 +724,14 @@ $result_nodes{'part_node_part_appendix'} = {
                         'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
-                          'level' => 0
+                          'section_level' => 0
                         }
                       }
                     },
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1,
-                      'number' => 1
+                      'section_level' => 1,
+                      'section_number' => 1
                     }
                   }
                 },
@@ -749,14 +749,14 @@ $result_nodes{'part_node_part_appendix'} = {
                               'extra' => {},
                               'structure' => {
                                 'associated_unit' => {},
-                                'level' => 0
+                                'section_level' => 0
                               }
                             }
                           },
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1,
-                            'number' => 'A'
+                            'section_level' => 1,
+                            'section_number' => 'A'
                           }
                         }
                       },
@@ -791,7 +791,7 @@ $result_nodes{'part_node_part_appendix'} = {
           },
           'type' => 'unit'
         },
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -863,7 +863,7 @@ $result_menus{'part_node_part_appendix'} = {
           'extra' => {},
           'structure' => {
             'associated_unit' => {},
-            'level' => 0
+            'section_level' => 0
           }
         }
       },
@@ -879,14 +879,14 @@ $result_menus{'part_node_part_appendix'} = {
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 0
+                      'section_level' => 0
                     }
                   }
                 },
                 'structure' => {
                   'associated_unit' => {},
-                  'level' => 1,
-                  'number' => 1
+                  'section_level' => 1,
+                  'section_number' => 1
                 }
               }
             },
@@ -904,14 +904,14 @@ $result_menus{'part_node_part_appendix'} = {
                           'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 0
+                            'section_level' => 0
                           }
                         }
                       },
                       'structure' => {
                         'associated_unit' => {},
-                        'level' => 1,
-                        'number' => 'A'
+                        'section_level' => 1,
+                        'section_number' => 'A'
                       }
                     }
                   },
@@ -1002,7 +1002,7 @@ $result_elements{'part_node_part_appendix'} = [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 0
+          'section_level' => 0
         }
       }
     },
@@ -1018,14 +1018,14 @@ $result_elements{'part_node_part_appendix'} = [
                   'extra' => {},
                   'structure' => {
                     'associated_unit' => {},
-                    'level' => 0
+                    'section_level' => 0
                   }
                 }
               },
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1,
-                'number' => 1
+                'section_level' => 1,
+                'section_number' => 1
               }
             }
           },
@@ -1043,14 +1043,14 @@ $result_elements{'part_node_part_appendix'} = [
                         'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
-                          'level' => 0
+                          'section_level' => 0
                         }
                       }
                     },
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1,
-                      'number' => 'A'
+                      'section_level' => 1,
+                      'section_number' => 'A'
                     }
                   }
                 },
diff --git a/tp/t/results/sectioning/part_node_part_node_appendix.pl 
b/tp/t/results/sectioning/part_node_part_node_appendix.pl
index c0311ad52a..01c75a1ed9 100644
--- a/tp/t/results/sectioning/part_node_part_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_node_appendix.pl
@@ -638,7 +638,6 @@ Appendix A Appendix
 
 $result_sectioning{'part_node_part_node_appendix'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -676,10 +675,10 @@ $result_sectioning{'part_node_part_node_appendix'} = {
                               },
                               'structure' => {
                                 'associated_unit' => {},
-                                'level' => 0,
                                 'section_childs' => [
                                   {}
                                 ],
+                                'section_level' => 0,
                                 'section_prev' => {},
                                 'section_up' => {}
                               }
@@ -687,8 +686,8 @@ $result_sectioning{'part_node_part_node_appendix'} = {
                           },
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1,
-                            'number' => 1,
+                            'section_level' => 1,
+                            'section_number' => 1,
                             'section_up' => {},
                             'toplevel_prev' => {},
                             'toplevel_up' => {}
@@ -720,10 +719,10 @@ $result_sectioning{'part_node_part_node_appendix'} = {
                                     },
                                     'structure' => {
                                       'associated_unit' => {},
-                                      'level' => 0,
                                       'section_childs' => [
                                         {}
                                       ],
+                                      'section_level' => 0,
                                       'section_prev' => {},
                                       'section_up' => {}
                                     }
@@ -731,8 +730,8 @@ $result_sectioning{'part_node_part_node_appendix'} = {
                                 },
                                 'structure' => {
                                   'associated_unit' => {},
-                                  'level' => 1,
-                                  'number' => 'A',
+                                  'section_level' => 1,
+                                  'section_number' => 'A',
                                   'section_up' => {},
                                   'toplevel_prev' => {},
                                   'toplevel_up' => {}
@@ -780,13 +779,14 @@ $result_sectioning{'part_node_part_node_appendix'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       },
       {},
       {}
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'part_node_part_node_appendix'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'part_node_part_node_appendix'}{'structure'}{'section_childs'}[0];
@@ -862,14 +862,14 @@ $result_nodes{'part_node_part_node_appendix'} = {
                         'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
-                          'level' => 0
+                          'section_level' => 0
                         }
                       }
                     },
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1,
-                      'number' => 1
+                      'section_level' => 1,
+                      'section_number' => 1
                     }
                   }
                 },
@@ -887,14 +887,14 @@ $result_nodes{'part_node_part_node_appendix'} = {
                               'extra' => {},
                               'structure' => {
                                 'associated_unit' => {},
-                                'level' => 0
+                                'section_level' => 0
                               }
                             }
                           },
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1,
-                            'number' => 'A'
+                            'section_level' => 1,
+                            'section_number' => 'A'
                           }
                         }
                       },
@@ -934,7 +934,7 @@ $result_nodes{'part_node_part_node_appendix'} = {
           },
           'type' => 'unit'
         },
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1027,7 +1027,7 @@ $result_menus{'part_node_part_node_appendix'} = {
           'extra' => {},
           'structure' => {
             'associated_unit' => {},
-            'level' => 0
+            'section_level' => 0
           }
         }
       },
@@ -1043,14 +1043,14 @@ $result_menus{'part_node_part_node_appendix'} = {
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 0
+                      'section_level' => 0
                     }
                   }
                 },
                 'structure' => {
                   'associated_unit' => {},
-                  'level' => 1,
-                  'number' => 1
+                  'section_level' => 1,
+                  'section_number' => 1
                 }
               }
             },
@@ -1068,14 +1068,14 @@ $result_menus{'part_node_part_node_appendix'} = {
                           'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 0
+                            'section_level' => 0
                           }
                         }
                       },
                       'structure' => {
                         'associated_unit' => {},
-                        'level' => 1,
-                        'number' => 'A'
+                        'section_level' => 1,
+                        'section_number' => 'A'
                       }
                     }
                   },
@@ -1193,7 +1193,7 @@ $result_elements{'part_node_part_node_appendix'} = [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 0
+          'section_level' => 0
         }
       }
     },
@@ -1209,14 +1209,14 @@ $result_elements{'part_node_part_node_appendix'} = [
                   'extra' => {},
                   'structure' => {
                     'associated_unit' => {},
-                    'level' => 0
+                    'section_level' => 0
                   }
                 }
               },
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1,
-                'number' => 1
+                'section_level' => 1,
+                'section_number' => 1
               }
             }
           },
@@ -1234,14 +1234,14 @@ $result_elements{'part_node_part_node_appendix'} = [
                         'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
-                          'level' => 0
+                          'section_level' => 0
                         }
                       }
                     },
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1,
-                      'number' => 'A'
+                      'section_level' => 1,
+                      'section_number' => 'A'
                     }
                   }
                 },
diff --git a/tp/t/results/sectioning/placed_things_before_element.pl 
b/tp/t/results/sectioning/placed_things_before_element.pl
index 96702a3bbb..9b6e3c9125 100644
--- a/tp/t/results/sectioning/placed_things_before_element.pl
+++ b/tp/t/results/sectioning/placed_things_before_element.pl
@@ -927,18 +927,18 @@ Anchor in footnote
 
 $result_sectioning{'placed_things_before_element'} = {
   'structure' => {
-    'level' => 1,
     'section_childs' => [
       {
         'cmdname' => 'section',
         'extra' => {},
         'structure' => {
-          'level' => 2,
-          'number' => 1,
+          'section_level' => 2,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 1
   }
 };
 
$result_sectioning{'placed_things_before_element'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'placed_things_before_element'};
diff --git a/tp/t/results/sectioning/placed_things_before_node.pl 
b/tp/t/results/sectioning/placed_things_before_node.pl
index 2f9c97c7a4..b3b9aa05c1 100644
--- a/tp/t/results/sectioning/placed_things_before_node.pl
+++ b/tp/t/results/sectioning/placed_things_before_node.pl
@@ -974,7 +974,6 @@ Anchor in footnote
 
 $result_sectioning{'placed_things_before_node'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -987,11 +986,12 @@ $result_sectioning{'placed_things_before_node'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'placed_things_before_node'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'placed_things_before_node'};
@@ -1003,7 +1003,7 @@ $result_nodes{'placed_things_before_node'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/protected_node_parentheses.pl 
b/tp/t/results/sectioning/protected_node_parentheses.pl
index 593c08682b..61163faa38 100644
--- a/tp/t/results/sectioning/protected_node_parentheses.pl
+++ b/tp/t/results/sectioning/protected_node_parentheses.pl
@@ -533,7 +533,6 @@ top
 
 $result_sectioning{'protected_node_parentheses'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -547,11 +546,12 @@ $result_sectioning{'protected_node_parentheses'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'protected_node_parentheses'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'protected_node_parentheses'};
@@ -563,7 +563,7 @@ $result_nodes{'protected_node_parentheses'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
diff --git a/tp/t/results/sectioning/raiselowersections.pl 
b/tp/t/results/sectioning/raiselowersections.pl
index 19cf66152c..96bac85ea6 100644
--- a/tp/t/results/sectioning/raiselowersections.pl
+++ b/tp/t/results/sectioning/raiselowersections.pl
@@ -1466,7 +1466,6 @@ Second chapter
 
 $result_sectioning{'raiselowersections'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1480,7 +1479,6 @@ $result_sectioning{'raiselowersections'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1494,8 +1492,6 @@ $result_sectioning{'raiselowersections'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'chapter',
@@ -1510,8 +1506,6 @@ $result_sectioning{'raiselowersections'} = {
                       'sections_level' => -1
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'section',
@@ -1526,8 +1520,6 @@ $result_sectioning{'raiselowersections'} = {
                             'sections_level' => -1
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
                             'section_childs' => [
                               {
                                 'cmdname' => 'subsection',
@@ -1542,20 +1534,26 @@ $result_sectioning{'raiselowersections'} = {
                                   'sections_level' => -1
                                 },
                                 'structure' => {
-                                  'level' => 4,
-                                  'number' => '1.1.1.1',
+                                  'section_level' => 4,
+                                  'section_number' => '1.1.1.1',
                                   'section_up' => {}
                                 }
                               }
                             ],
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -1573,8 +1571,8 @@ $result_sectioning{'raiselowersections'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 2,
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -1582,10 +1580,12 @@ $result_sectioning{'raiselowersections'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'raiselowersections'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'raiselowersections'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -1607,7 +1607,7 @@ $result_nodes{'raiselowersections'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1626,8 +1626,8 @@ $result_nodes{'raiselowersections'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
@@ -1648,8 +1648,8 @@ $result_nodes{'raiselowersections'} = {
                 'sections_level' => -1
               },
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'section_level' => 2,
+                'section_number' => '1.1'
               }
             },
             'menus' => [
@@ -1670,8 +1670,8 @@ $result_nodes{'raiselowersections'} = {
                     'sections_level' => -1
                   },
                   'structure' => {
-                    'level' => 3,
-                    'number' => '1.1.1'
+                    'section_level' => 3,
+                    'section_number' => '1.1.1'
                   }
                 },
                 'menus' => [
@@ -1692,8 +1692,8 @@ $result_nodes{'raiselowersections'} = {
                         'sections_level' => -1
                       },
                       'structure' => {
-                        'level' => 4,
-                        'number' => '1.1.1.1'
+                        'section_level' => 4,
+                        'section_number' => '1.1.1.1'
                       }
                     },
                     'normalized' => 'Subsection'
@@ -1715,8 +1715,8 @@ $result_nodes{'raiselowersections'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 2
+                'section_level' => 1,
+                'section_number' => 2
               }
             },
             'normalized' => 'Second-chapter'
diff --git a/tp/t/results/sectioning/ref_to_top.pl 
b/tp/t/results/sectioning/ref_to_top.pl
index ccb7e2403a..d8c9fc1f28 100644
--- a/tp/t/results/sectioning/ref_to_top.pl
+++ b/tp/t/results/sectioning/ref_to_top.pl
@@ -177,7 +177,6 @@ TOP.
 
 $result_sectioning{'ref_to_top'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -190,11 +189,12 @@ $result_sectioning{'ref_to_top'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'ref_to_top'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'ref_to_top'};
@@ -206,7 +206,7 @@ $result_nodes{'ref_to_top'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/section_before_after_top_node.pl 
b/tp/t/results/sectioning/section_before_after_top_node.pl
index ca71fb6c76..0ce682827b 100644
--- a/tp/t/results/sectioning/section_before_after_top_node.pl
+++ b/tp/t/results/sectioning/section_before_after_top_node.pl
@@ -264,13 +264,12 @@ in chapter
 
 $result_sectioning{'section_before_after_top_node'} = {
   'structure' => {
-    'level' => 0,
     'section_childs' => [
       {
         'cmdname' => 'unnumbered',
         'extra' => {},
         'structure' => {
-          'level' => 1,
+          'section_level' => 1,
           'section_up' => {}
         }
       },
@@ -285,7 +284,7 @@ $result_sectioning{'section_before_after_top_node'} = {
           }
         },
         'structure' => {
-          'level' => 1,
+          'section_level' => 1,
           'section_prev' => {},
           'section_up' => {},
           'toplevel_prev' => {}
@@ -295,15 +294,16 @@ $result_sectioning{'section_before_after_top_node'} = {
         'cmdname' => 'chapter',
         'extra' => {},
         'structure' => {
-          'level' => 1,
-          'number' => 1,
+          'section_level' => 1,
+          'section_number' => 1,
           'section_prev' => {},
           'section_up' => {},
           'toplevel_prev' => {},
           'toplevel_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 0
   }
 };
 
$result_sectioning{'section_before_after_top_node'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'section_before_after_top_node'};
@@ -322,7 +322,7 @@ $result_nodes{'section_before_after_top_node'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 1
+        'section_level' => 1
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/section_before_after_top_node_last_node.pl 
b/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
index 9f1b9a7c5d..f009016d8a 100644
--- a/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
+++ b/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
@@ -320,13 +320,12 @@ in chapter
 
 $result_sectioning{'section_before_after_top_node_last_node'} = {
   'structure' => {
-    'level' => 0,
     'section_childs' => [
       {
         'cmdname' => 'unnumbered',
         'extra' => {},
         'structure' => {
-          'level' => 1,
+          'section_level' => 1,
           'section_up' => {}
         }
       },
@@ -342,7 +341,7 @@ 
$result_sectioning{'section_before_after_top_node_last_node'} = {
           }
         },
         'structure' => {
-          'level' => 1,
+          'section_level' => 1,
           'section_prev' => {},
           'section_up' => {},
           'toplevel_prev' => {}
@@ -352,15 +351,16 @@ 
$result_sectioning{'section_before_after_top_node_last_node'} = {
         'cmdname' => 'chapter',
         'extra' => {},
         'structure' => {
-          'level' => 1,
-          'number' => 1,
+          'section_level' => 1,
+          'section_number' => 1,
           'section_prev' => {},
           'section_up' => {},
           'toplevel_prev' => {},
           'toplevel_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 0
   }
 };
 
$result_sectioning{'section_before_after_top_node_last_node'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'section_before_after_top_node_last_node'};
@@ -379,7 +379,7 @@ $result_nodes{'section_before_after_top_node_last_node'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 1
+        'section_level' => 1
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/section_before_chapter.pl 
b/tp/t/results/sectioning/section_before_chapter.pl
index ca82d39b2f..65e135b18d 100644
--- a/tp/t/results/sectioning/section_before_chapter.pl
+++ b/tp/t/results/sectioning/section_before_chapter.pl
@@ -104,14 +104,13 @@ $result_texts{'section_before_chapter'} = '1 section
 
 $result_sectioning{'section_before_chapter'} = {
   'structure' => {
-    'level' => 1,
     'section_childs' => [
       {
         'cmdname' => 'section',
         'extra' => {},
         'structure' => {
-          'level' => 2,
-          'number' => 1,
+          'section_level' => 2,
+          'section_number' => 1,
           'section_up' => {}
         }
       },
@@ -119,14 +118,15 @@ $result_sectioning{'section_before_chapter'} = {
         'cmdname' => 'chapter',
         'extra' => {},
         'structure' => {
-          'level' => 2,
-          'number' => 2,
+          'section_level' => 2,
+          'section_number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'toplevel_prev' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 1
   }
 };
 
$result_sectioning{'section_before_chapter'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'section_before_chapter'};
diff --git a/tp/t/results/sectioning/section_before_part.pl 
b/tp/t/results/sectioning/section_before_part.pl
index 3272ada285..5967fa372d 100644
--- a/tp/t/results/sectioning/section_before_part.pl
+++ b/tp/t/results/sectioning/section_before_part.pl
@@ -134,14 +134,13 @@ part
 
 $result_sectioning{'section_before_part'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'section',
         'extra' => {},
         'structure' => {
-          'level' => 2,
-          'number' => 1,
+          'section_level' => 2,
+          'section_number' => 1,
           'section_up' => {}
         }
       },
@@ -149,11 +148,12 @@ $result_sectioning{'section_before_part'} = {
         'cmdname' => 'part',
         'extra' => {},
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'section_before_part'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'section_before_part'};
diff --git a/tp/t/results/sectioning/section_before_top.pl 
b/tp/t/results/sectioning/section_before_top.pl
index 9413fff42b..1567231b32 100644
--- a/tp/t/results/sectioning/section_before_top.pl
+++ b/tp/t/results/sectioning/section_before_top.pl
@@ -372,7 +372,6 @@ top
 
 $result_sectioning{'section_before_top'} = {
   'structure' => {
-    'level' => 1,
     'section_childs' => [
       {
         'cmdname' => 'section',
@@ -386,8 +385,8 @@ $result_sectioning{'section_before_top'} = {
           }
         },
         'structure' => {
-          'level' => 2,
-          'number' => 1,
+          'section_level' => 2,
+          'section_number' => 1,
           'section_up' => {}
         }
       },
@@ -403,13 +402,14 @@ $result_sectioning{'section_before_top'} = {
           }
         },
         'structure' => {
-          'level' => 2,
+          'section_level' => 2,
           'section_prev' => {},
           'section_up' => {},
           'toplevel_prev' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 1
   }
 };
 
$result_sectioning{'section_before_top'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'section_before_top'};
@@ -424,7 +424,7 @@ $result_nodes{'section_before_top'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 2
+        'section_level' => 2
       }
     },
     'menus' => [
@@ -443,8 +443,8 @@ $result_nodes{'section_before_top'} = {
           'cmdname' => 'section',
           'extra' => {},
           'structure' => {
-            'level' => 2,
-            'number' => 1
+            'section_level' => 2,
+            'section_number' => 1
           }
         },
         'normalized' => 'section-node'
diff --git a/tp/t/results/sectioning/section_before_top_no_node.pl 
b/tp/t/results/sectioning/section_before_top_no_node.pl
index b0c92e3395..de790e148e 100644
--- a/tp/t/results/sectioning/section_before_top_no_node.pl
+++ b/tp/t/results/sectioning/section_before_top_no_node.pl
@@ -104,14 +104,13 @@ top
 
 $result_sectioning{'section_before_top_no_node'} = {
   'structure' => {
-    'level' => 1,
     'section_childs' => [
       {
         'cmdname' => 'section',
         'extra' => {},
         'structure' => {
-          'level' => 2,
-          'number' => 1,
+          'section_level' => 2,
+          'section_number' => 1,
           'section_up' => {}
         }
       },
@@ -119,13 +118,14 @@ $result_sectioning{'section_before_top_no_node'} = {
         'cmdname' => 'top',
         'extra' => {},
         'structure' => {
-          'level' => 2,
+          'section_level' => 2,
           'section_prev' => {},
           'section_up' => {},
           'toplevel_prev' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 1
   }
 };
 
$result_sectioning{'section_before_top_no_node'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'section_before_top_no_node'};
diff --git a/tp/t/results/sectioning/section_below_unnumbered.pl 
b/tp/t/results/sectioning/section_below_unnumbered.pl
index f1a91627b0..050bafeddd 100644
--- a/tp/t/results/sectioning/section_below_unnumbered.pl
+++ b/tp/t/results/sectioning/section_below_unnumbered.pl
@@ -691,7 +691,6 @@ Should be unnumbered.
 
 $result_sectioning{'section_below_unnumbered'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -705,7 +704,6 @@ $result_sectioning{'section_below_unnumbered'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'unnumbered',
@@ -719,7 +717,6 @@ $result_sectioning{'section_below_unnumbered'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -733,21 +730,24 @@ $result_sectioning{'section_below_unnumbered'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
+                      'section_level' => 2,
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'section_below_unnumbered'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'section_below_unnumbered'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -763,7 +763,7 @@ $result_nodes{'section_below_unnumbered'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -782,7 +782,7 @@ $result_nodes{'section_below_unnumbered'} = {
           'cmdname' => 'unnumbered',
           'extra' => {},
           'structure' => {
-            'level' => 1
+            'section_level' => 1
           }
         },
         'menus' => [
@@ -801,7 +801,7 @@ $result_nodes{'section_below_unnumbered'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2
+                'section_level' => 2
               }
             },
             'normalized' => 'Sec'
diff --git a/tp/t/results/sectioning/section_below_unnumbered_no_top.pl 
b/tp/t/results/sectioning/section_below_unnumbered_no_top.pl
index d726040f02..60fc05dffc 100644
--- a/tp/t/results/sectioning/section_below_unnumbered_no_top.pl
+++ b/tp/t/results/sectioning/section_below_unnumbered_no_top.pl
@@ -94,27 +94,27 @@ S
 
 $result_sectioning{'section_below_unnumbered_no_top'} = {
   'structure' => {
-    'level' => 0,
     'section_childs' => [
       {
         'cmdname' => 'unnumbered',
         'extra' => {},
         'structure' => {
-          'level' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
+                'section_level' => 2,
                 'section_up' => {}
               }
             }
           ],
+          'section_level' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 0
   }
 };
 
$result_sectioning{'section_below_unnumbered_no_top'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'section_below_unnumbered_no_top'}{'structure'}{'section_childs'}[0];
diff --git a/tp/t/results/sectioning/section_chapter_before_top.pl 
b/tp/t/results/sectioning/section_chapter_before_top.pl
index ee5a2c861f..63bc5c6569 100644
--- a/tp/t/results/sectioning/section_chapter_before_top.pl
+++ b/tp/t/results/sectioning/section_chapter_before_top.pl
@@ -149,14 +149,13 @@ top
 
 $result_sectioning{'section_chapter_before_top'} = {
   'structure' => {
-    'level' => 1,
     'section_childs' => [
       {
         'cmdname' => 'section',
         'extra' => {},
         'structure' => {
-          'level' => 2,
-          'number' => 1,
+          'section_level' => 2,
+          'section_number' => 1,
           'section_up' => {}
         }
       },
@@ -164,8 +163,8 @@ $result_sectioning{'section_chapter_before_top'} = {
         'cmdname' => 'chapter',
         'extra' => {},
         'structure' => {
-          'level' => 2,
-          'number' => 2,
+          'section_level' => 2,
+          'section_number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'toplevel_prev' => {}
@@ -175,13 +174,14 @@ $result_sectioning{'section_chapter_before_top'} = {
         'cmdname' => 'top',
         'extra' => {},
         'structure' => {
-          'level' => 2,
+          'section_level' => 2,
           'section_prev' => {},
           'section_up' => {},
           'toplevel_prev' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 1
   }
 };
 
$result_sectioning{'section_chapter_before_top'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'section_chapter_before_top'};
diff --git a/tp/t/results/sectioning/section_chapter_before_top_nodes.pl 
b/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
index 30130b49a9..ad8473f0f4 100644
--- a/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
+++ b/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
@@ -623,7 +623,6 @@ top
 
 $result_sectioning{'section_chapter_before_top_nodes'} = {
   'structure' => {
-    'level' => 1,
     'section_childs' => [
       {
         'cmdname' => 'section',
@@ -637,8 +636,8 @@ $result_sectioning{'section_chapter_before_top_nodes'} = {
           }
         },
         'structure' => {
-          'level' => 2,
-          'number' => 1,
+          'section_level' => 2,
+          'section_number' => 1,
           'section_up' => {}
         }
       },
@@ -654,8 +653,8 @@ $result_sectioning{'section_chapter_before_top_nodes'} = {
           }
         },
         'structure' => {
-          'level' => 2,
-          'number' => 2,
+          'section_level' => 2,
+          'section_number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'toplevel_prev' => {}
@@ -673,13 +672,14 @@ $result_sectioning{'section_chapter_before_top_nodes'} = {
           }
         },
         'structure' => {
-          'level' => 2,
+          'section_level' => 2,
           'section_prev' => {},
           'section_up' => {},
           'toplevel_prev' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 1
   }
 };
 
$result_sectioning{'section_chapter_before_top_nodes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'section_chapter_before_top_nodes'};
@@ -697,7 +697,7 @@ $result_nodes{'section_chapter_before_top_nodes'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 2
+        'section_level' => 2
       }
     },
     'menus' => [
@@ -716,8 +716,8 @@ $result_nodes{'section_chapter_before_top_nodes'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 2,
-            'number' => 2
+            'section_level' => 2,
+            'section_number' => 2
           }
         },
         'menus' => [
@@ -736,8 +736,8 @@ $result_nodes{'section_chapter_before_top_nodes'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => 1
+                'section_level' => 2,
+                'section_number' => 1
               }
             },
             'normalized' => 'section-node'
diff --git a/tp/t/results/sectioning/section_in_unnumbered_info.pl 
b/tp/t/results/sectioning/section_in_unnumbered_info.pl
index 6d30489d27..54a9548a24 100644
--- a/tp/t/results/sectioning/section_in_unnumbered_info.pl
+++ b/tp/t/results/sectioning/section_in_unnumbered_info.pl
@@ -6092,7 +6092,6 @@ numbered subsection2 4
 
 $result_sectioning{'section_in_unnumbered_info'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -6106,7 +6105,6 @@ $result_sectioning{'section_in_unnumbered_info'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -6120,8 +6118,6 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -6135,12 +6131,14 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -6158,7 +6156,6 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -6172,11 +6169,12 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
+                      'section_level' => 2,
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -6195,8 +6193,6 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 2,
                 'section_childs' => [
                   {
                     'cmdname' => 'unnumberedsec',
@@ -6210,7 +6206,6 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
                       'section_childs' => [
                         {
                           'cmdname' => 'unnumberedsubsec',
@@ -6224,7 +6219,7 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_up' => {}
                           }
                         },
@@ -6240,7 +6235,7 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_prev' => {},
                             'section_up' => {}
                           }
@@ -6257,7 +6252,7 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_prev' => {},
                             'section_up' => {}
                           }
@@ -6274,12 +6269,13 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_prev' => {},
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
                       'section_up' => {}
                     }
                   },
@@ -6295,7 +6291,6 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -6309,16 +6304,19 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
                       'section_prev' => {},
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -6337,8 +6335,6 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 3,
                 'section_childs' => [
                   {
                     'cmdname' => 'unnumberedsec',
@@ -6352,7 +6348,6 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
                       'section_childs' => [
                         {
                           'cmdname' => 'unnumberedsubsec',
@@ -6366,7 +6361,7 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_up' => {}
                           }
                         },
@@ -6382,7 +6377,7 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_prev' => {},
                             'section_up' => {}
                           }
@@ -6399,7 +6394,7 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_prev' => {},
                             'section_up' => {}
                           }
@@ -6416,12 +6411,13 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_prev' => {},
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
                       'section_up' => {}
                     }
                   },
@@ -6437,8 +6433,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '3.1',
+                      'section_level' => 2,
+                      'section_number' => '3.1',
                       'section_prev' => {},
                       'section_up' => {}
                     }
@@ -6455,7 +6451,6 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -6469,11 +6464,12 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
                       'section_prev' => {},
                       'section_up' => {}
                     }
@@ -6490,8 +6486,6 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '3.2',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -6505,12 +6499,14 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '3.2.1',
+                            'section_level' => 3,
+                            'section_number' => '3.2.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '3.2',
                       'section_prev' => {},
                       'section_up' => {}
                     }
@@ -6527,7 +6523,6 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -6541,16 +6536,19 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
                       'section_prev' => {},
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 3,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -6569,7 +6567,6 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'unnumberedsec',
@@ -6583,7 +6580,6 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
                       'section_childs' => [
                         {
                           'cmdname' => 'unnumberedsubsec',
@@ -6597,7 +6593,7 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_up' => {}
                           }
                         },
@@ -6613,7 +6609,7 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_prev' => {},
                             'section_up' => {}
                           }
@@ -6630,7 +6626,7 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_prev' => {},
                             'section_up' => {}
                           }
@@ -6647,16 +6643,18 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_prev' => {},
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -6664,10 +6662,12 @@ $result_sectioning{'section_in_unnumbered_info'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'section_in_unnumbered_info'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'section_in_unnumbered_info'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -6738,7 +6738,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -6757,8 +6757,8 @@ $result_nodes{'section_in_unnumbered_info'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
@@ -6777,8 +6777,8 @@ $result_nodes{'section_in_unnumbered_info'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'section_level' => 2,
+                'section_number' => '1.1'
               }
             },
             'normalized' => 'section-in-chapter'
@@ -6794,7 +6794,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
               'cmdname' => 'unnumbered',
               'extra' => {},
               'structure' => {
-                'level' => 1
+                'section_level' => 1
               }
             },
             'menus' => [
@@ -6813,7 +6813,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                   'cmdname' => 'section',
                   'extra' => {},
                   'structure' => {
-                    'level' => 2
+                    'section_level' => 2
                   }
                 },
                 'normalized' => 'section-in-unnumbered'
@@ -6829,8 +6829,8 @@ $result_nodes{'section_in_unnumbered_info'} = {
                   'cmdname' => 'chapter',
                   'extra' => {},
                   'structure' => {
-                    'level' => 1,
-                    'number' => 2
+                    'section_level' => 1,
+                    'section_number' => 2
                   }
                 },
                 'menus' => [
@@ -6849,7 +6849,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                       'cmdname' => 'unnumberedsec',
                       'extra' => {},
                       'structure' => {
-                        'level' => 2
+                        'section_level' => 2
                       }
                     },
                     'menus' => [
@@ -6868,7 +6868,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                           'cmdname' => 'unnumberedsubsec',
                           'extra' => {},
                           'structure' => {
-                            'level' => 3
+                            'section_level' => 3
                           }
                         },
                         'normalized' => 'unnumbered-sub-2'
@@ -6881,7 +6881,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                               'cmdname' => 'subsection',
                               'extra' => {},
                               'structure' => {
-                                'level' => 3
+                                'section_level' => 3
                               }
                             },
                             'normalized' => 'numbered-sub-2'
@@ -6894,7 +6894,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                   'cmdname' => 'unnumberedsubsec',
                                   'extra' => {},
                                   'structure' => {
-                                    'level' => 3
+                                    'section_level' => 3
                                   }
                                 },
                                 'normalized' => 'unnumbered-sub2-2'
@@ -6907,7 +6907,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                       'cmdname' => 'subsection',
                                       'extra' => {},
                                       'structure' => {
-                                        'level' => 3
+                                        'section_level' => 3
                                       }
                                     },
                                     'normalized' => 'numbered-sub2-2'
@@ -6935,7 +6935,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                           'cmdname' => 'unnumberedsec',
                           'extra' => {},
                           'structure' => {
-                            'level' => 2
+                            'section_level' => 2
                           }
                         },
                         'menus' => [
@@ -6954,7 +6954,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                               'cmdname' => 'subsection',
                               'extra' => {},
                               'structure' => {
-                                'level' => 3
+                                'section_level' => 3
                               }
                             },
                             'normalized' => 'numbered-sub-2_002d1'
@@ -6977,8 +6977,8 @@ $result_nodes{'section_in_unnumbered_info'} = {
                       'cmdname' => 'chapter',
                       'extra' => {},
                       'structure' => {
-                        'level' => 1,
-                        'number' => 3
+                        'section_level' => 1,
+                        'section_number' => 3
                       }
                     },
                     'menus' => [
@@ -6997,7 +6997,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                           'cmdname' => 'unnumberedsec',
                           'extra' => {},
                           'structure' => {
-                            'level' => 2
+                            'section_level' => 2
                           }
                         },
                         'menus' => [
@@ -7016,7 +7016,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                               'cmdname' => 'unnumberedsubsec',
                               'extra' => {},
                               'structure' => {
-                                'level' => 3
+                                'section_level' => 3
                               }
                             },
                             'normalized' => 'unnumbered-sub-3'
@@ -7029,7 +7029,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                   'cmdname' => 'subsection',
                                   'extra' => {},
                                   'structure' => {
-                                    'level' => 3
+                                    'section_level' => 3
                                   }
                                 },
                                 'normalized' => 'numbered-sub-3'
@@ -7042,7 +7042,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                       'cmdname' => 'unnumberedsubsec',
                                       'extra' => {},
                                       'structure' => {
-                                        'level' => 3
+                                        'section_level' => 3
                                       }
                                     },
                                     'normalized' => 'unnumbered-sub2-3'
@@ -7055,7 +7055,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                           'cmdname' => 'subsection',
                                           'extra' => {},
                                           'structure' => {
-                                            'level' => 3
+                                            'section_level' => 3
                                           }
                                         },
                                         'normalized' => 'numbered-sub2-3'
@@ -7083,8 +7083,8 @@ $result_nodes{'section_in_unnumbered_info'} = {
                               'cmdname' => 'section',
                               'extra' => {},
                               'structure' => {
-                                'level' => 2,
-                                'number' => '3.1'
+                                'section_level' => 2,
+                                'section_number' => '3.1'
                               }
                             },
                             'normalized' => 'section-3_002d1'
@@ -7097,7 +7097,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                   'cmdname' => 'unnumberedsec',
                                   'extra' => {},
                                   'structure' => {
-                                    'level' => 2
+                                    'section_level' => 2
                                   }
                                 },
                                 'menus' => [
@@ -7116,7 +7116,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                       'cmdname' => 'subsection',
                                       'extra' => {},
                                       'structure' => {
-                                        'level' => 3
+                                        'section_level' => 3
                                       }
                                     },
                                     'normalized' => 'numbered-sub-3_002d2'
@@ -7132,8 +7132,8 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                       'cmdname' => 'section',
                                       'extra' => {},
                                       'structure' => {
-                                        'level' => 2,
-                                        'number' => '3.2'
+                                        'section_level' => 2,
+                                        'section_number' => '3.2'
                                       }
                                     },
                                     'menus' => [
@@ -7152,8 +7152,8 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                           'cmdname' => 'subsection',
                                           'extra' => {},
                                           'structure' => {
-                                            'level' => 3,
-                                            'number' => '3.2.1'
+                                            'section_level' => 3,
+                                            'section_number' => '3.2.1'
                                           }
                                         },
                                         'normalized' => 'subsection-3_002d3'
@@ -7169,7 +7169,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                           'cmdname' => 'unnumberedsec',
                                           'extra' => {},
                                           'structure' => {
-                                            'level' => 2
+                                            'section_level' => 2
                                           }
                                         },
                                         'menus' => [
@@ -7188,7 +7188,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                               'cmdname' => 'subsection',
                                               'extra' => {},
                                               'structure' => {
-                                                'level' => 3
+                                                'section_level' => 3
                                               }
                                             },
                                             'normalized' => 
'numbered-sub-3_002d4'
@@ -7223,7 +7223,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                           'cmdname' => 'unnumbered',
                           'extra' => {},
                           'structure' => {
-                            'level' => 1
+                            'section_level' => 1
                           }
                         },
                         'menus' => [
@@ -7242,7 +7242,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                               'cmdname' => 'unnumberedsec',
                               'extra' => {},
                               'structure' => {
-                                'level' => 2
+                                'section_level' => 2
                               }
                             },
                             'menus' => [
@@ -7261,7 +7261,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                   'cmdname' => 'unnumberedsubsec',
                                   'extra' => {},
                                   'structure' => {
-                                    'level' => 3
+                                    'section_level' => 3
                                   }
                                 },
                                 'normalized' => 'unnumbered-sub-4'
@@ -7274,7 +7274,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                       'cmdname' => 'subsection',
                                       'extra' => {},
                                       'structure' => {
-                                        'level' => 3
+                                        'section_level' => 3
                                       }
                                     },
                                     'normalized' => 'numbered-sub-4'
@@ -7287,7 +7287,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                           'cmdname' => 'unnumberedsubsec',
                                           'extra' => {},
                                           'structure' => {
-                                            'level' => 3
+                                            'section_level' => 3
                                           }
                                         },
                                         'normalized' => 'unnumbered-sub2-4'
@@ -7300,7 +7300,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                               'cmdname' => 'subsection',
                                               'extra' => {},
                                               'structure' => {
-                                                'level' => 3
+                                                'section_level' => 3
                                               }
                                             },
                                             'normalized' => 'numbered-sub2-4'
diff --git a/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl 
b/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
index 3a7e6d8da9..916f268042 100644
--- a/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
+++ b/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
@@ -6092,7 +6092,6 @@ numbered subsection2 4
 
 $result_sectioning{'section_in_unnumbered_plaintext'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -6106,7 +6105,6 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -6120,8 +6118,6 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -6135,12 +6131,14 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -6158,7 +6156,6 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -6172,11 +6169,12 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                       }
                     },
                     'structure' => {
-                      'level' => 2,
+                      'section_level' => 2,
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -6195,8 +6193,6 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 2,
                 'section_childs' => [
                   {
                     'cmdname' => 'unnumberedsec',
@@ -6210,7 +6206,6 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
                       'section_childs' => [
                         {
                           'cmdname' => 'unnumberedsubsec',
@@ -6224,7 +6219,7 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_up' => {}
                           }
                         },
@@ -6240,7 +6235,7 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_prev' => {},
                             'section_up' => {}
                           }
@@ -6257,7 +6252,7 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_prev' => {},
                             'section_up' => {}
                           }
@@ -6274,12 +6269,13 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_prev' => {},
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
                       'section_up' => {}
                     }
                   },
@@ -6295,7 +6291,6 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -6309,16 +6304,19 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
                       'section_prev' => {},
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -6337,8 +6335,6 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 3,
                 'section_childs' => [
                   {
                     'cmdname' => 'unnumberedsec',
@@ -6352,7 +6348,6 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
                       'section_childs' => [
                         {
                           'cmdname' => 'unnumberedsubsec',
@@ -6366,7 +6361,7 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_up' => {}
                           }
                         },
@@ -6382,7 +6377,7 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_prev' => {},
                             'section_up' => {}
                           }
@@ -6399,7 +6394,7 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_prev' => {},
                             'section_up' => {}
                           }
@@ -6416,12 +6411,13 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_prev' => {},
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
                       'section_up' => {}
                     }
                   },
@@ -6437,8 +6433,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '3.1',
+                      'section_level' => 2,
+                      'section_number' => '3.1',
                       'section_prev' => {},
                       'section_up' => {}
                     }
@@ -6455,7 +6451,6 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -6469,11 +6464,12 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
                       'section_prev' => {},
                       'section_up' => {}
                     }
@@ -6490,8 +6486,6 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '3.2',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -6505,12 +6499,14 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                             }
                           },
                           'structure' => {
-                            'level' => 3,
-                            'number' => '3.2.1',
+                            'section_level' => 3,
+                            'section_number' => '3.2.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '3.2',
                       'section_prev' => {},
                       'section_up' => {}
                     }
@@ -6527,7 +6523,6 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
@@ -6541,16 +6536,19 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
                       'section_prev' => {},
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 3,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -6569,7 +6567,6 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'unnumberedsec',
@@ -6583,7 +6580,6 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
                       'section_childs' => [
                         {
                           'cmdname' => 'unnumberedsubsec',
@@ -6597,7 +6593,7 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_up' => {}
                           }
                         },
@@ -6613,7 +6609,7 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_prev' => {},
                             'section_up' => {}
                           }
@@ -6630,7 +6626,7 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_prev' => {},
                             'section_up' => {}
                           }
@@ -6647,16 +6643,18 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                             }
                           },
                           'structure' => {
-                            'level' => 3,
+                            'section_level' => 3,
                             'section_prev' => {},
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -6664,10 +6662,12 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'section_in_unnumbered_plaintext'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'section_in_unnumbered_plaintext'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -6738,7 +6738,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -6757,8 +6757,8 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
@@ -6777,8 +6777,8 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'section_level' => 2,
+                'section_number' => '1.1'
               }
             },
             'normalized' => 'section-in-chapter'
@@ -6794,7 +6794,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
               'cmdname' => 'unnumbered',
               'extra' => {},
               'structure' => {
-                'level' => 1
+                'section_level' => 1
               }
             },
             'menus' => [
@@ -6813,7 +6813,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                   'cmdname' => 'section',
                   'extra' => {},
                   'structure' => {
-                    'level' => 2
+                    'section_level' => 2
                   }
                 },
                 'normalized' => 'section-in-unnumbered'
@@ -6829,8 +6829,8 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                   'cmdname' => 'chapter',
                   'extra' => {},
                   'structure' => {
-                    'level' => 1,
-                    'number' => 2
+                    'section_level' => 1,
+                    'section_number' => 2
                   }
                 },
                 'menus' => [
@@ -6849,7 +6849,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                       'cmdname' => 'unnumberedsec',
                       'extra' => {},
                       'structure' => {
-                        'level' => 2
+                        'section_level' => 2
                       }
                     },
                     'menus' => [
@@ -6868,7 +6868,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                           'cmdname' => 'unnumberedsubsec',
                           'extra' => {},
                           'structure' => {
-                            'level' => 3
+                            'section_level' => 3
                           }
                         },
                         'normalized' => 'unnumbered-sub-2'
@@ -6881,7 +6881,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                               'cmdname' => 'subsection',
                               'extra' => {},
                               'structure' => {
-                                'level' => 3
+                                'section_level' => 3
                               }
                             },
                             'normalized' => 'numbered-sub-2'
@@ -6894,7 +6894,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                   'cmdname' => 'unnumberedsubsec',
                                   'extra' => {},
                                   'structure' => {
-                                    'level' => 3
+                                    'section_level' => 3
                                   }
                                 },
                                 'normalized' => 'unnumbered-sub2-2'
@@ -6907,7 +6907,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                       'cmdname' => 'subsection',
                                       'extra' => {},
                                       'structure' => {
-                                        'level' => 3
+                                        'section_level' => 3
                                       }
                                     },
                                     'normalized' => 'numbered-sub2-2'
@@ -6935,7 +6935,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                           'cmdname' => 'unnumberedsec',
                           'extra' => {},
                           'structure' => {
-                            'level' => 2
+                            'section_level' => 2
                           }
                         },
                         'menus' => [
@@ -6954,7 +6954,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                               'cmdname' => 'subsection',
                               'extra' => {},
                               'structure' => {
-                                'level' => 3
+                                'section_level' => 3
                               }
                             },
                             'normalized' => 'numbered-sub-2_002d1'
@@ -6977,8 +6977,8 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                       'cmdname' => 'chapter',
                       'extra' => {},
                       'structure' => {
-                        'level' => 1,
-                        'number' => 3
+                        'section_level' => 1,
+                        'section_number' => 3
                       }
                     },
                     'menus' => [
@@ -6997,7 +6997,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                           'cmdname' => 'unnumberedsec',
                           'extra' => {},
                           'structure' => {
-                            'level' => 2
+                            'section_level' => 2
                           }
                         },
                         'menus' => [
@@ -7016,7 +7016,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                               'cmdname' => 'unnumberedsubsec',
                               'extra' => {},
                               'structure' => {
-                                'level' => 3
+                                'section_level' => 3
                               }
                             },
                             'normalized' => 'unnumbered-sub-3'
@@ -7029,7 +7029,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                   'cmdname' => 'subsection',
                                   'extra' => {},
                                   'structure' => {
-                                    'level' => 3
+                                    'section_level' => 3
                                   }
                                 },
                                 'normalized' => 'numbered-sub-3'
@@ -7042,7 +7042,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                       'cmdname' => 'unnumberedsubsec',
                                       'extra' => {},
                                       'structure' => {
-                                        'level' => 3
+                                        'section_level' => 3
                                       }
                                     },
                                     'normalized' => 'unnumbered-sub2-3'
@@ -7055,7 +7055,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                           'cmdname' => 'subsection',
                                           'extra' => {},
                                           'structure' => {
-                                            'level' => 3
+                                            'section_level' => 3
                                           }
                                         },
                                         'normalized' => 'numbered-sub2-3'
@@ -7083,8 +7083,8 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                               'cmdname' => 'section',
                               'extra' => {},
                               'structure' => {
-                                'level' => 2,
-                                'number' => '3.1'
+                                'section_level' => 2,
+                                'section_number' => '3.1'
                               }
                             },
                             'normalized' => 'section-3_002d1'
@@ -7097,7 +7097,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                   'cmdname' => 'unnumberedsec',
                                   'extra' => {},
                                   'structure' => {
-                                    'level' => 2
+                                    'section_level' => 2
                                   }
                                 },
                                 'menus' => [
@@ -7116,7 +7116,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                       'cmdname' => 'subsection',
                                       'extra' => {},
                                       'structure' => {
-                                        'level' => 3
+                                        'section_level' => 3
                                       }
                                     },
                                     'normalized' => 'numbered-sub-3_002d2'
@@ -7132,8 +7132,8 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                       'cmdname' => 'section',
                                       'extra' => {},
                                       'structure' => {
-                                        'level' => 2,
-                                        'number' => '3.2'
+                                        'section_level' => 2,
+                                        'section_number' => '3.2'
                                       }
                                     },
                                     'menus' => [
@@ -7152,8 +7152,8 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                           'cmdname' => 'subsection',
                                           'extra' => {},
                                           'structure' => {
-                                            'level' => 3,
-                                            'number' => '3.2.1'
+                                            'section_level' => 3,
+                                            'section_number' => '3.2.1'
                                           }
                                         },
                                         'normalized' => 'subsection-3_002d3'
@@ -7169,7 +7169,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                           'cmdname' => 'unnumberedsec',
                                           'extra' => {},
                                           'structure' => {
-                                            'level' => 2
+                                            'section_level' => 2
                                           }
                                         },
                                         'menus' => [
@@ -7188,7 +7188,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                               'cmdname' => 'subsection',
                                               'extra' => {},
                                               'structure' => {
-                                                'level' => 3
+                                                'section_level' => 3
                                               }
                                             },
                                             'normalized' => 
'numbered-sub-3_002d4'
@@ -7223,7 +7223,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                           'cmdname' => 'unnumbered',
                           'extra' => {},
                           'structure' => {
-                            'level' => 1
+                            'section_level' => 1
                           }
                         },
                         'menus' => [
@@ -7242,7 +7242,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                               'cmdname' => 'unnumberedsec',
                               'extra' => {},
                               'structure' => {
-                                'level' => 2
+                                'section_level' => 2
                               }
                             },
                             'menus' => [
@@ -7261,7 +7261,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                   'cmdname' => 'unnumberedsubsec',
                                   'extra' => {},
                                   'structure' => {
-                                    'level' => 3
+                                    'section_level' => 3
                                   }
                                 },
                                 'normalized' => 'unnumbered-sub-4'
@@ -7274,7 +7274,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                       'cmdname' => 'subsection',
                                       'extra' => {},
                                       'structure' => {
-                                        'level' => 3
+                                        'section_level' => 3
                                       }
                                     },
                                     'normalized' => 'numbered-sub-4'
@@ -7287,7 +7287,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                           'cmdname' => 'unnumberedsubsec',
                                           'extra' => {},
                                           'structure' => {
-                                            'level' => 3
+                                            'section_level' => 3
                                           }
                                         },
                                         'normalized' => 'unnumbered-sub2-4'
@@ -7300,7 +7300,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                               'cmdname' => 'subsection',
                                               'extra' => {},
                                               'structure' => {
-                                                'level' => 3
+                                                'section_level' => 3
                                               }
                                             },
                                             'normalized' => 'numbered-sub2-4'
diff --git a/tp/t/results/sectioning/section_node_before_part.pl 
b/tp/t/results/sectioning/section_node_before_part.pl
index 27fd686101..fe9ba944ef 100644
--- a/tp/t/results/sectioning/section_node_before_part.pl
+++ b/tp/t/results/sectioning/section_node_before_part.pl
@@ -161,7 +161,6 @@ part
 
 $result_sectioning{'section_node_before_part'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'section',
@@ -174,8 +173,8 @@ $result_sectioning{'section_node_before_part'} = {
           }
         },
         'structure' => {
-          'level' => 2,
-          'number' => 1,
+          'section_level' => 2,
+          'section_number' => 1,
           'section_up' => {}
         }
       },
@@ -183,11 +182,12 @@ $result_sectioning{'section_node_before_part'} = {
         'cmdname' => 'part',
         'extra' => {},
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'section_node_before_part'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'section_node_before_part'};
@@ -200,8 +200,8 @@ $result_nodes{'section_node_before_part'} = {
       'cmdname' => 'section',
       'extra' => {},
       'structure' => {
-        'level' => 2,
-        'number' => 1
+        'section_level' => 2,
+        'section_number' => 1
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/sectioning_part_appendix.pl 
b/tp/t/results/sectioning/sectioning_part_appendix.pl
index 00281861d9..81532959d5 100644
--- a/tp/t/results/sectioning/sectioning_part_appendix.pl
+++ b/tp/t/results/sectioning/sectioning_part_appendix.pl
@@ -625,7 +625,6 @@ A.1 appendixsec
 
 $result_sectioning{'sectioning_part_appendix'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -644,8 +643,6 @@ $result_sectioning{'sectioning_part_appendix'} = {
                       'extra' => {},
                       'structure' => {
                         'associated_unit' => {},
-                        'level' => 1,
-                        'number' => 1,
                         'section_childs' => [
                           {
                             'cmdname' => 'section',
@@ -671,7 +668,6 @@ $result_sectioning{'sectioning_part_appendix'} = {
                                               },
                                               'structure' => {
                                                 'associated_unit' => {},
-                                                'level' => 0,
                                                 'section_childs' => [
                                                   {},
                                                   {
@@ -693,7 +689,7 @@ $result_sectioning{'sectioning_part_appendix'} = {
                                                                   'extra' => 
{},
                                                                   'structure' 
=> {
                                                                     
'associated_unit' => {},
-                                                                    'level' => 
1,
+                                                                    
'section_level' => 1,
                                                                     
'section_prev' => {},
                                                                     
'section_up' => {},
                                                                     
'toplevel_prev' => {},
@@ -712,8 +708,6 @@ $result_sectioning{'sectioning_part_appendix'} = {
                                                                         
'extra' => {},
                                                                         
'structure' => {
                                                                           
'associated_unit' => {},
-                                                                          
'level' => 1,
-                                                                          
'number' => 'A',
                                                                           
'section_childs' => [
                                                                             {
                                                                               
'cmdname' => 'appendixsec',
@@ -734,12 +728,14 @@ $result_sectioning{'sectioning_part_appendix'} = {
                                                                                
   },
                                                                                
   'type' => 'unit'
                                                                                
 },
-                                                                               
 'level' => 2,
-                                                                               
 'number' => 'A.1',
+                                                                               
 'section_level' => 2,
+                                                                               
 'section_number' => 'A.1',
                                                                                
 'section_up' => {}
                                                                               }
                                                                             }
                                                                           ],
+                                                                          
'section_level' => 1,
+                                                                          
'section_number' => 'A',
                                                                           
'section_prev' => {},
                                                                           
'section_up' => {},
                                                                           
'toplevel_prev' => {},
@@ -781,8 +777,8 @@ $result_sectioning{'sectioning_part_appendix'} = {
                                                         },
                                                         'type' => 'unit'
                                                       },
-                                                      'level' => 1,
-                                                      'number' => 3,
+                                                      'section_level' => 1,
+                                                      'section_number' => 3,
                                                       'section_prev' => {},
                                                       'section_up' => {},
                                                       'toplevel_prev' => {},
@@ -791,6 +787,7 @@ $result_sectioning{'sectioning_part_appendix'} = {
                                                   },
                                                   {}
                                                 ],
+                                                'section_level' => 0,
                                                 'section_prev' => {},
                                                 'section_up' => {}
                                               }
@@ -798,8 +795,8 @@ $result_sectioning{'sectioning_part_appendix'} = {
                                           },
                                           'structure' => {
                                             'associated_unit' => {},
-                                            'level' => 1,
-                                            'number' => 2,
+                                            'section_level' => 1,
+                                            'section_number' => 2,
                                             'section_up' => {},
                                             'toplevel_prev' => {},
                                             'toplevel_up' => {}
@@ -815,8 +812,8 @@ $result_sectioning{'sectioning_part_appendix'} = {
                                                 'extra' => {},
                                                 'structure' => {
                                                   'associated_unit' => {},
-                                                  'level' => 4,
-                                                  'number' => '1.1.1.1',
+                                                  'section_level' => 4,
+                                                  'section_number' => 
'1.1.1.1',
                                                   'section_up' => {
                                                     'cmdname' => 'subsection',
                                                     'extra' => {},
@@ -839,11 +836,11 @@ $result_sectioning{'sectioning_part_appendix'} = {
                                                         },
                                                         'type' => 'unit'
                                                       },
-                                                      'level' => 3,
-                                                      'number' => '1.1.1',
                                                       'section_childs' => [
                                                         {}
                                                       ],
+                                                      'section_level' => 3,
+                                                      'section_number' => 
'1.1.1',
                                                       'section_up' => {}
                                                     }
                                                   }
@@ -884,15 +881,17 @@ $result_sectioning{'sectioning_part_appendix'} = {
                                 },
                                 'type' => 'unit'
                               },
-                              'level' => 2,
-                              'number' => '1.1',
                               'section_childs' => [
                                 {}
                               ],
+                              'section_level' => 2,
+                              'section_number' => '1.1',
                               'section_up' => {}
                             }
                           }
                         ],
+                        'section_level' => 1,
+                        'section_number' => 1,
                         'section_up' => {},
                         'toplevel_prev' => {},
                         'toplevel_up' => {}
@@ -921,16 +920,17 @@ $result_sectioning{'sectioning_part_appendix'} = {
             },
             'type' => 'unit'
           },
-          'level' => 0,
           'section_childs' => [
             {}
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       },
       {},
       {}
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'sectioning_part_appendix'}{'structure'}{'section_childs'}[0]{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'sectioning_part_appendix'}{'structure'}{'section_childs'}[0];
@@ -1062,7 +1062,7 @@ $result_elements{'sectioning_part_appendix'} = [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 0
+          'section_level' => 0
         }
       }
     },
@@ -1075,8 +1075,8 @@ $result_elements{'sectioning_part_appendix'} = [
               'extra' => {},
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1,
-                'number' => 1
+                'section_level' => 1,
+                'section_number' => 1
               }
             }
           },
@@ -1094,14 +1094,14 @@ $result_elements{'sectioning_part_appendix'} = [
                         'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
-                          'level' => 0
+                          'section_level' => 0
                         }
                       }
                     },
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1,
-                      'number' => 2
+                      'section_level' => 1,
+                      'section_number' => 2
                     }
                   }
                 },
@@ -1114,8 +1114,8 @@ $result_elements{'sectioning_part_appendix'} = [
                           'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 4,
-                            'number' => '1.1.1.1'
+                            'section_level' => 4,
+                            'section_number' => '1.1.1.1'
                           }
                         }
                       },
@@ -1128,8 +1128,8 @@ $result_elements{'sectioning_part_appendix'} = [
                                 'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {},
-                                  'level' => 3,
-                                  'number' => '1.1.1'
+                                  'section_level' => 3,
+                                  'section_number' => '1.1.1'
                                 }
                               }
                             },
@@ -1142,8 +1142,8 @@ $result_elements{'sectioning_part_appendix'} = [
                                       'extra' => {},
                                       'structure' => {
                                         'associated_unit' => {},
-                                        'level' => 2,
-                                        'number' => '1.1'
+                                        'section_level' => 2,
+                                        'section_number' => '1.1'
                                       }
                                     }
                                   },
@@ -1185,8 +1185,8 @@ $result_elements{'sectioning_part_appendix'} = [
                           'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1,
-                            'number' => 3
+                            'section_level' => 1,
+                            'section_number' => 3
                           }
                         }
                       },
@@ -1201,7 +1201,7 @@ $result_elements{'sectioning_part_appendix'} = [
                                 'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {},
-                                  'level' => 1
+                                  'section_level' => 1
                                 }
                               }
                             },
@@ -1216,8 +1216,8 @@ $result_elements{'sectioning_part_appendix'} = [
                                       'extra' => {},
                                       'structure' => {
                                         'associated_unit' => {},
-                                        'level' => 1,
-                                        'number' => 'A'
+                                        'section_level' => 1,
+                                        'section_number' => 'A'
                                       }
                                     }
                                   },
@@ -1232,8 +1232,8 @@ $result_elements{'sectioning_part_appendix'} = [
                                             'extra' => {},
                                             'structure' => {
                                               'associated_unit' => {},
-                                              'level' => 2,
-                                              'number' => 'A.1'
+                                              'section_level' => 2,
+                                              'section_number' => 'A.1'
                                             }
                                           }
                                         },
diff --git a/tp/t/results/sectioning/sectioning_part_appendix_no_top.pl 
b/tp/t/results/sectioning/sectioning_part_appendix_no_top.pl
index 07e2d1e5cc..de37c9f52d 100644
--- a/tp/t/results/sectioning/sectioning_part_appendix_no_top.pl
+++ b/tp/t/results/sectioning/sectioning_part_appendix_no_top.pl
@@ -569,7 +569,6 @@ A.1 appendixsec
 
 $result_sectioning{'sectioning_part_appendix_no_top'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'chapter',
@@ -593,7 +592,6 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
                           },
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 0,
                             'section_childs' => [
                               {},
                               {
@@ -615,7 +613,7 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
                                               'extra' => {},
                                               'structure' => {
                                                 'associated_unit' => {},
-                                                'level' => 1,
+                                                'section_level' => 1,
                                                 'section_prev' => {},
                                                 'section_up' => {},
                                                 'toplevel_prev' => {}
@@ -633,8 +631,6 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
                                                     'extra' => {},
                                                     'structure' => {
                                                       'associated_unit' => {},
-                                                      'level' => 1,
-                                                      'number' => 'A',
                                                       'section_childs' => [
                                                         {
                                                           'cmdname' => 
'appendixsec',
@@ -655,12 +651,14 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
                                                               },
                                                               'type' => 'unit'
                                                             },
-                                                            'level' => 2,
-                                                            'number' => 'A.1',
+                                                            'section_level' => 
2,
+                                                            'section_number' 
=> 'A.1',
                                                             'section_up' => {}
                                                           }
                                                         }
                                                       ],
+                                                      'section_level' => 1,
+                                                      'section_number' => 'A',
                                                       'section_prev' => {},
                                                       'section_up' => {},
                                                       'toplevel_prev' => {}
@@ -701,8 +699,8 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
                                     },
                                     'type' => 'unit'
                                   },
-                                  'level' => 1,
-                                  'number' => 3,
+                                  'section_level' => 1,
+                                  'section_number' => 3,
                                   'section_prev' => {},
                                   'section_up' => {},
                                   'toplevel_prev' => {}
@@ -710,14 +708,15 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
                               },
                               {}
                             ],
+                            'section_level' => 0,
                             'section_up' => {}
                           }
                         }
                       },
                       'structure' => {
                         'associated_unit' => {},
-                        'level' => 1,
-                        'number' => 2,
+                        'section_level' => 1,
+                        'section_number' => 2,
                         'section_up' => {},
                         'toplevel_prev' => {}
                       }
@@ -732,8 +731,8 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
                             'extra' => {},
                             'structure' => {
                               'associated_unit' => {},
-                              'level' => 4,
-                              'number' => '1.1.1.1',
+                              'section_level' => 4,
+                              'section_number' => '1.1.1.1',
                               'section_up' => {
                                 'cmdname' => 'subsection',
                                 'extra' => {},
@@ -751,11 +750,11 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
                                               'extra' => {},
                                               'structure' => {
                                                 'associated_unit' => {},
-                                                'level' => 2,
-                                                'number' => '1.1',
                                                 'section_childs' => [
                                                   {}
                                                 ],
+                                                'section_level' => 2,
+                                                'section_number' => '1.1',
                                                 'section_up' => {}
                                               }
                                             }
@@ -785,11 +784,11 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
                                     },
                                     'type' => 'unit'
                                   },
-                                  'level' => 3,
-                                  'number' => '1.1.1',
                                   'section_childs' => [
                                     {}
                                   ],
+                                  'section_level' => 3,
+                                  'section_number' => '1.1.1',
                                   'section_up' => {}
                                 }
                               }
@@ -828,17 +827,18 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
             },
             'type' => 'unit'
           },
-          'level' => 1,
-          'number' => 1,
           'section_childs' => [
             {}
           ],
+          'section_level' => 1,
+          'section_number' => 1,
           'section_up' => {}
         }
       },
       {},
       {}
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'sectioning_part_appendix_no_top'}{'structure'}{'section_childs'}[0]{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'sectioning_part_appendix_no_top'}{'structure'}{'section_childs'}[0];
@@ -952,8 +952,8 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 1,
-          'number' => 1
+          'section_level' => 1,
+          'section_number' => 1
         }
       }
     },
@@ -969,14 +969,14 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                   'extra' => {},
                   'structure' => {
                     'associated_unit' => {},
-                    'level' => 0
+                    'section_level' => 0
                   }
                 }
               },
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1,
-                'number' => 2
+                'section_level' => 1,
+                'section_number' => 2
               }
             }
           },
@@ -989,8 +989,8 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 4,
-                      'number' => '1.1.1.1'
+                      'section_level' => 4,
+                      'section_number' => '1.1.1.1'
                     }
                   }
                 },
@@ -1003,8 +1003,8 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                           'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 3,
-                            'number' => '1.1.1'
+                            'section_level' => 3,
+                            'section_number' => '1.1.1'
                           }
                         }
                       },
@@ -1017,8 +1017,8 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                                 'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {},
-                                  'level' => 2,
-                                  'number' => '1.1'
+                                  'section_level' => 2,
+                                  'section_number' => '1.1'
                                 }
                               }
                             },
@@ -1060,8 +1060,8 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1,
-                      'number' => 3
+                      'section_level' => 1,
+                      'section_number' => 3
                     }
                   }
                 },
@@ -1076,7 +1076,7 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                           'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1
+                            'section_level' => 1
                           }
                         }
                       },
@@ -1091,8 +1091,8 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                                 'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {},
-                                  'level' => 1,
-                                  'number' => 'A'
+                                  'section_level' => 1,
+                                  'section_number' => 'A'
                                 }
                               }
                             },
@@ -1107,8 +1107,8 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                                       'extra' => {},
                                       'structure' => {
                                         'associated_unit' => {},
-                                        'level' => 2,
-                                        'number' => 'A.1'
+                                        'section_level' => 2,
+                                        'section_number' => 'A.1'
                                       }
                                     }
                                   },
diff --git a/tp/t/results/sectioning/sections.pl 
b/tp/t/results/sectioning/sections.pl
index b7178c7277..262eff6eb6 100644
--- a/tp/t/results/sectioning/sections.pl
+++ b/tp/t/results/sectioning/sections.pl
@@ -59,18 +59,18 @@ $result_texts{'sections'} = '1 a chapter
 
 $result_sectioning{'sections'} = {
   'structure' => {
-    'level' => 0,
     'section_childs' => [
       {
         'cmdname' => 'chapter',
         'extra' => {},
         'structure' => {
-          'level' => 1,
-          'number' => 1,
+          'section_level' => 1,
+          'section_number' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 0
   }
 };
 
$result_sectioning{'sections'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'sections'};
diff --git a/tp/t/results/sectioning/sections_test.pl 
b/tp/t/results/sectioning/sections_test.pl
index 778231ec53..337349a3d5 100644
--- a/tp/t/results/sectioning/sections_test.pl
+++ b/tp/t/results/sectioning/sections_test.pl
@@ -511,59 +511,58 @@ A.1 appendixsec
 
 $result_sectioning{'sections_test'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
         'extra' => {},
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
                           'extra' => {},
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
                             'section_childs' => [
                               {
                                 'cmdname' => 'subsubsection',
                                 'extra' => {},
                                 'structure' => {
-                                  'level' => 4,
-                                  'number' => '1.1.1.1',
+                                  'section_level' => 4,
+                                  'section_number' => '1.1.1.1',
                                   'section_up' => {}
                                 }
                               }
                             ],
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       },
@@ -576,8 +575,8 @@ $result_sectioning{'sections_test'} = {
               'associated_part' => {}
             },
             'structure' => {
-              'level' => 1,
-              'number' => 2,
+              'section_level' => 1,
+              'section_number' => 2,
               'section_up' => {},
               'toplevel_prev' => {},
               'toplevel_up' => {}
@@ -585,15 +584,14 @@ $result_sectioning{'sections_test'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {},
             {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 3,
+                'section_level' => 1,
+                'section_number' => 3,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -604,7 +602,7 @@ $result_sectioning{'sections_test'} = {
               'cmdname' => 'unnumbered',
               'extra' => {},
               'structure' => {
-                'level' => 1,
+                'section_level' => 1,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -612,6 +610,7 @@ $result_sectioning{'sections_test'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_prev' => {},
           'section_up' => {}
         }
@@ -620,26 +619,27 @@ $result_sectioning{'sections_test'} = {
         'cmdname' => 'appendix',
         'extra' => {},
         'structure' => {
-          'level' => 1,
-          'number' => 'A',
           'section_childs' => [
             {
               'cmdname' => 'appendixsec',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => 'A.1',
+                'section_level' => 2,
+                'section_number' => 'A.1',
                 'section_up' => {}
               }
             }
           ],
+          'section_level' => 1,
+          'section_number' => 'A',
           'section_prev' => {},
           'section_up' => {},
           'toplevel_prev' => {},
           'toplevel_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'sections_test'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'sections_test'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
diff --git a/tp/t/results/sectioning/sections_test_no_use_nodes.pl 
b/tp/t/results/sectioning/sections_test_no_use_nodes.pl
index 9f9deb71e1..c4ef6533a8 100644
--- a/tp/t/results/sectioning/sections_test_no_use_nodes.pl
+++ b/tp/t/results/sectioning/sections_test_no_use_nodes.pl
@@ -511,59 +511,58 @@ A.1 appendixsec
 
 $result_sectioning{'sections_test_no_use_nodes'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
         'extra' => {},
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
                           'extra' => {},
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
                             'section_childs' => [
                               {
                                 'cmdname' => 'subsubsection',
                                 'extra' => {},
                                 'structure' => {
-                                  'level' => 4,
-                                  'number' => '1.1.1.1',
+                                  'section_level' => 4,
+                                  'section_number' => '1.1.1.1',
                                   'section_up' => {}
                                 }
                               }
                             ],
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       },
@@ -576,8 +575,8 @@ $result_sectioning{'sections_test_no_use_nodes'} = {
               'associated_part' => {}
             },
             'structure' => {
-              'level' => 1,
-              'number' => 2,
+              'section_level' => 1,
+              'section_number' => 2,
               'section_up' => {},
               'toplevel_prev' => {},
               'toplevel_up' => {}
@@ -585,15 +584,14 @@ $result_sectioning{'sections_test_no_use_nodes'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {},
             {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 3,
+                'section_level' => 1,
+                'section_number' => 3,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -604,7 +602,7 @@ $result_sectioning{'sections_test_no_use_nodes'} = {
               'cmdname' => 'unnumbered',
               'extra' => {},
               'structure' => {
-                'level' => 1,
+                'section_level' => 1,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -612,6 +610,7 @@ $result_sectioning{'sections_test_no_use_nodes'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_prev' => {},
           'section_up' => {}
         }
@@ -620,26 +619,27 @@ $result_sectioning{'sections_test_no_use_nodes'} = {
         'cmdname' => 'appendix',
         'extra' => {},
         'structure' => {
-          'level' => 1,
-          'number' => 'A',
           'section_childs' => [
             {
               'cmdname' => 'appendixsec',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => 'A.1',
+                'section_level' => 2,
+                'section_number' => 'A.1',
                 'section_up' => {}
               }
             }
           ],
+          'section_level' => 1,
+          'section_number' => 'A',
           'section_prev' => {},
           'section_up' => {},
           'toplevel_prev' => {},
           'toplevel_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'sections_test_no_use_nodes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'sections_test_no_use_nodes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
diff --git 
a/tp/t/results/sectioning/sections_test_no_use_nodes_use_node_directions.pl 
b/tp/t/results/sectioning/sections_test_no_use_nodes_use_node_directions.pl
index e87eec884f..47e212fb74 100644
--- a/tp/t/results/sectioning/sections_test_no_use_nodes_use_node_directions.pl
+++ b/tp/t/results/sectioning/sections_test_no_use_nodes_use_node_directions.pl
@@ -511,59 +511,58 @@ A.1 appendixsec
 
 $result_sectioning{'sections_test_no_use_nodes_use_node_directions'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
         'extra' => {},
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
                           'extra' => {},
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
                             'section_childs' => [
                               {
                                 'cmdname' => 'subsubsection',
                                 'extra' => {},
                                 'structure' => {
-                                  'level' => 4,
-                                  'number' => '1.1.1.1',
+                                  'section_level' => 4,
+                                  'section_number' => '1.1.1.1',
                                   'section_up' => {}
                                 }
                               }
                             ],
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       },
@@ -576,8 +575,8 @@ 
$result_sectioning{'sections_test_no_use_nodes_use_node_directions'} = {
               'associated_part' => {}
             },
             'structure' => {
-              'level' => 1,
-              'number' => 2,
+              'section_level' => 1,
+              'section_number' => 2,
               'section_up' => {},
               'toplevel_prev' => {},
               'toplevel_up' => {}
@@ -585,15 +584,14 @@ 
$result_sectioning{'sections_test_no_use_nodes_use_node_directions'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {},
             {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 3,
+                'section_level' => 1,
+                'section_number' => 3,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -604,7 +602,7 @@ 
$result_sectioning{'sections_test_no_use_nodes_use_node_directions'} = {
               'cmdname' => 'unnumbered',
               'extra' => {},
               'structure' => {
-                'level' => 1,
+                'section_level' => 1,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -612,6 +610,7 @@ 
$result_sectioning{'sections_test_no_use_nodes_use_node_directions'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_prev' => {},
           'section_up' => {}
         }
@@ -620,26 +619,27 @@ 
$result_sectioning{'sections_test_no_use_nodes_use_node_directions'} = {
         'cmdname' => 'appendix',
         'extra' => {},
         'structure' => {
-          'level' => 1,
-          'number' => 'A',
           'section_childs' => [
             {
               'cmdname' => 'appendixsec',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => 'A.1',
+                'section_level' => 2,
+                'section_number' => 'A.1',
                 'section_up' => {}
               }
             }
           ],
+          'section_level' => 1,
+          'section_number' => 'A',
           'section_prev' => {},
           'section_up' => {},
           'toplevel_prev' => {},
           'toplevel_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'sections_test_no_use_nodes_use_node_directions'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'sections_test_no_use_nodes_use_node_directions'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
diff --git a/tp/t/results/sectioning/semi_auto.pl 
b/tp/t/results/sectioning/semi_auto.pl
index 21ad4989e8..f2f9332c2d 100644
--- a/tp/t/results/sectioning/semi_auto.pl
+++ b/tp/t/results/sectioning/semi_auto.pl
@@ -780,7 +780,6 @@ $result_texts{'semi_auto'} = 'Top
 
 $result_sectioning{'semi_auto'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -794,7 +793,6 @@ $result_sectioning{'semi_auto'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -808,8 +806,6 @@ $result_sectioning{'semi_auto'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
@@ -823,8 +819,8 @@ $result_sectioning{'semi_auto'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   },
@@ -840,23 +836,27 @@ $result_sectioning{'semi_auto'} = {
                       }
                     },
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.2',
+                      'section_level' => 2,
+                      'section_number' => '1.2',
                       'section_prev' => {},
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'semi_auto'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'semi_auto'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
@@ -874,7 +874,7 @@ $result_nodes{'semi_auto'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -893,8 +893,8 @@ $result_nodes{'semi_auto'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
@@ -913,8 +913,8 @@ $result_nodes{'semi_auto'} = {
               'cmdname' => 'section',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => '1.1'
+                'section_level' => 2,
+                'section_number' => '1.1'
               }
             },
             'normalized' => 'Sec-in-chapter'
@@ -927,8 +927,8 @@ $result_nodes{'semi_auto'} = {
                   'cmdname' => 'section',
                   'extra' => {},
                   'structure' => {
-                    'level' => 2,
-                    'number' => '1.2'
+                    'section_level' => 2,
+                    'section_number' => '1.2'
                   }
                 },
                 'normalized' => 'Section-non-auto'
diff --git a/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl 
b/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
index cb3434bf2f..bc468f0b65 100644
--- a/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
+++ b/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
@@ -177,7 +177,6 @@ $result_texts{'setfilename_on_top_and_after_node'} = 'In top
 
 $result_sectioning{'setfilename_on_top_and_after_node'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -190,11 +189,12 @@ $result_sectioning{'setfilename_on_top_and_after_node'} = 
{
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'setfilename_on_top_and_after_node'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'setfilename_on_top_and_after_node'};
@@ -206,7 +206,7 @@ $result_nodes{'setfilename_on_top_and_after_node'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/shortcontents.pl 
b/tp/t/results/sectioning/shortcontents.pl
index 8722f7b01a..2cb151ecc0 100644
--- a/tp/t/results/sectioning/shortcontents.pl
+++ b/tp/t/results/sectioning/shortcontents.pl
@@ -541,59 +541,58 @@ A.1 appendixsec
 
 $result_sectioning{'shortcontents'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
         'extra' => {},
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 1,
                 'section_childs' => [
                   {
                     'cmdname' => 'section',
                     'extra' => {},
                     'structure' => {
-                      'level' => 2,
-                      'number' => '1.1',
                       'section_childs' => [
                         {
                           'cmdname' => 'subsection',
                           'extra' => {},
                           'structure' => {
-                            'level' => 3,
-                            'number' => '1.1.1',
                             'section_childs' => [
                               {
                                 'cmdname' => 'subsubsection',
                                 'extra' => {},
                                 'structure' => {
-                                  'level' => 4,
-                                  'number' => '1.1.1.1',
+                                  'section_level' => 4,
+                                  'section_number' => '1.1.1.1',
                                   'section_up' => {}
                                 }
                               }
                             ],
+                            'section_level' => 3,
+                            'section_number' => '1.1.1',
                             'section_up' => {}
                           }
                         }
                       ],
+                      'section_level' => 2,
+                      'section_number' => '1.1',
                       'section_up' => {}
                     }
                   }
                 ],
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       },
@@ -606,8 +605,8 @@ $result_sectioning{'shortcontents'} = {
               'associated_part' => {}
             },
             'structure' => {
-              'level' => 1,
-              'number' => 2,
+              'section_level' => 1,
+              'section_number' => 2,
               'section_up' => {},
               'toplevel_prev' => {},
               'toplevel_up' => {}
@@ -615,15 +614,14 @@ $result_sectioning{'shortcontents'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {},
             {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 3,
+                'section_level' => 1,
+                'section_number' => 3,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -634,7 +632,7 @@ $result_sectioning{'shortcontents'} = {
               'cmdname' => 'unnumbered',
               'extra' => {},
               'structure' => {
-                'level' => 1,
+                'section_level' => 1,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -642,6 +640,7 @@ $result_sectioning{'shortcontents'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_prev' => {},
           'section_up' => {}
         }
@@ -650,26 +649,27 @@ $result_sectioning{'shortcontents'} = {
         'cmdname' => 'appendix',
         'extra' => {},
         'structure' => {
-          'level' => 1,
-          'number' => 'A',
           'section_childs' => [
             {
               'cmdname' => 'appendixsec',
               'extra' => {},
               'structure' => {
-                'level' => 2,
-                'number' => 'A.1',
+                'section_level' => 2,
+                'section_number' => 'A.1',
                 'section_up' => {}
               }
             }
           ],
+          'section_level' => 1,
+          'section_number' => 'A',
           'section_prev' => {},
           'section_up' => {},
           'toplevel_prev' => {},
           'toplevel_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'shortcontents'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'shortcontents'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
diff --git a/tp/t/results/sectioning/top_chapter_sections.pl 
b/tp/t/results/sectioning/top_chapter_sections.pl
index 9b5e1fdbbf..334088a7b3 100644
--- a/tp/t/results/sectioning/top_chapter_sections.pl
+++ b/tp/t/results/sectioning/top_chapter_sections.pl
@@ -520,7 +520,6 @@ unnumbered
 
 $result_sectioning{'top_chapter_sections'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -539,7 +538,7 @@ $result_sectioning{'top_chapter_sections'} = {
                       'extra' => {},
                       'structure' => {
                         'associated_unit' => {},
-                        'level' => 1,
+                        'section_level' => 1,
                         'section_up' => {},
                         'toplevel_prev' => {},
                         'toplevel_up' => {}
@@ -557,8 +556,6 @@ $result_sectioning{'top_chapter_sections'} = {
                             'extra' => {},
                             'structure' => {
                               'associated_unit' => {},
-                              'level' => 1,
-                              'number' => 1,
                               'section_childs' => [
                                 {
                                   'cmdname' => 'section',
@@ -579,8 +576,6 @@ $result_sectioning{'top_chapter_sections'} = {
                                                 'extra' => {},
                                                 'structure' => {
                                                   'associated_unit' => {},
-                                                  'level' => 1,
-                                                  'number' => 2,
                                                   'section_childs' => [
                                                     {
                                                       'cmdname' => 'section',
@@ -601,8 +596,8 @@ $result_sectioning{'top_chapter_sections'} = {
                                                                     'extra' => 
{},
                                                                     
'structure' => {
                                                                       
'associated_unit' => {},
-                                                                      'level' 
=> 1,
-                                                                      'number' 
=> 3,
+                                                                      
'section_level' => 1,
+                                                                      
'section_number' => 3,
                                                                       
'section_prev' => {},
                                                                       
'section_up' => {},
                                                                       
'toplevel_prev' => {},
@@ -619,8 +614,8 @@ $result_sectioning{'top_chapter_sections'} = {
                                                                           
'extra' => {},
                                                                           
'structure' => {
                                                                             
'associated_unit' => {},
-                                                                            
'level' => 3,
-                                                                            
'number' => '2.1.2',
+                                                                            
'section_level' => 3,
+                                                                            
'section_number' => '2.1.2',
                                                                             
'section_prev' => {
                                                                               
'cmdname' => 'subsection',
                                                                               
'extra' => {},
@@ -644,8 +639,8 @@ $result_sectioning{'top_chapter_sections'} = {
                                                                                
   },
                                                                                
   'type' => 'unit'
                                                                                
 },
-                                                                               
 'level' => 3,
-                                                                               
 'number' => '2.1.1',
+                                                                               
 'section_level' => 3,
+                                                                               
 'section_number' => '2.1.1',
                                                                                
 'section_up' => {}
                                                                               }
                                                                             },
@@ -686,16 +681,18 @@ $result_sectioning{'top_chapter_sections'} = {
                                                           },
                                                           'type' => 'unit'
                                                         },
-                                                        'level' => 2,
-                                                        'number' => '2.1',
                                                         'section_childs' => [
                                                           {},
                                                           {}
                                                         ],
+                                                        'section_level' => 2,
+                                                        'section_number' => 
'2.1',
                                                         'section_up' => {}
                                                       }
                                                     }
                                                   ],
+                                                  'section_level' => 1,
+                                                  'section_number' => 2,
                                                   'section_prev' => {},
                                                   'section_up' => {},
                                                   'toplevel_prev' => {},
@@ -728,12 +725,14 @@ $result_sectioning{'top_chapter_sections'} = {
                                       },
                                       'type' => 'unit'
                                     },
-                                    'level' => 2,
-                                    'number' => '1.1',
+                                    'section_level' => 2,
+                                    'section_number' => '1.1',
                                     'section_up' => {}
                                   }
                                 }
                               ],
+                              'section_level' => 1,
+                              'section_number' => 1,
                               'section_prev' => {},
                               'section_up' => {},
                               'toplevel_prev' => {},
@@ -774,17 +773,18 @@ $result_sectioning{'top_chapter_sections'} = {
             },
             'type' => 'unit'
           },
-          'level' => 0,
           'section_childs' => [
             {},
             {},
             {},
             {}
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'top_chapter_sections'}{'structure'}{'section_childs'}[0]{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = $result_sectioning{'top_chapter_sections'}{'structure'}{'section_childs'}[0];
@@ -905,7 +905,7 @@ $result_elements{'top_chapter_sections'} = [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 0
+          'section_level' => 0
         }
       }
     },
@@ -918,7 +918,7 @@ $result_elements{'top_chapter_sections'} = [
               'extra' => {},
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1
+                'section_level' => 1
               }
             }
           },
@@ -933,8 +933,8 @@ $result_elements{'top_chapter_sections'} = [
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1,
-                      'number' => 1
+                      'section_level' => 1,
+                      'section_number' => 1
                     }
                   }
                 },
@@ -949,8 +949,8 @@ $result_elements{'top_chapter_sections'} = [
                           'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1,
-                            'number' => 2
+                            'section_level' => 1,
+                            'section_number' => 2
                           }
                         }
                       },
@@ -963,8 +963,8 @@ $result_elements{'top_chapter_sections'} = [
                                 'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {},
-                                  'level' => 2,
-                                  'number' => '1.1'
+                                  'section_level' => 2,
+                                  'section_number' => '1.1'
                                 }
                               }
                             },
@@ -988,8 +988,8 @@ $result_elements{'top_chapter_sections'} = [
                                 'extra' => {},
                                 'structure' => {
                                   'associated_unit' => {},
-                                  'level' => 1,
-                                  'number' => 3
+                                  'section_level' => 1,
+                                  'section_number' => 3
                                 }
                               }
                             },
@@ -1002,8 +1002,8 @@ $result_elements{'top_chapter_sections'} = [
                                       'extra' => {},
                                       'structure' => {
                                         'associated_unit' => {},
-                                        'level' => 3,
-                                        'number' => '2.1.2'
+                                        'section_level' => 3,
+                                        'section_number' => '2.1.2'
                                       }
                                     }
                                   },
@@ -1016,8 +1016,8 @@ $result_elements{'top_chapter_sections'} = [
                                             'extra' => {},
                                             'structure' => {
                                               'associated_unit' => {},
-                                              'level' => 3,
-                                              'number' => '2.1.1'
+                                              'section_level' => 3,
+                                              'section_number' => '2.1.1'
                                             }
                                           }
                                         },
@@ -1030,8 +1030,8 @@ $result_elements{'top_chapter_sections'} = [
                                                   'extra' => {},
                                                   'structure' => {
                                                     'associated_unit' => {},
-                                                    'level' => 2,
-                                                    'number' => '2.1'
+                                                    'section_level' => 2,
+                                                    'section_number' => '2.1'
                                                   }
                                                 }
                                               },
diff --git a/tp/t/results/sectioning/top_no_argument_and_content.pl 
b/tp/t/results/sectioning/top_no_argument_and_content.pl
index cc887cb15d..2029b80be1 100644
--- a/tp/t/results/sectioning/top_no_argument_and_content.pl
+++ b/tp/t/results/sectioning/top_no_argument_and_content.pl
@@ -74,17 +74,17 @@ A.
 
 $result_sectioning{'top_no_argument_and_content'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
         'extra' => {},
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'top_no_argument_and_content'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'top_no_argument_and_content'};
diff --git a/tp/t/results/sectioning/top_no_argument_and_node.pl 
b/tp/t/results/sectioning/top_no_argument_and_node.pl
index 83dc0298da..d4e1ac3ae1 100644
--- a/tp/t/results/sectioning/top_no_argument_and_node.pl
+++ b/tp/t/results/sectioning/top_no_argument_and_node.pl
@@ -96,7 +96,6 @@ $result_texts{'top_no_argument_and_node'} = '';
 
 $result_sectioning{'top_no_argument_and_node'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -109,11 +108,12 @@ $result_sectioning{'top_no_argument_and_node'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'top_no_argument_and_node'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'top_no_argument_and_node'};
@@ -125,7 +125,7 @@ $result_nodes{'top_no_argument_and_node'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'start'
diff --git a/tp/t/results/sectioning/top_no_argument_and_top_node.pl 
b/tp/t/results/sectioning/top_no_argument_and_top_node.pl
index bee96b69f5..b64a3c27d5 100644
--- a/tp/t/results/sectioning/top_no_argument_and_top_node.pl
+++ b/tp/t/results/sectioning/top_no_argument_and_top_node.pl
@@ -96,7 +96,6 @@ $result_texts{'top_no_argument_and_top_node'} = '';
 
 $result_sectioning{'top_no_argument_and_top_node'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -109,11 +108,12 @@ $result_sectioning{'top_no_argument_and_top_node'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'top_no_argument_and_top_node'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'top_no_argument_and_top_node'};
@@ -125,7 +125,7 @@ $result_nodes{'top_no_argument_and_top_node'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/top_node_part_top.pl 
b/tp/t/results/sectioning/top_node_part_top.pl
index 23ad9d3f2a..6c8747f15b 100644
--- a/tp/t/results/sectioning/top_node_part_top.pl
+++ b/tp/t/results/sectioning/top_node_part_top.pl
@@ -180,7 +180,6 @@ top
 
 $result_sectioning{'top_node_part_top'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'part',
@@ -211,7 +210,7 @@ $result_sectioning{'top_node_part_top'} = {
             },
             'structure' => {
               'associated_unit' => {},
-              'level' => 0,
+              'section_level' => 0,
               'section_prev' => {},
               'section_up' => {}
             }
@@ -219,12 +218,13 @@ $result_sectioning{'top_node_part_top'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       },
       {}
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'top_node_part_top'}{'structure'}{'section_childs'}[0]{'extra'}{'part_associated_section'}{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'top_node_part_top'}{'structure'}{'section_childs'}[0]{'extra'}{'part_associated_section'};
@@ -258,13 +258,13 @@ $result_nodes{'top_node_part_top'} = {
               },
               'type' => 'unit'
             },
-            'level' => 0
+            'section_level' => 0
           }
         }
       },
       'structure' => {
         'associated_unit' => {},
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -294,13 +294,13 @@ $result_menus{'top_node_part_top'} = {
               'extra' => {},
               'structure' => {
                 'associated_unit' => {},
-                'level' => 0
+                'section_level' => 0
               }
             }
           },
           'structure' => {
             'associated_unit' => {},
-            'level' => 0
+            'section_level' => 0
           }
         }
       },
@@ -353,13 +353,13 @@ $result_elements{'top_node_part_top'} = [
             'extra' => {},
             'structure' => {
               'associated_unit' => {},
-              'level' => 0
+              'section_level' => 0
             }
           }
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0
+          'section_level' => 0
         }
       }
     },
diff --git a/tp/t/results/sectioning/top_node_up_url.pl 
b/tp/t/results/sectioning/top_node_up_url.pl
index 45cdcf263c..b35daa93e9 100644
--- a/tp/t/results/sectioning/top_node_up_url.pl
+++ b/tp/t/results/sectioning/top_node_up_url.pl
@@ -329,7 +329,6 @@ $result_texts{'top_node_up_url'} = 'internal top node up
 
 $result_sectioning{'top_node_up_url'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -384,11 +383,12 @@ $result_sectioning{'top_node_up_url'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'top_node_up_url'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'top_node_up_url'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'};
@@ -455,7 +455,7 @@ $result_nodes{'top_node_up_url'} = {
           },
           'type' => 'unit'
         },
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
diff --git a/tp/t/results/sectioning/top_part_chapter.pl 
b/tp/t/results/sectioning/top_part_chapter.pl
index 79d0c20845..a7492cf184 100644
--- a/tp/t/results/sectioning/top_part_chapter.pl
+++ b/tp/t/results/sectioning/top_part_chapter.pl
@@ -177,7 +177,6 @@ part
 
 $result_sectioning{'top_part_chapter'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -201,10 +200,10 @@ $result_sectioning{'top_part_chapter'} = {
                           },
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 0,
                             'section_childs' => [
                               {}
                             ],
+                            'section_level' => 0,
                             'section_prev' => {},
                             'section_up' => {}
                           }
@@ -212,8 +211,8 @@ $result_sectioning{'top_part_chapter'} = {
                       },
                       'structure' => {
                         'associated_unit' => {},
-                        'level' => 1,
-                        'number' => 1,
+                        'section_level' => 1,
+                        'section_number' => 1,
                         'section_up' => {},
                         'toplevel_prev' => {},
                         'toplevel_up' => {}
@@ -238,12 +237,13 @@ $result_sectioning{'top_part_chapter'} = {
             },
             'type' => 'unit'
           },
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       },
       {}
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'top_part_chapter'}{'structure'}{'section_childs'}[0]{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = $result_sectioning{'top_part_chapter'}{'structure'}{'section_childs'}[0];
@@ -281,7 +281,7 @@ $result_elements{'top_part_chapter'} = [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 0
+          'section_level' => 0
         }
       }
     },
@@ -297,14 +297,14 @@ $result_elements{'top_part_chapter'} = [
                   'extra' => {},
                   'structure' => {
                     'associated_unit' => {},
-                    'level' => 0
+                    'section_level' => 0
                   }
                 }
               },
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1,
-                'number' => 1
+                'section_level' => 1,
+                'section_number' => 1
               }
             }
           },
diff --git a/tp/t/results/sectioning/top_without_node_nodes.pl 
b/tp/t/results/sectioning/top_without_node_nodes.pl
index bc6b2a34c2..e129e840ba 100644
--- a/tp/t/results/sectioning/top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/top_without_node_nodes.pl
@@ -250,7 +250,6 @@ Text of chapter
 
 $result_sectioning{'top_without_node_nodes'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -279,7 +278,6 @@ $result_sectioning{'top_without_node_nodes'} = {
             },
             'type' => 'unit'
           },
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -288,18 +286,20 @@ $result_sectioning{'top_without_node_nodes'} = {
               },
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'top_without_node_nodes'}{'structure'}{'section_childs'}[0]{'structure'}{'associated_unit'}{'extra'}{'unit_command'}{'structure'}{'associated_unit'}
 = 
$result_sectioning{'top_without_node_nodes'}{'structure'}{'section_childs'}[0]{'structure'}{'associated_unit'};
@@ -339,8 +339,8 @@ $result_nodes{'top_without_node_nodes'} = {
           },
           'type' => 'unit'
         },
-        'level' => 1,
-        'number' => 1
+        'section_level' => 1,
+        'section_number' => 1
       }
     },
     'normalized' => 'second'
diff --git a/tp/t/results/sectioning/top_without_node_sections.pl 
b/tp/t/results/sectioning/top_without_node_sections.pl
index fe2e98e015..771a6c8119 100644
--- a/tp/t/results/sectioning/top_without_node_sections.pl
+++ b/tp/t/results/sectioning/top_without_node_sections.pl
@@ -259,7 +259,6 @@ Text of chapter
 
 $result_sectioning{'top_without_node_sections'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -288,8 +287,8 @@ $result_sectioning{'top_without_node_sections'} = {
                       },
                       'structure' => {
                         'associated_unit' => {},
-                        'level' => 1,
-                        'number' => 1,
+                        'section_level' => 1,
+                        'section_number' => 1,
                         'section_up' => {},
                         'toplevel_prev' => {},
                         'toplevel_up' => {}
@@ -318,14 +317,15 @@ $result_sectioning{'top_without_node_sections'} = {
             },
             'type' => 'unit'
           },
-          'level' => 0,
           'section_childs' => [
             {}
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'top_without_node_sections'}{'structure'}{'section_childs'}[0]{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'top_without_node_sections'}{'structure'}{'section_childs'}[0];
@@ -365,7 +365,7 @@ $result_nodes{'top_without_node_sections'} = {
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 0
+                      'section_level' => 0
                     }
                   }
                 },
@@ -397,8 +397,8 @@ $result_nodes{'top_without_node_sections'} = {
           },
           'type' => 'unit'
         },
-        'level' => 1,
-        'number' => 1
+        'section_level' => 1,
+        'section_number' => 1
       }
     },
     'normalized' => 'second'
@@ -439,8 +439,8 @@ $result_menus{'top_without_node_sections'} = {
           'extra' => {},
           'structure' => {
             'associated_unit' => {},
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         }
       },
@@ -453,7 +453,7 @@ $result_menus{'top_without_node_sections'} = {
                 'extra' => {},
                 'structure' => {
                   'associated_unit' => {},
-                  'level' => 0
+                  'section_level' => 0
                 }
               }
             },
@@ -512,7 +512,7 @@ $result_elements{'top_without_node_sections'} = [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 0
+          'section_level' => 0
         }
       }
     },
@@ -525,8 +525,8 @@ $result_elements{'top_without_node_sections'} = [
               'extra' => {},
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1,
-                'number' => 1
+                'section_level' => 1,
+                'section_number' => 1
               }
             }
           },
diff --git a/tp/t/results/sectioning/two_nodes_at_the_end.pl 
b/tp/t/results/sectioning/two_nodes_at_the_end.pl
index 04e25b9726..1f17b34838 100644
--- a/tp/t/results/sectioning/two_nodes_at_the_end.pl
+++ b/tp/t/results/sectioning/two_nodes_at_the_end.pl
@@ -710,7 +710,6 @@ in node after chapter 1
 
 $result_sectioning{'two_nodes_at_the_end'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -744,8 +743,8 @@ $result_sectioning{'two_nodes_at_the_end'} = {
                           },
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1,
-                            'number' => 1,
+                            'section_level' => 1,
+                            'section_number' => 1,
                             'section_up' => {},
                             'toplevel_prev' => {},
                             'toplevel_up' => {}
@@ -782,14 +781,15 @@ $result_sectioning{'two_nodes_at_the_end'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0,
           'section_childs' => [
             {}
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'two_nodes_at_the_end'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = $result_sectioning{'two_nodes_at_the_end'}{'structure'}{'section_childs'}[0];
@@ -837,8 +837,8 @@ $result_nodes{'two_nodes_at_the_end'} = {
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1,
-                      'number' => 1
+                      'section_level' => 1,
+                      'section_number' => 1
                     }
                   }
                 },
@@ -867,7 +867,7 @@ $result_nodes{'two_nodes_at_the_end'} = {
           },
           'type' => 'unit'
         },
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -960,7 +960,7 @@ $result_menus{'two_nodes_at_the_end'} = {
           'extra' => {},
           'structure' => {
             'associated_unit' => {},
-            'level' => 0
+            'section_level' => 0
           }
         }
       },
@@ -973,8 +973,8 @@ $result_menus{'two_nodes_at_the_end'} = {
                 'extra' => {},
                 'structure' => {
                   'associated_unit' => {},
-                  'level' => 1,
-                  'number' => 1
+                  'section_level' => 1,
+                  'section_number' => 1
                 }
               }
             },
@@ -1086,7 +1086,7 @@ $result_elements{'two_nodes_at_the_end'} = [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 0
+          'section_level' => 0
         }
       }
     },
@@ -1099,8 +1099,8 @@ $result_elements{'two_nodes_at_the_end'} = [
               'extra' => {},
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1,
-                'number' => 1
+                'section_level' => 1,
+                'section_number' => 1
               }
             }
           },
diff --git a/tp/t/results/sectioning/two_nodes_between_chapters.pl 
b/tp/t/results/sectioning/two_nodes_between_chapters.pl
index 53c98955e4..58fe511b5a 100644
--- a/tp/t/results/sectioning/two_nodes_between_chapters.pl
+++ b/tp/t/results/sectioning/two_nodes_between_chapters.pl
@@ -732,7 +732,6 @@ $result_texts{'two_nodes_between_chapters'} = 'top
 
 $result_sectioning{'two_nodes_between_chapters'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -766,8 +765,8 @@ $result_sectioning{'two_nodes_between_chapters'} = {
                           },
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1,
-                            'number' => 1,
+                            'section_level' => 1,
+                            'section_number' => 1,
                             'section_up' => {},
                             'toplevel_prev' => {},
                             'toplevel_up' => {}
@@ -795,8 +794,8 @@ $result_sectioning{'two_nodes_between_chapters'} = {
                                 },
                                 'structure' => {
                                   'associated_unit' => {},
-                                  'level' => 1,
-                                  'number' => 2,
+                                  'section_level' => 1,
+                                  'section_number' => 2,
                                   'section_prev' => {},
                                   'section_up' => {},
                                   'toplevel_prev' => {},
@@ -848,15 +847,16 @@ $result_sectioning{'two_nodes_between_chapters'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 0,
           'section_childs' => [
             {},
             {}
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'two_nodes_between_chapters'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'two_nodes_between_chapters'}{'structure'}{'section_childs'}[0];
@@ -923,8 +923,8 @@ $result_nodes{'two_nodes_between_chapters'} = {
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1,
-                      'number' => 1
+                      'section_level' => 1,
+                      'section_number' => 1
                     }
                   }
                 },
@@ -939,8 +939,8 @@ $result_nodes{'two_nodes_between_chapters'} = {
                           'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1,
-                            'number' => 2
+                            'section_level' => 1,
+                            'section_number' => 2
                           }
                         }
                       },
@@ -983,7 +983,7 @@ $result_nodes{'two_nodes_between_chapters'} = {
           },
           'type' => 'unit'
         },
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -1091,7 +1091,7 @@ $result_menus{'two_nodes_between_chapters'} = {
           'extra' => {},
           'structure' => {
             'associated_unit' => {},
-            'level' => 0
+            'section_level' => 0
           }
         }
       },
@@ -1104,8 +1104,8 @@ $result_menus{'two_nodes_between_chapters'} = {
                 'extra' => {},
                 'structure' => {
                   'associated_unit' => {},
-                  'level' => 1,
-                  'number' => 1
+                  'section_level' => 1,
+                  'section_number' => 1
                 }
               }
             },
@@ -1120,8 +1120,8 @@ $result_menus{'two_nodes_between_chapters'} = {
                       'extra' => {},
                       'structure' => {
                         'associated_unit' => {},
-                        'level' => 1,
-                        'number' => 2
+                        'section_level' => 1,
+                        'section_number' => 2
                       }
                     }
                   },
@@ -1279,7 +1279,7 @@ $result_elements{'two_nodes_between_chapters'} = [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 0
+          'section_level' => 0
         }
       }
     },
@@ -1292,8 +1292,8 @@ $result_elements{'two_nodes_between_chapters'} = [
               'extra' => {},
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1,
-                'number' => 1
+                'section_level' => 1,
+                'section_number' => 1
               }
             }
           },
@@ -1308,8 +1308,8 @@ $result_elements{'two_nodes_between_chapters'} = [
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1,
-                      'number' => 2
+                      'section_level' => 1,
+                      'section_number' => 2
                     }
                   }
                 },
diff --git a/tp/t/results/sectioning/two_unnumbered_no_argument.pl 
b/tp/t/results/sectioning/two_unnumbered_no_argument.pl
index 931e576250..075c7af40d 100644
--- a/tp/t/results/sectioning/two_unnumbered_no_argument.pl
+++ b/tp/t/results/sectioning/two_unnumbered_no_argument.pl
@@ -78,7 +78,6 @@ $result_texts{'two_unnumbered_no_argument'} = '';
 
 $result_sectioning{'two_unnumbered_no_argument'} = {
   'structure' => {
-    'level' => 0,
     'section_childs' => [
       {
         'cmdname' => 'unnumbered',
@@ -86,7 +85,7 @@ $result_sectioning{'two_unnumbered_no_argument'} = {
           'missing_argument' => 1
         },
         'structure' => {
-          'level' => 1,
+          'section_level' => 1,
           'section_up' => {}
         }
       },
@@ -96,13 +95,14 @@ $result_sectioning{'two_unnumbered_no_argument'} = {
           'missing_argument' => 1
         },
         'structure' => {
-          'level' => 1,
+          'section_level' => 1,
           'section_prev' => {},
           'section_up' => {},
           'toplevel_prev' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 0
   }
 };
 
$result_sectioning{'two_unnumbered_no_argument'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'two_unnumbered_no_argument'};
diff --git a/tp/t/results/sectioning/unnumbered_before_node_top_top.pl 
b/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
index 1cd8e2d51b..bb02d0f7e7 100644
--- a/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
+++ b/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
@@ -217,7 +217,6 @@ Top node
 
 $result_sectioning{'unnumbered_before_node_top_top'} = {
   'structure' => {
-    'level' => 0,
     'section_childs' => [
       {
         'cmdname' => 'unnumbered',
@@ -246,7 +245,7 @@ $result_sectioning{'unnumbered_before_node_top_top'} = {
                       },
                       'structure' => {
                         'associated_unit' => {},
-                        'level' => 1,
+                        'section_level' => 1,
                         'section_prev' => {},
                         'section_up' => {},
                         'toplevel_prev' => {}
@@ -272,12 +271,13 @@ $result_sectioning{'unnumbered_before_node_top_top'} = {
             },
             'type' => 'unit'
           },
-          'level' => 1,
+          'section_level' => 1,
           'section_up' => {}
         }
       },
       {}
-    ]
+    ],
+    'section_level' => 0
   }
 };
 
$result_sectioning{'unnumbered_before_node_top_top'}{'structure'}{'section_childs'}[0]{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'unnumbered_before_node_top_top'}{'structure'}{'section_childs'}[0];
@@ -318,7 +318,7 @@ $result_nodes{'unnumbered_before_node_top_top'} = {
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1
+                      'section_level' => 1
                     }
                   }
                 },
@@ -341,7 +341,7 @@ $result_nodes{'unnumbered_before_node_top_top'} = {
           },
           'type' => 'unit'
         },
-        'level' => 1
+        'section_level' => 1
       }
     },
     'normalized' => 'Top'
@@ -376,7 +376,7 @@ $result_menus{'unnumbered_before_node_top_top'} = {
           'extra' => {},
           'structure' => {
             'associated_unit' => {},
-            'level' => 1
+            'section_level' => 1
           }
         }
       },
@@ -389,7 +389,7 @@ $result_menus{'unnumbered_before_node_top_top'} = {
                 'extra' => {},
                 'structure' => {
                   'associated_unit' => {},
-                  'level' => 1
+                  'section_level' => 1
                 }
               }
             },
@@ -450,7 +450,7 @@ $result_elements{'unnumbered_before_node_top_top'} = [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 1
+          'section_level' => 1
         }
       }
     },
@@ -463,7 +463,7 @@ $result_elements{'unnumbered_before_node_top_top'} = [
               'extra' => {},
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1
+                'section_level' => 1
               }
             }
           },
diff --git a/tp/t/results/sectioning/unnumbered_before_top.pl 
b/tp/t/results/sectioning/unnumbered_before_top.pl
index 3ed70fe822..6e6194211a 100644
--- a/tp/t/results/sectioning/unnumbered_before_top.pl
+++ b/tp/t/results/sectioning/unnumbered_before_top.pl
@@ -104,13 +104,12 @@ top
 
 $result_sectioning{'unnumbered_before_top'} = {
   'structure' => {
-    'level' => 0,
     'section_childs' => [
       {
         'cmdname' => 'unnumbered',
         'extra' => {},
         'structure' => {
-          'level' => 1,
+          'section_level' => 1,
           'section_up' => {}
         }
       },
@@ -118,13 +117,14 @@ $result_sectioning{'unnumbered_before_top'} = {
         'cmdname' => 'top',
         'extra' => {},
         'structure' => {
-          'level' => 1,
+          'section_level' => 1,
           'section_prev' => {},
           'section_up' => {},
           'toplevel_prev' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 0
   }
 };
 
$result_sectioning{'unnumbered_before_top'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'unnumbered_before_top'};
diff --git a/tp/t/results/sectioning/unnumbered_before_top_node.pl 
b/tp/t/results/sectioning/unnumbered_before_top_node.pl
index 90185f647f..b582b3921f 100644
--- a/tp/t/results/sectioning/unnumbered_before_top_node.pl
+++ b/tp/t/results/sectioning/unnumbered_before_top_node.pl
@@ -189,7 +189,6 @@ Title titlefont
 
 $result_sectioning{'unnumbered_before_top_node'} = {
   'structure' => {
-    'level' => 0,
     'section_childs' => [
       {
         'cmdname' => 'unnumbered',
@@ -206,11 +205,12 @@ $result_sectioning{'unnumbered_before_top_node'} = {
             },
             'type' => 'unit'
           },
-          'level' => 1,
+          'section_level' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 0
   }
 };
 
$result_sectioning{'unnumbered_before_top_node'}{'structure'}{'section_childs'}[0]{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'unnumbered_before_top_node'}{'structure'}{'section_childs'}[0];
@@ -230,7 +230,7 @@ $result_nodes{'unnumbered_before_top_node'} = {
           'extra' => {},
           'structure' => {
             'associated_unit' => {},
-            'level' => 1
+            'section_level' => 1
           }
         }
       },
@@ -259,7 +259,7 @@ $result_menus{'unnumbered_before_top_node'} = {
           'extra' => {},
           'structure' => {
             'associated_unit' => {},
-            'level' => 1
+            'section_level' => 1
           }
         }
       },
@@ -289,7 +289,7 @@ $result_elements{'unnumbered_before_top_node'} = [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 1
+          'section_level' => 1
         }
       }
     },
diff --git a/tp/t/results/sectioning/unnumbered_no_argument.pl 
b/tp/t/results/sectioning/unnumbered_no_argument.pl
index 824903cfa7..5b4bd25979 100644
--- a/tp/t/results/sectioning/unnumbered_no_argument.pl
+++ b/tp/t/results/sectioning/unnumbered_no_argument.pl
@@ -51,7 +51,6 @@ $result_texts{'unnumbered_no_argument'} = '';
 
 $result_sectioning{'unnumbered_no_argument'} = {
   'structure' => {
-    'level' => 0,
     'section_childs' => [
       {
         'cmdname' => 'unnumbered',
@@ -59,11 +58,12 @@ $result_sectioning{'unnumbered_no_argument'} = {
           'missing_argument' => 1
         },
         'structure' => {
-          'level' => 1,
+          'section_level' => 1,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 0
   }
 };
 
$result_sectioning{'unnumbered_no_argument'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'unnumbered_no_argument'};
diff --git a/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl 
b/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
index 4fa3063556..27379d272c 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
@@ -421,7 +421,6 @@ Text of chapter
 
 $result_sectioning{'unnumbered_top_without_node_nodes'} = {
   'structure' => {
-    'level' => 0,
     'section_childs' => [
       {
         'cmdname' => 'unnumbered',
@@ -481,7 +480,7 @@ $result_sectioning{'unnumbered_top_without_node_nodes'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 1,
+          'section_level' => 1,
           'section_up' => {}
         }
       },
@@ -490,7 +489,7 @@ $result_sectioning{'unnumbered_top_without_node_nodes'} = {
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 1,
+          'section_level' => 1,
           'section_prev' => {},
           'section_up' => {},
           'toplevel_prev' => {}
@@ -503,15 +502,16 @@ $result_sectioning{'unnumbered_top_without_node_nodes'} = 
{
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 1,
-          'number' => 1,
+          'section_level' => 1,
+          'section_number' => 1,
           'section_prev' => {},
           'section_up' => {},
           'toplevel_prev' => {},
           'toplevel_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => 0
   }
 };
 
$result_sectioning{'unnumbered_top_without_node_nodes'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'unnumbered_top_without_node_nodes'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'};
@@ -562,8 +562,8 @@ $result_nodes{'unnumbered_top_without_node_nodes'} = {
                         'extra' => {},
                         'structure' => {
                           'associated_unit' => {},
-                          'level' => 1,
-                          'number' => 1
+                          'section_level' => 1,
+                          'section_number' => 1
                         }
                       },
                       'normalized' => 'second'
@@ -615,7 +615,7 @@ $result_nodes{'unnumbered_top_without_node_nodes'} = {
           },
           'type' => 'unit'
         },
-        'level' => 1
+        'section_level' => 1
       }
     },
     'normalized' => 'a-node'
diff --git a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl 
b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
index 7161976b2e..1d1f4ce187 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
@@ -430,7 +430,6 @@ Text of chapter
 
 $result_sectioning{'unnumbered_top_without_node_sections'} = {
   'structure' => {
-    'level' => 0,
     'section_childs' => [
       {
         'cmdname' => 'unnumbered',
@@ -454,7 +453,7 @@ $result_sectioning{'unnumbered_top_without_node_sections'} 
= {
                           'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1,
+                            'section_level' => 1,
                             'section_prev' => {},
                             'section_up' => {},
                             'toplevel_prev' => {}
@@ -482,8 +481,8 @@ $result_sectioning{'unnumbered_top_without_node_sections'} 
= {
                                 },
                                 'structure' => {
                                   'associated_unit' => {},
-                                  'level' => 1,
-                                  'number' => 1,
+                                  'section_level' => 1,
+                                  'section_number' => 1,
                                   'section_prev' => {},
                                   'section_up' => {},
                                   'toplevel_prev' => {},
@@ -533,13 +532,14 @@ 
$result_sectioning{'unnumbered_top_without_node_sections'} = {
         },
         'structure' => {
           'associated_unit' => {},
-          'level' => 1,
+          'section_level' => 1,
           'section_up' => {}
         }
       },
       {},
       {}
-    ]
+    ],
+    'section_level' => 0
   }
 };
 
$result_sectioning{'unnumbered_top_without_node_sections'}{'structure'}{'section_childs'}[0]{'extra'}{'associated_node'}{'structure'}{'associated_unit'}{'extra'}{'unit_command'}
 = 
$result_sectioning{'unnumbered_top_without_node_sections'}{'structure'}{'section_childs'}[0];
@@ -595,7 +595,7 @@ $result_nodes{'unnumbered_top_without_node_sections'} = {
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1
+                      'section_level' => 1
                     }
                   }
                 },
@@ -610,8 +610,8 @@ $result_nodes{'unnumbered_top_without_node_sections'} = {
                           'extra' => {},
                           'structure' => {
                             'associated_unit' => {},
-                            'level' => 1,
-                            'number' => 1
+                            'section_level' => 1,
+                            'section_number' => 1
                           }
                         }
                       },
@@ -664,7 +664,7 @@ $result_nodes{'unnumbered_top_without_node_sections'} = {
           },
           'type' => 'unit'
         },
-        'level' => 1
+        'section_level' => 1
       }
     },
     'normalized' => 'a-node'
@@ -715,7 +715,7 @@ $result_menus{'unnumbered_top_without_node_sections'} = {
           'extra' => {},
           'structure' => {
             'associated_unit' => {},
-            'level' => 1
+            'section_level' => 1
           }
         }
       },
@@ -728,7 +728,7 @@ $result_menus{'unnumbered_top_without_node_sections'} = {
                 'extra' => {},
                 'structure' => {
                   'associated_unit' => {},
-                  'level' => 1
+                  'section_level' => 1
                 }
               }
             },
@@ -743,8 +743,8 @@ $result_menus{'unnumbered_top_without_node_sections'} = {
                       'extra' => {},
                       'structure' => {
                         'associated_unit' => {},
-                        'level' => 1,
-                        'number' => 1
+                        'section_level' => 1,
+                        'section_number' => 1
                       }
                     }
                   },
@@ -853,7 +853,7 @@ $result_elements{'unnumbered_top_without_node_sections'} = [
         'extra' => {},
         'structure' => {
           'associated_unit' => {},
-          'level' => 1
+          'section_level' => 1
         }
       }
     },
@@ -866,7 +866,7 @@ $result_elements{'unnumbered_top_without_node_sections'} = [
               'extra' => {},
               'structure' => {
                 'associated_unit' => {},
-                'level' => 1
+                'section_level' => 1
               }
             }
           },
@@ -881,8 +881,8 @@ $result_elements{'unnumbered_top_without_node_sections'} = [
                     'extra' => {},
                     'structure' => {
                       'associated_unit' => {},
-                      'level' => 1,
-                      'number' => 1
+                      'section_level' => 1,
+                      'section_number' => 1
                     }
                   }
                 },
diff --git a/tp/t/results/value/value_in_misc_commands.pl 
b/tp/t/results/value/value_in_misc_commands.pl
index 04229ce2b2..eccf1797d6 100644
--- a/tp/t/results/value/value_in_misc_commands.pl
+++ b/tp/t/results/value/value_in_misc_commands.pl
@@ -3347,7 +3347,6 @@ line after exdent
 
 $result_sectioning{'value_in_misc_commands'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -3361,11 +3360,12 @@ $result_sectioning{'value_in_misc_commands'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'value_in_misc_commands'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'value_in_misc_commands'};
@@ -3377,7 +3377,7 @@ $result_nodes{'value_in_misc_commands'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/value/value_in_node.pl 
b/tp/t/results/value/value_in_node.pl
index 3dab2128e3..384dc5d21d 100644
--- a/tp/t/results/value/value_in_node.pl
+++ b/tp/t/results/value/value_in_node.pl
@@ -871,7 +871,6 @@ Node 1.
 
 $result_sectioning{'value_in_node'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -885,7 +884,6 @@ $result_sectioning{'value_in_node'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -899,18 +897,20 @@ $result_sectioning{'value_in_node'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'value_in_node'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'value_in_node'}{'structure'}{'section_childs'}[0];
@@ -925,7 +925,7 @@ $result_nodes{'value_in_node'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -944,8 +944,8 @@ $result_nodes{'value_in_node'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'menus' => [
diff --git a/tp/t/results/value/value_node_directions.pl 
b/tp/t/results/value/value_node_directions.pl
index 121d3cae27..769de3085f 100644
--- a/tp/t/results/value/value_node_directions.pl
+++ b/tp/t/results/value/value_node_directions.pl
@@ -559,7 +559,6 @@ bar
 
 $result_sectioning{'value_node_directions'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -573,7 +572,6 @@ $result_sectioning{'value_node_directions'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -587,8 +585,8 @@ $result_sectioning{'value_node_directions'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
@@ -606,8 +604,8 @@ $result_sectioning{'value_node_directions'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 2,
+                'section_level' => 1,
+                'section_number' => 2,
                 'section_prev' => {},
                 'section_up' => {},
                 'toplevel_prev' => {},
@@ -615,10 +613,12 @@ $result_sectioning{'value_node_directions'} = {
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'value_node_directions'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'value_node_directions'}{'structure'}{'section_childs'}[0];
@@ -637,7 +637,7 @@ $result_nodes{'value_node_directions'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -650,8 +650,8 @@ $result_nodes{'value_node_directions'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'bar'
@@ -664,8 +664,8 @@ $result_nodes{'value_node_directions'} = {
               'cmdname' => 'chapter',
               'extra' => {},
               'structure' => {
-                'level' => 1,
-                'number' => 2
+                'section_level' => 1,
+                'section_number' => 2
               }
             },
             'normalized' => 'BarFoo'
diff --git a/tp/t/results/xml_tests/image_inline_or_not.pl 
b/tp/t/results/xml_tests/image_inline_or_not.pl
index ef2e09609e..3261b30185 100644
--- a/tp/t/results/xml_tests/image_inline_or_not.pl
+++ b/tp/t/results/xml_tests/image_inline_or_not.pl
@@ -1952,7 +1952,6 @@ in_float
 
 $result_sectioning{'image_inline_or_not'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1966,7 +1965,6 @@ $result_sectioning{'image_inline_or_not'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1980,18 +1978,20 @@ $result_sectioning{'image_inline_or_not'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'image_inline_or_not'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'image_inline_or_not'}{'structure'}{'section_childs'}[0];
@@ -2006,7 +2006,7 @@ $result_nodes{'image_inline_or_not'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'menus' => [
@@ -2025,8 +2025,8 @@ $result_nodes{'image_inline_or_not'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'node_005fimage'
@@ -2093,8 +2093,8 @@ $result_floats{'image_inline_or_not'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'g',
diff --git a/tp/t/results/xtable/block_commands_in_table.pl 
b/tp/t/results/xtable/block_commands_in_table.pl
index c8ea58985d..c8530ac040 100644
--- a/tp/t/results/xtable/block_commands_in_table.pl
+++ b/tp/t/results/xtable/block_commands_in_table.pl
@@ -1632,7 +1632,6 @@ After table.
 
 $result_sectioning{'block_commands_in_table'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -1645,11 +1644,12 @@ $result_sectioning{'block_commands_in_table'} = {
           }
         },
         'structure' => {
-          'level' => 0,
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'block_commands_in_table'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = $result_sectioning{'block_commands_in_table'};
@@ -1661,7 +1661,7 @@ $result_nodes{'block_commands_in_table'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
diff --git a/tp/t/results/xtable/inter_item_commands_in_table.pl 
b/tp/t/results/xtable/inter_item_commands_in_table.pl
index cb9c5844ea..b25441997d 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table.pl
@@ -3025,7 +3025,6 @@ asamp-bb2
 
 $result_sectioning{'inter_item_commands_in_table'} = {
   'structure' => {
-    'level' => -1,
     'section_childs' => [
       {
         'cmdname' => 'top',
@@ -3039,7 +3038,6 @@ $result_sectioning{'inter_item_commands_in_table'} = {
           }
         },
         'structure' => {
-          'level' => 0,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -3053,18 +3051,20 @@ $result_sectioning{'inter_item_commands_in_table'} = {
                 }
               },
               'structure' => {
-                'level' => 1,
-                'number' => 1,
+                'section_level' => 1,
+                'section_number' => 1,
                 'section_up' => {},
                 'toplevel_prev' => {},
                 'toplevel_up' => {}
               }
             }
           ],
+          'section_level' => 0,
           'section_up' => {}
         }
       }
-    ]
+    ],
+    'section_level' => -1
   }
 };
 
$result_sectioning{'inter_item_commands_in_table'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
 = 
$result_sectioning{'inter_item_commands_in_table'}{'structure'}{'section_childs'}[0];
@@ -3079,7 +3079,7 @@ $result_nodes{'inter_item_commands_in_table'} = {
       'cmdname' => 'top',
       'extra' => {},
       'structure' => {
-        'level' => 0
+        'section_level' => 0
       }
     },
     'normalized' => 'Top'
@@ -3092,8 +3092,8 @@ $result_nodes{'inter_item_commands_in_table'} = {
           'cmdname' => 'chapter',
           'extra' => {},
           'structure' => {
-            'level' => 1,
-            'number' => 1
+            'section_level' => 1,
+            'section_number' => 1
           }
         },
         'normalized' => 'chapter'
diff --git a/tp/t/test_utils.pl b/tp/t/test_utils.pl
index 6e9f909453..498642e9c5 100644
--- a/tp/t/test_utils.pl
+++ b/tp/t/test_utils.pl
@@ -474,7 +474,7 @@ my @contents_keys = ('contents', 'args', 'parent',
   'block_command_line_contents', 'spaces_after_command', 
'spaces_before_argument',
   'end_command', 'text_arg', 'command_argument');
 my @menus_keys = ('menu_next', 'menu_up', 'menu_prev', 'menu_up_hash');
-# 'level' 'number'
+# 'section_level' 'section_number'
 my @sections_keys = ('section_next', 'section_prev', 'section_up', 
   'section_childs', 'associated_node', 'part_associated_section', 
   'toplevel_prev', 'toplevel_next', 'toplevel_up');



reply via email to

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