texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: * tp/Texinfo/Convert/Converter.pm (float_type_num


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/Convert/Converter.pm (float_type_number) (float_name_caption), tp/Texinfo/Convert/Plaintext.pm (_convert), tp/Texinfo/Convert/TexinfoXML.pm (_convert), tp/Texinfo/Structuring.pm (number_floats): put float number in structure and rename the key as float_number.
Date: Fri, 31 Dec 2021 13:01:36 -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 850af61daf * tp/Texinfo/Convert/Converter.pm (float_type_number) 
(float_name_caption), tp/Texinfo/Convert/Plaintext.pm (_convert), 
tp/Texinfo/Convert/TexinfoXML.pm (_convert), tp/Texinfo/Structuring.pm 
(number_floats): put float number in structure and rename the key as 
float_number.
850af61daf is described below

commit 850af61daf57db2eaff61c00d35af8fc922cdb1f
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Dec 31 19:01:24 2021 +0100

    * tp/Texinfo/Convert/Converter.pm (float_type_number)
    (float_name_caption), tp/Texinfo/Convert/Plaintext.pm (_convert),
    tp/Texinfo/Convert/TexinfoXML.pm (_convert), tp/Texinfo/Structuring.pm
    (number_floats): put float number in structure and rename the key as
    float_number.
    
    * tp/Texinfo/Convert/DocBook.pm (_convert), tp/Texinfo/Convert/HTML.pm
    (command_text), tp/Texinfo/Convert/Plaintext.pm (format_contents),
    tp/Texinfo/Convert/Utils.pm (numbered_heading),
    tp/Texinfo/Structuring.pm (sectioning_structure),
    tp/init/book.pm (book_element_file_name): put number in structure.
---
 ChangeLog                                          |  14 +
 tp/Texinfo/Convert/Converter.pm                    |  22 +-
 tp/Texinfo/Convert/DocBook.pm                      |   4 +-
 tp/Texinfo/Convert/HTML.pm                         |   8 +-
 tp/Texinfo/Convert/Plaintext.pm                    |   8 +-
 tp/Texinfo/Convert/TexinfoXML.pm                   |   4 +-
 tp/Texinfo/Convert/Utils.pm                        |   5 +-
 tp/Texinfo/Structuring.pm                          |  16 +-
 tp/init/book.pm                                    |   5 +-
 tp/t/results/converters_tests/ref_in_sectioning.pl | 120 ++++----
 tp/t/results/converters_tests/refs_formatting.pl   |  12 +-
 .../some_at_commands_in_ref_nodes.pl               |  12 +-
 .../converters_tests/test_deftypefnnewline.pl      |  12 +-
 .../converters_tests/things_before_setfilename.pl  |  20 +-
 .../things_before_setfilename_no_element.pl        |  20 +-
 tp/t/results/coverage/block_commands.pl            |  10 +-
 .../coverage/punctuation_in_line_commands.pl       |  20 +-
 tp/t/results/coverage_braces/test_image.pl         |  10 +-
 .../coverage_braces/two_footnotes_in_nodes.pl      |  12 +-
 .../two_footnotes_in_nodes_separate.pl             |  12 +-
 .../docbook_tests/multiple_documentlanguage.pl     |  40 +--
 .../docbook_tests/special_docbook_unnumbered.pl    |  12 +-
 tp/t/results/float/anchor_in_caption.pl            |  10 +-
 tp/t/results/float/cindex_in_caption.pl            |  10 +-
 .../results/float/comment_space_comand_in_float.pl |  10 +-
 tp/t/results/float/complex_float.pl                |  36 ++-
 .../float/empty_listoffloats_with_floats.pl        |  32 +-
 tp/t/results/float/float_copying.pl                |  22 +-
 tp/t/results/float/float_with_at_commands.pl       |  10 +-
 tp/t/results/float/footnote_in_caption.pl          |  10 +-
 .../results/float/footnote_in_caption_and_error.pl |  10 +-
 .../float/numbering_captions_listoffloats.pl       | 262 +++++++++++------
 tp/t/results/float/ref_to_float.pl                 |  20 +-
 tp/t/results/float/simple.pl                       |  10 +-
 .../formats_encodings/at_commands_in_refs.pl       | 324 ++++++++++-----------
 .../at_commands_in_refs_latin1.pl                  | 324 ++++++++++-----------
 .../formats_encodings/at_commands_in_refs_utf8.pl  | 324 ++++++++++-----------
 .../char_latin1_latin1_in_refs.pl                  |  60 ++--
 .../formats_encodings/char_latin1_utf8_in_refs.pl  |  60 ++--
 .../char_latin2_latin2_in_refs.pl                  |  12 +-
 .../formats_encodings/japanese_shift_jis.pl        |  24 +-
 tp/t/results/formats_encodings/sample_utf8.pl      |  24 +-
 .../formatting/direntry_dircategory_info_split.pl  |  12 +-
 tp/t/results/formatting/float_copying.pl           |  22 +-
 tp/t/results/formatting/split_nocopying.pl         |  12 +-
 tp/t/results/formatting/split_nocopying_split.pl   |  12 +-
 tp/t/results/formatting/texi_bib_example.pl        |  24 +-
 tp/t/results/formatting/texi_glossary.pl           |  12 +-
 .../character_number_leading_toc_stoc.pl           |   8 +-
 .../html_tests/footnotestyle_separate_late.pl      |  32 +-
 tp/t/results/html_tests/index_below.pl             |  24 +-
 tp/t/results/html_tests/redirection_same_labels.pl |  32 +-
 tp/t/results/html_tests/shortcontents_no_top.pl    |  24 +-
 .../html_tests/test_xrefautomaticsectiontitle.pl   |  12 +-
 .../test_xrefautomaticsectiontitle_off_first.pl    |  12 +-
 .../text_before_top_and_contents_after_title.pl    |   8 +-
 ...t_before_top_and_summarycontents_after_title.pl |   8 +-
 tp/t/results/htmlxref/htmlxref.pl                  |  12 +-
 tp/t/results/htmlxref/htmlxref_nodes.pl            |  12 +-
 tp/t/results/htmlxref/htmlxref_only_mono.pl        |  12 +-
 tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl  |  12 +-
 tp/t/results/htmlxref/htmlxref_only_split.pl       |  12 +-
 tp/t/results/htmlxref/htmlxref_only_split_nodes.pl |  12 +-
 tp/t/results/indices/def_syn_indices.pl            |  12 +-
 tp/t/results/indices/double_seeentry_seealso.pl    |  12 +-
 .../indices/printindex_index_entry_in_copying.pl   |  12 +-
 ...rintindex_index_entry_in_copying_in_footnote.pl |  12 +-
 ...ndex_index_entry_in_copying_no_insertcopying.pl |  12 +-
 tp/t/results/indices/seeentry.pl                   |  12 +-
 tp/t/results/indices/subentries.pl                 |  12 +-
 tp/t/results/indices/subentry_and_sortas.pl        |  12 +-
 tp/t/results/indices/syncode_index_print_both.pl   |  12 +-
 tp/t/results/info_tests/before_node_and_section.pl |  12 +-
 tp/t/results/info_tests/error_in_footnote.pl       |  10 +-
 tp/t/results/info_tests/float_long_captions.pl     |  20 +-
 tp/t/results/info_tests/index_entry_at_end_node.pl |  24 +-
 tp/t/results/info_tests/space_in_menu.pl           |  12 +-
 tp/t/results/info_tests/split_no_copying.pl        |  12 +-
 .../info_tests/split_test_before_first_node.pl     |  12 +-
 .../split_test_before_first_node_no_empty_line.pl  |  12 +-
 tp/t/results/info_tests/test_index.pl              |  56 ++--
 tp/t/results/info_tests/text_before_node.pl        |  12 +-
 .../invalid_nestings/float_in_style_command.pl     |  10 +-
 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   |  16 +-
 .../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   |  12 +-
 .../style_not_closed_root_commands.pl              |  12 +-
 .../unclosed_verb_on_section_line.pl               |   8 +-
 .../itemize/inter_item_commands_in_enumerate.pl    |  12 +-
 .../itemize/inter_item_commands_in_itemize.pl      |  12 +-
 tp/t/results/languages/appendix_translated.pl      |   8 +-
 tp/t/results/languages/multiple_lang_chapters.pl   |  60 ++--
 .../languages/multiple_lang_chapters_latex.pl      |  60 ++--
 .../languages/multiple_lang_chapters_texi2html.pl  |  60 ++--
 .../anchor_links_xref_xrefautomaticsectiontitle.pl |  12 +-
 tp/t/results/latex_tests/custom_headings.pl        |  36 +--
 tp/t/results/latex_tests/float_and_refs.pl         |  62 ++--
 tp/t/results/latex_tests/fonttextsize.pl           |  52 ++--
 tp/t/results/latex_tests/indices.pl                |  12 +-
 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         |  12 +-
 tp/t/results/latex_tests/titlepage_classical.pl    |  12 +-
 tp/t/results/latex_tests/titlepage_in_top_node.pl  |  12 +-
 tp/t/results/latex_tests/titlepage_long_title.pl   |  12 +-
 tp/t/results/latex_tests/titlepage_no_author.pl    |  12 +-
 tp/t/results/latex_tests/titlepage_no_title.pl     |  12 +-
 .../titlepage_with_commands_classical.pl           |  12 +-
 tp/t/results/layout/navigation.pl                  |  36 +--
 tp/t/results/layout/navigation_chapter.pl          |  36 +--
 .../results/layout/navigation_chapter_no_header.pl |  36 +--
 .../navigation_chapter_no_header_vertical.pl       |  36 +--
 tp/t/results/layout/navigation_chapter_vertical.pl |  36 +--
 tp/t/results/layout/navigation_no_header.pl        |  36 +--
 .../layout/navigation_no_header_vertical.pl        |  36 +--
 tp/t/results/layout/navigation_node.pl             |  36 +--
 tp/t/results/layout/navigation_node_no_header.pl   |  36 +--
 .../layout/navigation_node_no_header_vertical.pl   |  36 +--
 tp/t/results/layout/navigation_node_vertical.pl    |  36 +--
 tp/t/results/layout/navigation_section.pl          |  36 +--
 .../results/layout/navigation_section_no_header.pl |  36 +--
 .../navigation_section_no_header_vertical.pl       |  36 +--
 tp/t/results/layout/navigation_section_vertical.pl |  36 +--
 tp/t/results/layout/navigation_vertical.pl         |  36 +--
 tp/t/results/layout/no_monolithic.pl               |  12 +-
 tp/t/results/macro/macro_in_misc_commands.pl       |  12 +-
 tp/t/results/menu/comment_on_menu_line.pl          |  12 +-
 tp/t/results/menu/detailmenu_on_subnodes.pl        |  48 +--
 .../misc_commands/comment_space_command_on_line.pl |  10 +-
 .../no_empty_line_between_headings.pl              |  16 +-
 .../misc_commands/text_before_line_command.pl      |  12 +-
 tp/t/results/morecoverage/formatting_fr.pl         |  44 +--
 tp/t/results/morecoverage/texi_formatting.pl       |  44 +--
 tp/t/results/moreindices/index_no_node.pl          |  16 +-
 tp/t/results/moreindices/index_split.pl            |  84 +++---
 tp/t/results/moreindices/index_split_nodes.pl      |  84 +++---
 .../nodes_before_top_and_sections_monolithic.pl    |   8 +-
 tp/t/results/moreindices/split_chapter_index.pl    |  36 +--
 tp/t/results/moresectioning/equivalent_nodes.pl    |   6 +-
 .../moresectioning/equivalent_nodes_no_node.pl     |   6 +-
 .../moresectioning/more_sections_than_nodes.pl     | 112 +++----
 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 |  18 +-
 tp/t/results/moresectioning/sectioning_frames.pl   |  32 +-
 .../results/moresectioning/top_node_up_explicit.pl |  12 +-
 .../results/moresectioning/top_node_up_implicit.pl |  12 +-
 .../moresectioning/two_footnotes_in_nodes.pl       |  12 +-
 .../two_footnotes_in_nodes_separated.pl            |  12 +-
 tp/t/results/paragraph/commands_in_flushright.pl   |  10 +-
 tp/t/results/plaintext_tests/japanese_utf8.pl      |  24 +-
 .../plaintext_tests/no_empty_line_after_section.pl |  24 +-
 tp/t/results/plaintext_tests/quote_node_names.pl   |  48 +--
 tp/t/results/preformatted/caption_in_example.pl    |   6 +-
 tp/t/results/regions/ref_in_copying.pl             |  12 +-
 tp/t/results/sectioning/anchor_in_footnote.pl      |  12 +-
 .../sectioning/anchor_in_footnote_separate.pl      |  12 +-
 .../sectioning/chapter_before_and_after_part.pl    |  24 +-
 tp/t/results/sectioning/chapter_before_part.pl     |  12 +-
 tp/t/results/sectioning/chapter_between_nodes.pl   |  20 +-
 .../chapter_node_before_and_after_part.pl          |  24 +-
 tp/t/results/sectioning/chapter_sections.pl        |  84 +++---
 .../sectioning/character_and_spaces_in_refs.pl     |  12 +-
 .../sectioning/character_and_spaces_in_refs_out.pl |  16 +-
 tp/t/results/sectioning/complex.pl                 |  44 +--
 tp/t/results/sectioning/complex_split_at_node.pl   |  44 +--
 tp/t/results/sectioning/contents.pl                |  64 ++--
 .../sectioning/contents_and_shortcontents.pl       |  64 ++--
 .../sectioning/contents_at_document_begin.pl       |   8 +-
 .../results/sectioning/contents_at_end_document.pl |   8 +-
 .../contents_at_end_document_after_node.pl         |   8 +-
 tp/t/results/sectioning/contents_in_document.pl    |   8 +-
 tp/t/results/sectioning/contents_in_html_text.pl   |  24 +-
 .../results/sectioning/double_node_anchor_float.pl |  22 +-
 tp/t/results/sectioning/double_part.pl             |  16 +-
 tp/t/results/sectioning/equivalent_labels.pl       |  14 +-
 tp/t/results/sectioning/external_node_in_menu.pl   |  24 +-
 tp/t/results/sectioning/hole_in_sectioning.pl      |  32 +-
 tp/t/results/sectioning/lone_Top_node.pl           |  16 +-
 tp/t/results/sectioning/lowered_subsubsection.pl   |  72 ++---
 tp/t/results/sectioning/loweredheading.pl          |   8 +-
 tp/t/results/sectioning/menutextorder.pl           |  84 +++---
 .../results/sectioning/more_sections_than_nodes.pl | 112 +++----
 tp/t/results/sectioning/next_in_menu_is_below.pl   |  36 +--
 .../results/sectioning/no_argument_and_contents.pl |   8 +-
 tp/t/results/sectioning/no_element.pl              |  10 +-
 tp/t/results/sectioning/no_menu.pl                 |  36 +--
 .../sectioning/node_part_chapter_after_chapter.pl  |  32 +-
 .../sectioning/node_part_chapter_after_top.pl      |  16 +-
 .../node_sectop_before_chapter_no_node.pl          |   8 +-
 .../sectioning/node_sectop_before_lone_node_Top.pl |  12 +-
 tp/t/results/sectioning/nodename_parentheses.pl    |  36 +--
 .../nodes_after_top_before_chapter_nodes.pl        |  16 +-
 .../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     |  16 +-
 .../nodes_after_top_before_section_nodes.pl        |  16 +-
 .../nodes_after_top_before_section_sections.pl     |  16 +-
 tp/t/results/sectioning/nodes_before_after_top.pl  |  12 +-
 .../sectioning/nodes_before_after_top_xref.pl      |  12 +-
 tp/t/results/sectioning/nodes_before_top.pl        |  12 +-
 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     |  12 +-
 tp/t/results/sectioning/part_before_section.pl     |  12 +-
 tp/t/results/sectioning/part_chapter_after_top.pl  |  16 +-
 tp/t/results/sectioning/part_chapter_appendix.pl   |  16 +-
 .../sectioning/part_node_chapter_after_top.pl      |  16 +-
 .../sectioning/part_node_chapter_appendix.pl       |  28 +-
 .../sectioning/part_node_chapter_node_appendix.pl  |  32 +-
 .../sectioning/part_node_node_part_appendix.pl     |  32 +-
 tp/t/results/sectioning/part_node_part_appendix.pl |  28 +-
 .../sectioning/part_node_part_node_appendix.pl     |  32 +-
 .../sectioning/placed_things_before_element.pl     |  18 +-
 .../sectioning/placed_things_before_node.pl        |  10 +-
 tp/t/results/sectioning/raiselowersections.pl      |  60 ++--
 .../sectioning/section_before_after_top_node.pl    |   8 +-
 .../section_before_after_top_node_last_node.pl     |   8 +-
 tp/t/results/sectioning/section_before_chapter.pl  |  16 +-
 tp/t/results/sectioning/section_before_part.pl     |   8 +-
 tp/t/results/sectioning/section_before_top.pl      |  12 +-
 .../sectioning/section_before_top_no_node.pl       |   8 +-
 .../sectioning/section_chapter_before_top.pl       |  16 +-
 .../sectioning/section_chapter_before_top_nodes.pl |  24 +-
 .../sectioning/section_in_unnumbered_info.pl       |  84 +++---
 .../sectioning/section_in_unnumbered_plaintext.pl  |  84 +++---
 .../results/sectioning/section_node_before_part.pl |  12 +-
 .../results/sectioning/sectioning_part_appendix.pl |  96 +++---
 .../sectioning/sectioning_part_appendix_no_top.pl  |  96 +++---
 tp/t/results/sectioning/sections.pl                |   8 +-
 tp/t/results/sectioning/sections_test.pl           |  64 ++--
 .../sectioning/sections_test_no_use_nodes.pl       |  64 ++--
 ...ctions_test_no_use_nodes_use_node_directions.pl |  64 ++--
 tp/t/results/sectioning/semi_auto.pl               |  36 +--
 tp/t/results/sectioning/shortcontents.pl           |  64 ++--
 tp/t/results/sectioning/top_chapter_sections.pl    |  84 +++---
 tp/t/results/sectioning/top_part_chapter.pl        |  12 +-
 tp/t/results/sectioning/top_without_node_nodes.pl  |  16 +-
 .../sectioning/top_without_node_sections.pl        |  16 +-
 tp/t/results/sectioning/two_nodes_at_the_end.pl    |  16 +-
 .../sectioning/two_nodes_between_chapters.pl       |  32 +-
 .../unnumbered_top_without_node_nodes.pl           |  12 +-
 .../unnumbered_top_without_node_sections.pl        |  12 +-
 tp/t/results/value/value_in_node.pl                |  12 +-
 tp/t/results/value/value_node_directions.pl        |  24 +-
 tp/t/results/xml_tests/commands_and_spaces.pl      |  10 +-
 tp/t/results/xml_tests/comments_end_lines.pl       |  10 +-
 .../xml_tests/comments_on_block_command_lines.pl   |  10 +-
 tp/t/results/xml_tests/image_inline_or_not.pl      |  26 +-
 .../results/xtable/inter_item_commands_in_table.pl |  12 +-
 265 files changed, 3805 insertions(+), 3521 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bc8d9b6ce3..eb0099b601 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2021-12-31  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/Converter.pm (float_type_number)
+       (float_name_caption), tp/Texinfo/Convert/Plaintext.pm (_convert),
+       tp/Texinfo/Convert/TexinfoXML.pm (_convert), tp/Texinfo/Structuring.pm
+       (number_floats): put float number in structure and rename the key as
+       float_number.
+
+       * tp/Texinfo/Convert/DocBook.pm (_convert), tp/Texinfo/Convert/HTML.pm
+       (command_text), tp/Texinfo/Convert/Plaintext.pm (format_contents),
+       tp/Texinfo/Convert/Utils.pm (numbered_heading),
+       tp/Texinfo/Structuring.pm (sectioning_structure),
+       tp/init/book.pm (book_element_file_name): put number in structure.
+
 2021-12-31  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Structuring.pm (sectioning_structure)
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index 8ce0590a5f..3963565f4f 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -1011,17 +1011,17 @@ sub float_type_number($$)
 
   my $tree;
   if ($type) {
-    if (defined($float->{'number'})) {
+    if (defined($float->{'structure'}->{'float_number'})) {
       $tree = $self->gdt("{float_type} {float_number}",
           {'float_type' => $type,
-            'float_number' => $float->{'number'}});
+            'float_number' => $float->{'structure'}->{'float_number'}});
     } else {
       $tree = $self->gdt("{float_type}",
           {'float_type' => $type});
     }
-  } elsif (defined($float->{'number'})) {
+  } elsif (defined($float->{'structure'}->{'float_number'})) {
     $tree = $self->gdt("{float_number}",
-       {'float_number' => $float->{'number'}});
+       {'float_number' => $float->{'structure'}->{'float_number'}});
   }
   return $tree;
 }
@@ -1050,31 +1050,31 @@ sub float_name_caption($$)
   my $prepended;
   if ($type) {
     if ($caption) {
-      if (defined($element->{'number'})) {
+      if (defined($element->{'structure'}->{'float_number'})) {
         $prepended = $self->gdt('{float_type} {float_number}: ',
             {'float_type' => $type,
-             'float_number' => $element->{'number'}});
+             'float_number' => $element->{'structure'}->{'float_number'}});
       } else {
         $prepended = $self->gdt('{float_type}: ',
           {'float_type' => $type});
       }
     } else {
-      if (defined($element->{'number'})) {
+      if (defined($element->{'structure'}->{'float_number'})) {
         $prepended = $self->gdt("{float_type} {float_number}\n",
             {'float_type' => $type,
-              'float_number' => $element->{'number'}});
+              'float_number' => $element->{'structure'}->{'float_number'}});
       } else {
         $prepended = $self->gdt("{float_type}\n",
             {'float_type' => $type});
       }
     }
-  } elsif (defined($element->{'number'})) {
+  } elsif (defined($element->{'structure'}->{'float_number'})) {
     if ($caption) {
       $prepended = $self->gdt('{float_number}: ',
-          {'float_number' => $element->{'number'}});
+          {'float_number' => $element->{'structure'}->{'float_number'}});
     } else {
       $prepended = $self->gdt("{float_number}\n",
-           {'float_number' => $element->{'number'}});
+           {'float_number' => $element->{'structure'}->{'float_number'}});
     }
   }
   return ($caption, $prepended);
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index 7b018241e5..b17f18dd15 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -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->{'number'})
+          if (defined($element->{'structure'}->{'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->{'number'};
+            $label = $element->{'structure'}->{'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 bbe6ddcf39..b1ee331af2 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -696,19 +696,21 @@ sub command_text($$;$)
           cluck "No misc_content: "
             .Texinfo::Common::debug_print_element($command);
         }
-        if (defined($command->{'number'})
+        if (defined($command->{'structure'}->{'number'})
             and ($self->get_conf('NUMBER_SECTIONS')
                  or !defined($self->get_conf('NUMBER_SECTIONS')))) {
           if ($command->{'cmdname'} eq 'appendix'
               and $command->{'structure'}->{'level'} == 1) {
             $tree = $self->gdt('Appendix {number} {section_title}',
-                             {'number' => {'text' => $command->{'number'}},
+                             {'number'
+                                => {'text' => 
$command->{'structure'}->{'number'}},
                               'section_title'
                                 => {'contents' 
                                     => 
$command->{'args'}->[0]->{'contents'}}});
           } else {
             $tree = $self->gdt('{number} {section_title}',
-                             {'number' => {'text' => $command->{'number'}},
+                             {'number'
+                                => {'text' => 
$command->{'structure'}->{'number'}},
                               'section_title'
                                 => {'contents' 
                                     => 
$command->{'args'}->[0]->{'contents'}}});
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index effa69c020..207c720b4c 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -1079,18 +1079,18 @@ sub format_contents($$$)
     while ($section) {
       push @{$self->{'count_context'}}, {'lines' => 0, 'bytes' => 0};
       my $section_title_tree;
-      if (defined($section->{'number'}) 
+      if (defined($section->{'structure'}->{'number'})
           and ($self->get_conf('NUMBER_SECTIONS')
                or !defined($self->get_conf('NUMBER_SECTIONS')))) {
         if ($section->{'cmdname'} eq 'appendix'
             and $section->{'structure'}->{'level'} == 1) {
           $section_title_tree = $self->gdt('Appendix {number} {section_title}',
-                           {'number' => {'text' => $section->{'number'}},
+                           {'number' => {'text' => 
$section->{'structure'}->{'number'}},
                             'section_title' 
                               => {'contents' => 
$section->{'args'}->[0]->{'contents'}}});
         } else {
           $section_title_tree = $self->gdt('{number} {section_title}',
-                           {'number' => {'text' => $section->{'number'}},
+                           {'number' => {'text' => 
$section->{'structure'}->{'number'}},
                             'section_title' 
                               => {'contents' => 
$section->{'args'}->[0]->{'contents'}}});
         }
@@ -3205,7 +3205,7 @@ sub _convert($$)
     if ($command eq 'float') {
       if ($element->{'extra'}
           and ($element->{'extra'}->{'type'}->{'normalized'} ne ''
-               or defined($element->{'number'})
+               or defined($element->{'structure'}->{'float_number'})
                or $element->{'extra'}->{'caption'} or 
$element->{'extra'}->{'shortcaption'})) {
         
         $result .= _add_newline_if_needed($self);
diff --git a/tp/Texinfo/Convert/TexinfoXML.pm b/tp/Texinfo/Convert/TexinfoXML.pm
index 3daff0f88f..bcf45dd512 100644
--- a/tp/Texinfo/Convert/TexinfoXML.pm
+++ b/tp/Texinfo/Convert/TexinfoXML.pm
@@ -1312,8 +1312,8 @@ sub _convert($$;$)
             defined($element->{'extra'}->{'type'}->{'normalized'})) {
           push @$attribute, ('type', 
$element->{'extra'}->{'type'}->{'normalized'});
         }
-        if (defined($element->{'number'})) {
-          push @$attribute, ('number', $element->{'number'});
+        if (defined($element->{'structure'}->{'float_number'})) {
+          push @$attribute, ('number', 
$element->{'structure'}->{'float_number'});
         }
       } elsif ($element->{'cmdname'} eq 'verbatim') {
         push @$attribute, ('xml:space', 'preserve');
diff --git a/tp/Texinfo/Convert/Utils.pm b/tp/Texinfo/Convert/Utils.pm
index df12968099..c00d1f1032 100644
--- a/tp/Texinfo/Convert/Utils.pm
+++ b/tp/Texinfo/Convert/Utils.pm
@@ -248,8 +248,9 @@ sub numbered_heading($$$;$)
   my $numbered = shift;
 
   my $number;
-  if (defined($current->{'number'}) and ($numbered or !defined($numbered))) {
-    $number = $current->{'number'};
+  if (defined($current->{'structure'}->{'number'})
+      and ($numbered or !defined($numbered))) {
+    $number = $current->{'structure'}->{'number'};
   }
 
   my $result;
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index 6737792d09..51e8a37a4a 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -270,15 +270,18 @@ sub sectioning_structure($$$)
     if (!$unnumbered_commands{$content->{'cmdname'}}) {
       # construct the number, if not below an unnumbered
       if (!$command_unnumbered[$number_top_level]) {
-        $content->{'number'} = $command_numbers[$number_top_level];
+        my $section_number = $command_numbers[$number_top_level];
         for (my $i = $number_top_level+1; $i <= 
$content->{'structure'}->{'level'}; $i++) {
-          $content->{'number'} .= ".$command_numbers[$i]";
+          $section_number .= ".$command_numbers[$i]";
           # If there is an unnumbered above, then no number is added.
           if ($command_unnumbered[$i]) {
-            delete $content->{'number'};
+            $section_number = undef;
             last;
           }
         }
+        if (defined($section_number)) {
+          $content->{'structure'}->{'number'} = $section_number;
+        }
       }
     }
     $previous_section = $content;
@@ -1348,12 +1351,13 @@ sub number_floats($)
           $up = $up->{'section_up'};
         }
         if (!$unnumbered_commands{$up->{'cmdname'}}) {
-          $nr_in_chapter{$up->{'number'}}++;
-          $number = $up->{'number'} . '.' . $nr_in_chapter{$up->{'number'}};
+          $nr_in_chapter{$up->{'structure'}->{'number'}}++;
+          $number = $up->{'structure'}->{'number'} .
+            '.' . $nr_in_chapter{$up->{'structure'}->{'number'}};
         }
       }
       $number = $float_index if (!defined($number));
-      $float->{'number'} = $number;
+      $float->{'structure'}->{'float_number'} = $number;
     }
   }
 }
diff --git a/tp/init/book.pm b/tp/init/book.pm
index 9f800c84ed..1a2cee2a40 100644
--- a/tp/init/book.pm
+++ b/tp/init/book.pm
@@ -311,8 +311,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->{'number'}) and ($command->{'number'} ne '')) {
-    my $number = $command->{'number'};
+  } elsif (defined($command->{'structure'}->{'number'})
+           and ($command->{'structure'}->{'number'} ne '')) {
+    my $number = $command->{'structure'}->{'number'};
     $number .= '.' unless ($number =~ /\.$/);
     $new_file_name = "${prefix}_$number" . 'html';
   } else {
diff --git a/tp/t/results/converters_tests/ref_in_sectioning.pl 
b/tp/t/results/converters_tests/ref_in_sectioning.pl
index baa2ff4862..2ebea0f8ab 100644
--- a/tp/t/results/converters_tests/ref_in_sectioning.pl
+++ b/tp/t/results/converters_tests/ref_in_sectioning.pl
@@ -573,10 +573,10 @@ $result_trees{'ref_in_sectioning'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -685,10 +685,10 @@ $result_trees{'ref_in_sectioning'} = {
         'line_nr' => 15,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -769,10 +769,10 @@ $result_trees{'ref_in_sectioning'} = {
         'line_nr' => 17,
         'macro' => ''
       },
-      'number' => '2.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '2.1'
       }
     },
     {
@@ -894,10 +894,10 @@ $result_trees{'ref_in_sectioning'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'number' => '2.2',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '2.2'
       }
     },
     {
@@ -1004,10 +1004,10 @@ $result_trees{'ref_in_sectioning'} = {
         'line_nr' => 21,
         'macro' => ''
       },
-      'number' => '2.3',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '2.3'
       }
     },
     {
@@ -1102,10 +1102,10 @@ $result_trees{'ref_in_sectioning'} = {
         'line_nr' => 23,
         'macro' => ''
       },
-      'number' => '2.4',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '2.4'
       }
     },
     {
@@ -1200,10 +1200,10 @@ $result_trees{'ref_in_sectioning'} = {
         'line_nr' => 25,
         'macro' => ''
       },
-      'number' => '2.5',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '2.5'
       }
     },
     {
@@ -1287,10 +1287,10 @@ $result_trees{'ref_in_sectioning'} = {
         'line_nr' => 27,
         'macro' => ''
       },
-      'number' => '2.6',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '2.6'
       }
     },
     {
@@ -1368,10 +1368,10 @@ $result_trees{'ref_in_sectioning'} = {
         'line_nr' => 29,
         'macro' => ''
       },
-      'number' => '2.7',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '2.7'
       }
     },
     {
@@ -1463,10 +1463,10 @@ $result_trees{'ref_in_sectioning'} = {
         'line_nr' => 31,
         'macro' => ''
       },
-      'number' => '2.8',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '2.8'
       }
     },
     {
@@ -1564,10 +1564,10 @@ $result_trees{'ref_in_sectioning'} = {
         'line_nr' => 33,
         'macro' => ''
       },
-      'number' => '2.9',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '2.9'
       }
     },
     {
@@ -1650,10 +1650,10 @@ $result_trees{'ref_in_sectioning'} = {
         'line_nr' => 35,
         'macro' => ''
       },
-      'number' => '2.10',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '2.10'
       }
     },
     {
@@ -1739,10 +1739,10 @@ $result_trees{'ref_in_sectioning'} = {
         'line_nr' => 37,
         'macro' => ''
       },
-      'number' => '2.11',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '2.11'
       }
     },
     {
@@ -1817,10 +1817,10 @@ $result_trees{'ref_in_sectioning'} = {
         'line_nr' => 39,
         'macro' => ''
       },
-      'number' => '2.12',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '2.12'
       }
     }
   ],
@@ -2192,10 +2192,10 @@ $result_sectioning{'ref_in_sectioning'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -2212,17 +2212,16 @@ $result_sectioning{'ref_in_sectioning'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_childs' => [
             {
               'cmdname' => 'section',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '2.1',
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '2.1'
               }
             },
             {
@@ -2230,11 +2229,11 @@ $result_sectioning{'ref_in_sectioning'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '2.2',
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '2.2'
               }
             },
             {
@@ -2242,11 +2241,11 @@ $result_sectioning{'ref_in_sectioning'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '2.3',
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '2.3'
               }
             },
             {
@@ -2254,11 +2253,11 @@ $result_sectioning{'ref_in_sectioning'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '2.4',
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '2.4'
               }
             },
             {
@@ -2266,11 +2265,11 @@ $result_sectioning{'ref_in_sectioning'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '2.5',
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '2.5'
               }
             },
             {
@@ -2278,11 +2277,11 @@ $result_sectioning{'ref_in_sectioning'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '2.6',
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '2.6'
               }
             },
             {
@@ -2290,11 +2289,11 @@ $result_sectioning{'ref_in_sectioning'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '2.7',
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '2.7'
               }
             },
             {
@@ -2302,11 +2301,11 @@ $result_sectioning{'ref_in_sectioning'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '2.8',
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '2.8'
               }
             },
             {
@@ -2314,11 +2313,11 @@ $result_sectioning{'ref_in_sectioning'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '2.9',
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '2.9'
               }
             },
             {
@@ -2326,11 +2325,11 @@ $result_sectioning{'ref_in_sectioning'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '2.10',
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '2.10'
               }
             },
             {
@@ -2338,11 +2337,11 @@ $result_sectioning{'ref_in_sectioning'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '2.11',
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '2.11'
               }
             },
             {
@@ -2350,18 +2349,19 @@ $result_sectioning{'ref_in_sectioning'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '2.12',
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '2.12'
               }
             }
           ],
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -2432,9 +2432,9 @@ $result_nodes{'ref_in_sectioning'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'node',
@@ -2448,9 +2448,9 @@ $result_nodes{'ref_in_sectioning'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            '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 f1aea7b0ef..9b182f08a7 100644
--- a/tp/t/results/converters_tests/refs_formatting.pl
+++ b/tp/t/results/converters_tests/refs_formatting.pl
@@ -3593,10 +3593,10 @@ $result_trees{'refs_formatting'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -4345,10 +4345,10 @@ $result_sectioning{'refs_formatting'} = {
         },
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -4366,9 +4366,9 @@ $result_nodes{'refs_formatting'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        '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 1ef5fd9210..0508bb9a4e 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
@@ -1417,10 +1417,10 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -1723,10 +1723,10 @@ $result_sectioning{'some_at_commands_in_ref_nodes'} = {
             },
             'spaces_before_argument' => '  '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1770,9 +1770,9 @@ $result_nodes{'some_at_commands_in_ref_nodes'} = {
         'extra' => {
           'spaces_before_argument' => '  '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 0aececece3..6c7a690e59 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -2701,10 +2701,10 @@ $result_trees{'test_deftypefnnewline'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -3258,10 +3258,10 @@ $result_sectioning{'test_deftypefnnewline'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -3305,9 +3305,9 @@ $result_nodes{'test_deftypefnnewline'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 ffb74b544d..6ac33f1c9c 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -397,8 +397,10 @@ $result_trees{'things_before_setfilename'} = {
                 'line_nr' => 19,
                 'macro' => ''
               },
-              'number' => 1,
-              'parent' => {}
+              'parent' => {},
+              'structure' => {
+                'float_number' => 1
+              }
             },
             {
               'parent' => {},
@@ -593,8 +595,10 @@ $result_trees{'things_before_setfilename'} = {
                 'line_nr' => 26,
                 'macro' => ''
               },
-              'number' => 1,
-              'parent' => {}
+              'parent' => {},
+              'structure' => {
+                'float_number' => 1
+              }
             },
             {
               'parent' => {},
@@ -1446,7 +1450,9 @@ $result_floats{'things_before_setfilename'} = {
           'normalized' => ''
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ],
   'Text' => [
@@ -1478,7 +1484,9 @@ $result_floats{'things_before_setfilename'} = {
           'normalized' => 'Text'
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ]
 };
diff --git 
a/tp/t/results/converters_tests/things_before_setfilename_no_element.pl 
b/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
index 4672c59e14..5b512c8850 100644
--- a/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
@@ -397,8 +397,10 @@ $result_trees{'things_before_setfilename_no_element'} = {
                 'line_nr' => 19,
                 'macro' => ''
               },
-              'number' => 1,
-              'parent' => {}
+              'parent' => {},
+              'structure' => {
+                'float_number' => 1
+              }
             },
             {
               'parent' => {},
@@ -593,8 +595,10 @@ $result_trees{'things_before_setfilename_no_element'} = {
                 'line_nr' => 26,
                 'macro' => ''
               },
-              'number' => 1,
-              'parent' => {}
+              'parent' => {},
+              'structure' => {
+                'float_number' => 1
+              }
             },
             {
               'parent' => {},
@@ -1300,7 +1304,9 @@ $result_floats{'things_before_setfilename_no_element'} = {
           'normalized' => ''
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ],
   'Text' => [
@@ -1332,7 +1338,9 @@ $result_floats{'things_before_setfilename_no_element'} = {
           'normalized' => 'Text'
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ]
 };
diff --git a/tp/t/results/coverage/block_commands.pl 
b/tp/t/results/coverage/block_commands.pl
index 2c1feb3889..0d05e0f618 100644
--- a/tp/t/results/coverage/block_commands.pl
+++ b/tp/t/results/coverage/block_commands.pl
@@ -320,8 +320,10 @@ $result_trees{'block_commands'} = {
             'line_nr' => 10,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         }
       ],
       'parent' => {},
@@ -444,7 +446,9 @@ $result_floats{'block_commands'} = {
           'normalized' => 'a float'
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ]
 };
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl 
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index 6937e6565c..750221bb43 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -436,8 +436,10 @@ $result_trees{'punctuation_in_line_commands'} = {
             'line_nr' => 14,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         },
         {
           'parent' => {},
@@ -574,8 +576,10 @@ $result_trees{'punctuation_in_line_commands'} = {
             'line_nr' => 19,
             'macro' => ''
           },
-          'number' => 2,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 2
+          }
         },
         {
           'parent' => {},
@@ -1132,7 +1136,9 @@ $result_floats{'punctuation_in_line_commands'} = {
           'normalized' => 'float type! After punc'
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     },
     {
       'cmdname' => 'float',
@@ -1163,7 +1169,9 @@ $result_floats{'punctuation_in_line_commands'} = {
           'normalized' => 'float type! After punc'
         }
       },
-      'number' => 2
+      'structure' => {
+        'float_number' => 2
+      }
     }
   ]
 };
diff --git a/tp/t/results/coverage_braces/test_image.pl 
b/tp/t/results/coverage_braces/test_image.pl
index 385fe1e9ed..9c79b57821 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -2966,8 +2966,10 @@ $result_trees{'test_image'} = {
             'line_nr' => 23,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         },
         {
           'parent' => {},
@@ -3895,7 +3897,9 @@ $result_floats{'test_image'} = {
           'normalized' => 'Image'
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ]
 };
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 004a8d582c..de69add455 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
@@ -547,10 +547,10 @@ $result_trees{'two_footnotes_in_nodes'} = {
         'line_nr' => 17,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -712,10 +712,10 @@ $result_sectioning{'two_footnotes_in_nodes'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -759,9 +759,9 @@ $result_nodes{'two_footnotes_in_nodes'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 b4f6a72dfb..13ccb40488 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
@@ -579,10 +579,10 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
         'line_nr' => 18,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -748,10 +748,10 @@ $result_sectioning{'two_footnotes_in_nodes_separate'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -795,9 +795,9 @@ $result_nodes{'two_footnotes_in_nodes_separate'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 02b959c50a..31d1ad0b38 100644
--- a/tp/t/results/docbook_tests/multiple_documentlanguage.pl
+++ b/tp/t/results/docbook_tests/multiple_documentlanguage.pl
@@ -232,10 +232,10 @@ $result_trees{'multiple_documentlanguage'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -342,10 +342,10 @@ $result_trees{'multiple_documentlanguage'} = {
         'line_nr' => 11,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -452,10 +452,10 @@ $result_trees{'multiple_documentlanguage'} = {
         'line_nr' => 15,
         'macro' => ''
       },
-      'number' => '2.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '2.1'
       }
     },
     {
@@ -533,10 +533,10 @@ $result_trees{'multiple_documentlanguage'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'number' => '2.2',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '2.2'
       }
     }
   ],
@@ -670,10 +670,10 @@ $result_sectioning{'multiple_documentlanguage'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -690,7 +690,6 @@ $result_sectioning{'multiple_documentlanguage'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -704,10 +703,10 @@ $result_sectioning{'multiple_documentlanguage'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '2.1',
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '2.1'
               }
             },
             {
@@ -722,18 +721,19 @@ $result_sectioning{'multiple_documentlanguage'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '2.2',
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '2.2'
               }
             }
           ],
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -784,9 +784,9 @@ $result_nodes{'multiple_documentlanguage'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chap',
@@ -800,9 +800,9 @@ $result_nodes{'multiple_documentlanguage'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            '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 57a18a89b0..cf119c51d2 100644
--- a/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
+++ b/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
@@ -773,10 +773,10 @@ $result_trees{'special_docbook_unnumbered'} = {
         'line_nr' => 29,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -1042,11 +1042,11 @@ $result_sectioning{'special_docbook_unnumbered'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1147,9 +1147,9 @@ $result_nodes{'special_docbook_unnumbered'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => 1,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 1
               }
             },
             'normalized' => 'acknowledgements',
diff --git a/tp/t/results/float/anchor_in_caption.pl 
b/tp/t/results/float/anchor_in_caption.pl
index fd022fe1db..14e5df84f6 100644
--- a/tp/t/results/float/anchor_in_caption.pl
+++ b/tp/t/results/float/anchor_in_caption.pl
@@ -233,8 +233,10 @@ $result_trees{'anchor_in_caption'} = {
             'line_nr' => 5,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         }
       ],
       'extra' => {
@@ -366,7 +368,9 @@ $result_floats{'anchor_in_caption'} = {
           'normalized' => 'fl'
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ]
 };
diff --git a/tp/t/results/float/cindex_in_caption.pl 
b/tp/t/results/float/cindex_in_caption.pl
index a45ff9c185..716fb8cf80 100644
--- a/tp/t/results/float/cindex_in_caption.pl
+++ b/tp/t/results/float/cindex_in_caption.pl
@@ -247,8 +247,10 @@ $result_trees{'cindex_in_caption'} = {
             'line_nr' => 5,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         },
         {
           'parent' => {},
@@ -441,7 +443,9 @@ $result_floats{'cindex_in_caption'} = {
           'normalized' => 'fl'
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ]
 };
diff --git a/tp/t/results/float/comment_space_comand_in_float.pl 
b/tp/t/results/float/comment_space_comand_in_float.pl
index 245ba6faf4..55da6b9ef4 100644
--- a/tp/t/results/float/comment_space_comand_in_float.pl
+++ b/tp/t/results/float/comment_space_comand_in_float.pl
@@ -154,8 +154,10 @@ $result_trees{'comment_space_comand_in_float'} = {
             'line_nr' => 3,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         },
         {
           'parent' => {},
@@ -342,7 +344,9 @@ $result_floats{'comment_space_comand_in_float'} = {
           'normalized' => 'Text @ '
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ]
 };
diff --git a/tp/t/results/float/complex_float.pl 
b/tp/t/results/float/complex_float.pl
index e9040930f8..b472babcb0 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -2472,8 +2472,10 @@ $result_trees{'complex_float'} = {
             'line_nr' => 12,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         },
         {
           'parent' => {},
@@ -3759,8 +3761,10 @@ $result_trees{'complex_float'} = {
             'line_nr' => 94,
             'macro' => ''
           },
-          'number' => '1.1',
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => '1.1'
+          }
         },
         {
           'parent' => {},
@@ -3825,10 +3829,10 @@ $result_trees{'complex_float'} = {
         'line_nr' => 92,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -4593,10 +4597,10 @@ $result_sectioning{'complex_float'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -4640,9 +4644,9 @@ $result_nodes{'complex_float'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
@@ -4741,7 +4745,9 @@ $result_floats{'complex_float'} = {
           'normalized' => 'Text'
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     },
     {
       'cmdname' => 'float',
@@ -4766,9 +4772,9 @@ $result_floats{'complex_float'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           }
         },
         'normalized' => 'float-with-a-lot-of-features-and-no-shortcaption',
@@ -4782,7 +4788,9 @@ $result_floats{'complex_float'} = {
           'normalized' => 'Text'
         }
       },
-      'number' => '1.1'
+      'structure' => {
+        'float_number' => '1.1'
+      }
     }
   ]
 };
diff --git a/tp/t/results/float/empty_listoffloats_with_floats.pl 
b/tp/t/results/float/empty_listoffloats_with_floats.pl
index a3918d792b..500c9d05e8 100644
--- a/tp/t/results/float/empty_listoffloats_with_floats.pl
+++ b/tp/t/results/float/empty_listoffloats_with_floats.pl
@@ -98,8 +98,10 @@ $result_trees{'empty_listoffloats_with_floats'} = {
             'line_nr' => 2,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         },
         {
           'parent' => {},
@@ -227,8 +229,10 @@ $result_trees{'empty_listoffloats_with_floats'} = {
             'line_nr' => 6,
             'macro' => ''
           },
-          'number' => 2,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 2
+          }
         },
         {
           'parent' => {},
@@ -301,7 +305,8 @@ $result_trees{'empty_listoffloats_with_floats'} = {
             'line_nr' => 11,
             'macro' => ''
           },
-          'parent' => {}
+          'parent' => {},
+          'structure' => {}
         },
         {
           'parent' => {},
@@ -411,7 +416,8 @@ $result_trees{'empty_listoffloats_with_floats'} = {
             'line_nr' => 15,
             'macro' => ''
           },
-          'parent' => {}
+          'parent' => {},
+          'structure' => {}
         },
         {
           'parent' => {},
@@ -574,7 +580,9 @@ $result_floats{'empty_listoffloats_with_floats'} = {
           'normalized' => ''
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     },
     {
       'cmdname' => 'float',
@@ -599,7 +607,9 @@ $result_floats{'empty_listoffloats_with_floats'} = {
           'normalized' => ''
         }
       },
-      'number' => 2
+      'structure' => {
+        'float_number' => 2
+      }
     },
     {
       'cmdname' => 'float',
@@ -615,7 +625,8 @@ $result_floats{'empty_listoffloats_with_floats'} = {
         'type' => {
           'normalized' => ''
         }
-      }
+      },
+      'structure' => {}
     },
     {
       'cmdname' => 'float',
@@ -637,7 +648,8 @@ $result_floats{'empty_listoffloats_with_floats'} = {
         'type' => {
           'normalized' => ''
         }
-      }
+      },
+      'structure' => {}
     }
   ]
 };
diff --git a/tp/t/results/float/float_copying.pl 
b/tp/t/results/float/float_copying.pl
index 6ff9dc9000..4d6dcda75a 100644
--- a/tp/t/results/float/float_copying.pl
+++ b/tp/t/results/float/float_copying.pl
@@ -560,8 +560,10 @@ $result_trees{'float_copying'} = {
                 'line_nr' => 3,
                 'macro' => ''
               },
-              'number' => 1,
-              'parent' => {}
+              'parent' => {},
+              'structure' => {
+                'float_number' => 1
+              }
             },
             {
               'args' => [
@@ -1010,10 +1012,10 @@ $result_trees{'float_copying'} = {
         'line_nr' => 36,
         'macro' => ''
       },
-      'number' => 'A',
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 'A'
       }
     }
   ],
@@ -1254,10 +1256,10 @@ $result_sectioning{'float_copying'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 'A',
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 'A'
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1301,9 +1303,9 @@ $result_nodes{'float_copying'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 'A',
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 'A'
         }
       },
       'isindex' => 1,
@@ -1388,7 +1390,9 @@ $result_floats{'float_copying'} = {
           'normalized' => 'Copyright notice'
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ]
 };
diff --git a/tp/t/results/float/float_with_at_commands.pl 
b/tp/t/results/float/float_with_at_commands.pl
index 9c9b78c60f..47d5dcafab 100644
--- a/tp/t/results/float/float_with_at_commands.pl
+++ b/tp/t/results/float/float_with_at_commands.pl
@@ -337,8 +337,10 @@ $result_trees{'float_with_at_commands'} = {
             'line_nr' => 1,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         },
         {
           'parent' => {},
@@ -551,7 +553,9 @@ $result_floats{'float_with_at_commands'} = {
           'normalized' => 'entr@\'ee'
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ]
 };
diff --git a/tp/t/results/float/footnote_in_caption.pl 
b/tp/t/results/float/footnote_in_caption.pl
index 5d6f89b8a2..cf2cb7aa8e 100644
--- a/tp/t/results/float/footnote_in_caption.pl
+++ b/tp/t/results/float/footnote_in_caption.pl
@@ -233,8 +233,10 @@ $result_trees{'footnote_in_caption'} = {
             'line_nr' => 5,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         }
       ],
       'extra' => {
@@ -366,7 +368,9 @@ $result_floats{'footnote_in_caption'} = {
           'normalized' => 'fl'
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ]
 };
diff --git a/tp/t/results/float/footnote_in_caption_and_error.pl 
b/tp/t/results/float/footnote_in_caption_and_error.pl
index b981273050..e85670834d 100644
--- a/tp/t/results/float/footnote_in_caption_and_error.pl
+++ b/tp/t/results/float/footnote_in_caption_and_error.pl
@@ -243,8 +243,10 @@ $result_trees{'footnote_in_caption_and_error'} = {
             'line_nr' => 5,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         }
       ],
       'extra' => {
@@ -387,7 +389,9 @@ $result_floats{'footnote_in_caption_and_error'} = {
           'normalized' => 'fl'
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ]
 };
diff --git a/tp/t/results/float/numbering_captions_listoffloats.pl 
b/tp/t/results/float/numbering_captions_listoffloats.pl
index a2abd0b489..8b8b70cbae 100644
--- a/tp/t/results/float/numbering_captions_listoffloats.pl
+++ b/tp/t/results/float/numbering_captions_listoffloats.pl
@@ -274,8 +274,10 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'line_nr' => 4,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         },
         {
           'parent' => {},
@@ -440,7 +442,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'line_nr' => 10,
             'macro' => ''
           },
-          'parent' => {}
+          'parent' => {},
+          'structure' => {}
         },
         {
           'parent' => {},
@@ -611,8 +614,10 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'line_nr' => 17,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         },
         {
           'parent' => {},
@@ -715,8 +720,10 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'line_nr' => 25,
             'macro' => ''
           },
-          'number' => 2,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 2
+          }
         },
         {
           'parent' => {},
@@ -802,7 +809,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'line_nr' => 31,
             'macro' => ''
           },
-          'parent' => {}
+          'parent' => {},
+          'structure' => {}
         },
         {
           'parent' => {},
@@ -950,7 +958,8 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'line_nr' => 36,
             'macro' => ''
           },
-          'parent' => {}
+          'parent' => {},
+          'structure' => {}
         },
         {
           'parent' => {},
@@ -1121,8 +1130,10 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'line_nr' => 42,
             'macro' => ''
           },
-          'number' => 3,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 3
+          }
         },
         {
           'parent' => {},
@@ -1302,8 +1313,10 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'line_nr' => 49,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         },
         {
           'parent' => {},
@@ -1870,8 +1883,10 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'line_nr' => 67,
             'macro' => ''
           },
-          'number' => '1.1',
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => '1.1'
+          }
         },
         {
           'parent' => {},
@@ -2015,8 +2030,10 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'line_nr' => 73,
             'macro' => ''
           },
-          'number' => '1.2',
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => '1.2'
+          }
         },
         {
           'parent' => {},
@@ -2319,8 +2336,10 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'line_nr' => 77,
             'macro' => ''
           },
-          'number' => '1.1',
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => '1.1'
+          }
         },
         {
           'parent' => {},
@@ -2491,8 +2510,10 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'line_nr' => 83,
             'macro' => ''
           },
-          'number' => '1.1',
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => '1.1'
+          }
         },
         {
           'parent' => {},
@@ -2672,8 +2693,10 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'line_nr' => 90,
             'macro' => ''
           },
-          'number' => '1.1',
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => '1.1'
+          }
         },
         {
           'parent' => {},
@@ -2806,10 +2829,10 @@ $result_trees{'numbering_captions_listoffloats'} = {
         'line_nr' => 65,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -2982,8 +3005,10 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'line_nr' => 104,
             'macro' => ''
           },
-          'number' => '1.3',
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => '1.3'
+          }
         },
         {
           'parent' => {},
@@ -3000,10 +3025,10 @@ $result_trees{'numbering_captions_listoffloats'} = {
         'line_nr' => 102,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -3348,8 +3373,10 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'line_nr' => 116,
             'macro' => ''
           },
-          'number' => 5,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 5
+          }
         },
         {
           'args' => [
@@ -3514,8 +3541,10 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'line_nr' => 121,
             'macro' => ''
           },
-          'number' => 5,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 5
+          }
         },
         {
           'parent' => {},
@@ -3781,8 +3810,10 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'line_nr' => 133,
             'macro' => ''
           },
-          'number' => 6,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 6
+          }
         },
         {
           'parent' => {},
@@ -4146,8 +4177,10 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'line_nr' => 145,
             'macro' => ''
           },
-          'number' => '2.1',
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => '2.1'
+          }
         },
         {
           'parent' => {},
@@ -4164,10 +4197,10 @@ $result_trees{'numbering_captions_listoffloats'} = {
         'line_nr' => 140,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -4402,8 +4435,10 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'line_nr' => 154,
             'macro' => ''
           },
-          'number' => '2.2',
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => '2.2'
+          }
         },
         {
           'parent' => {},
@@ -4574,8 +4609,10 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'line_nr' => 160,
             'macro' => ''
           },
-          'number' => '2.1',
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => '2.1'
+          }
         },
         {
           'parent' => {},
@@ -4835,8 +4872,10 @@ $result_trees{'numbering_captions_listoffloats'} = {
             'line_nr' => 170,
             'macro' => ''
           },
-          'number' => 'A.1',
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 'A.1'
+          }
         },
         {
           'parent' => {},
@@ -4853,10 +4892,10 @@ $result_trees{'numbering_captions_listoffloats'} = {
         'line_nr' => 168,
         'macro' => ''
       },
-      'number' => 'A',
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 'A'
       }
     },
     {
@@ -6783,7 +6822,6 @@ $result_sectioning{'numbering_captions_listoffloats'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -6797,16 +6835,17 @@ $result_sectioning{'numbering_captions_listoffloats'} = 
{
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -6862,7 +6901,6 @@ $result_sectioning{'numbering_captions_listoffloats'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_childs' => [
             {
               'cmdname' => 'unnumberedsec',
@@ -6885,7 +6923,8 @@ $result_sectioning{'numbering_captions_listoffloats'} = {
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -6902,11 +6941,11 @@ $result_sectioning{'numbering_captions_listoffloats'} = 
{
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 'A',
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 'A'
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -6989,9 +7028,9 @@ $result_nodes{'numbering_captions_listoffloats'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
@@ -7005,9 +7044,9 @@ $result_nodes{'numbering_captions_listoffloats'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         'normalized' => 'section',
@@ -7085,9 +7124,9 @@ $result_nodes{'numbering_captions_listoffloats'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => 2,
             'structure' => {
-              'level' => 1
+              'level' => 1,
+              'number' => 2
             }
           },
           'normalized' => 'Chapter-with-unnumbsubsec',
@@ -7133,9 +7172,9 @@ $result_nodes{'numbering_captions_listoffloats'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => 'A',
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 'A'
               }
             },
             'normalized' => 'Appendix-for-float',
@@ -7358,7 +7397,9 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => ''
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     },
     {
       'cmdname' => 'float',
@@ -7378,7 +7419,9 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => ''
         }
       },
-      'number' => 2
+      'structure' => {
+        'float_number' => 2
+      }
     },
     {
       'cmdname' => 'float',
@@ -7395,7 +7438,8 @@ $result_floats{'numbering_captions_listoffloats'} = {
         'type' => {
           'normalized' => ''
         }
-      }
+      },
+      'structure' => {}
     },
     {
       'cmdname' => 'float',
@@ -7424,7 +7468,8 @@ $result_floats{'numbering_captions_listoffloats'} = {
         'type' => {
           'normalized' => ''
         }
-      }
+      },
+      'structure' => {}
     },
     {
       'cmdname' => 'float',
@@ -7456,7 +7501,9 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => ''
         }
       },
-      'number' => 3
+      'structure' => {
+        'float_number' => 3
+      }
     },
     {
       'cmdname' => 'float',
@@ -7480,9 +7527,9 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           }
         },
         'normalized' => 'label-but-no-type-in-chapter',
@@ -7497,7 +7544,9 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => ''
         }
       },
-      'number' => '1.1'
+      'structure' => {
+        'float_number' => '1.1'
+      }
     },
     {
       'cmdname' => 'float',
@@ -7537,7 +7586,9 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => ''
         }
       },
-      'number' => 5
+      'structure' => {
+        'float_number' => 5
+      }
     },
     {
       'cmdname' => 'float',
@@ -7577,7 +7628,9 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => ''
         }
       },
-      'number' => '2.1'
+      'structure' => {
+        'float_number' => '2.1'
+      }
     }
   ],
   'Text' => [
@@ -7617,7 +7670,9 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => 'Text'
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     },
     {
       'cmdname' => 'float',
@@ -7652,7 +7707,8 @@ $result_floats{'numbering_captions_listoffloats'} = {
           ],
           'normalized' => 'Text'
         }
-      }
+      },
+      'structure' => {}
     },
     {
       'cmdname' => 'float',
@@ -7683,7 +7739,9 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => 'Text'
         }
       },
-      'number' => '1.1'
+      'structure' => {
+        'float_number' => '1.1'
+      }
     },
     {
       'cmdname' => 'float',
@@ -7715,7 +7773,9 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => 'Text'
         }
       },
-      'number' => '1.2'
+      'structure' => {
+        'float_number' => '1.2'
+      }
     },
     {
       'cmdname' => 'float',
@@ -7733,9 +7793,9 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         'normalized' => 'text-in-section',
@@ -7749,7 +7809,9 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => 'Text'
         }
       },
-      'number' => '1.3'
+      'structure' => {
+        'float_number' => '1.3'
+      }
     },
     {
       'cmdname' => 'float',
@@ -7786,7 +7848,9 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => 'Text'
         }
       },
-      'number' => 5
+      'structure' => {
+        'float_number' => 5
+      }
     },
     {
       'cmdname' => 'float',
@@ -7831,7 +7895,9 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => 'Text'
         }
       },
-      'number' => 6
+      'structure' => {
+        'float_number' => 6
+      }
     },
     {
       'cmdname' => 'float',
@@ -7855,9 +7921,9 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           }
         },
         'normalized' => 'Chapter-with-subsec-float',
@@ -7877,7 +7943,9 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => 'Text'
         }
       },
-      'number' => '2.1'
+      'structure' => {
+        'float_number' => '2.1'
+      }
     },
     {
       'cmdname' => 'float',
@@ -7914,7 +7982,9 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => 'Text'
         }
       },
-      'number' => '2.2'
+      'structure' => {
+        'float_number' => '2.2'
+      }
     },
     {
       'cmdname' => 'float',
@@ -7938,9 +8008,9 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 'A',
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 'A'
           }
         },
         'normalized' => 'appendix-sec-float',
@@ -7960,7 +8030,9 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => 'Text'
         }
       },
-      'number' => 'A.1'
+      'structure' => {
+        'float_number' => 'A.1'
+      }
     }
   ],
   'Warning' => [
@@ -7999,7 +8071,9 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => 'Warning'
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     },
     {
       'cmdname' => 'float',
@@ -8036,7 +8110,9 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => 'Warning'
         }
       },
-      'number' => '1.1'
+      'structure' => {
+        'float_number' => '1.1'
+      }
     }
   ],
   'th@\'eor@`eme' => [
@@ -8081,7 +8157,9 @@ $result_floats{'numbering_captions_listoffloats'} = {
           'normalized' => 'th@\'eor@`eme'
         }
       },
-      'number' => '1.1'
+      'structure' => {
+        'float_number' => '1.1'
+      }
     }
   ]
 };
diff --git a/tp/t/results/float/ref_to_float.pl 
b/tp/t/results/float/ref_to_float.pl
index cd870cd0b4..738377af2c 100644
--- a/tp/t/results/float/ref_to_float.pl
+++ b/tp/t/results/float/ref_to_float.pl
@@ -100,8 +100,10 @@ $result_trees{'ref_to_float'} = {
             'line_nr' => 1,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         },
         {
           'parent' => {},
@@ -192,8 +194,10 @@ $result_trees{'ref_to_float'} = {
             'line_nr' => 5,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         },
         {
           'parent' => {},
@@ -388,7 +392,9 @@ $result_floats{'ref_to_float'} = {
           'normalized' => ''
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ],
   'Text' => [
@@ -414,7 +420,9 @@ $result_floats{'ref_to_float'} = {
           'normalized' => 'Text'
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ]
 };
diff --git a/tp/t/results/float/simple.pl b/tp/t/results/float/simple.pl
index fc26325e9b..024da51910 100644
--- a/tp/t/results/float/simple.pl
+++ b/tp/t/results/float/simple.pl
@@ -139,8 +139,10 @@ $result_trees{'simple'} = {
             'line_nr' => 1,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         }
       ],
       'parent' => {},
@@ -218,7 +220,9 @@ $result_floats{'simple'} = {
           'normalized' => 'Type'
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ]
 };
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 8356d73408..46a4b12e2d 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -4884,10 +4884,10 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 35,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -5125,10 +5125,10 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 38,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -5416,10 +5416,10 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 41,
         'macro' => ''
       },
-      'number' => 3,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 3
       }
     },
     {
@@ -5799,10 +5799,10 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 44,
         'macro' => ''
       },
-      'number' => 4,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 4
       }
     },
     {
@@ -6136,10 +6136,10 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 47,
         'macro' => ''
       },
-      'number' => 5,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 5
       }
     },
     {
@@ -6335,10 +6335,10 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 50,
         'macro' => ''
       },
-      'number' => 6,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 6
       }
     },
     {
@@ -6718,10 +6718,10 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 53,
         'macro' => ''
       },
-      'number' => 7,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 7
       }
     },
     {
@@ -7009,10 +7009,10 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 56,
         'macro' => ''
       },
-      'number' => 8,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 8
       }
     },
     {
@@ -7714,10 +7714,10 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 59,
         'macro' => ''
       },
-      'number' => 9,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 9
       }
     },
     {
@@ -8427,10 +8427,10 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 62,
         'macro' => ''
       },
-      'number' => 10,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 10
       }
     },
     {
@@ -8880,10 +8880,10 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 65,
         'macro' => ''
       },
-      'number' => 11,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 11
       }
     },
     {
@@ -9181,10 +9181,10 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 68,
         'macro' => ''
       },
-      'number' => 12,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 12
       }
     },
     {
@@ -9518,10 +9518,10 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 71,
         'macro' => ''
       },
-      'number' => 13,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 13
       }
     },
     {
@@ -9855,10 +9855,10 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 74,
         'macro' => ''
       },
-      'number' => 14,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 14
       }
     },
     {
@@ -9936,10 +9936,10 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 77,
         'macro' => ''
       },
-      'number' => 15,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 15
       }
     },
     {
@@ -10203,10 +10203,10 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 80,
         'macro' => ''
       },
-      'number' => 16,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 16
       }
     },
     {
@@ -10470,10 +10470,10 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 84,
         'macro' => ''
       },
-      'number' => 17,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 17
       }
     },
     {
@@ -10701,10 +10701,10 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 88,
         'macro' => ''
       },
-      'number' => 18,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 18
       }
     },
     {
@@ -10966,10 +10966,10 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 92,
         'macro' => ''
       },
-      'number' => 19,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 19
       }
     },
     {
@@ -11091,10 +11091,10 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 97,
         'macro' => ''
       },
-      'number' => 20,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 20
       }
     },
     {
@@ -11760,10 +11760,10 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 101,
         'macro' => ''
       },
-      'number' => 21,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 21
       }
     },
     {
@@ -12257,10 +12257,10 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 104,
         'macro' => ''
       },
-      'number' => 22,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 22
       }
     },
     {
@@ -12384,10 +12384,10 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 107,
         'macro' => ''
       },
-      'number' => 23,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 23
       }
     },
     {
@@ -12557,10 +12557,10 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 110,
         'macro' => ''
       },
-      'number' => 24,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 24
       }
     },
     {
@@ -12674,10 +12674,10 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 113,
         'macro' => ''
       },
-      'number' => 25,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 25
       }
     },
     {
@@ -12847,10 +12847,10 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 116,
         'macro' => ''
       },
-      'number' => 26,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 26
       }
     },
     {
@@ -17519,10 +17519,10 @@ $result_trees{'at_commands_in_refs'} = {
         'line_nr' => 119,
         'macro' => ''
       },
-      'number' => 27,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 27
       }
     },
     {
@@ -21158,10 +21158,10 @@ $result_sectioning{'at_commands_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21178,11 +21178,11 @@ $result_sectioning{'at_commands_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21199,11 +21199,11 @@ $result_sectioning{'at_commands_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 3,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 3
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21220,11 +21220,11 @@ $result_sectioning{'at_commands_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 4,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 4
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21241,11 +21241,11 @@ $result_sectioning{'at_commands_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 5,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 5
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21262,11 +21262,11 @@ $result_sectioning{'at_commands_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 6,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 6
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21283,11 +21283,11 @@ $result_sectioning{'at_commands_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 7,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 7
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21304,11 +21304,11 @@ $result_sectioning{'at_commands_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 8,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 8
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21325,11 +21325,11 @@ $result_sectioning{'at_commands_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 9,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 9
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21346,11 +21346,11 @@ $result_sectioning{'at_commands_in_refs'} = {
             },
             'spaces_before_argument' => '  '
           },
-          'number' => 10,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 10
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21367,11 +21367,11 @@ $result_sectioning{'at_commands_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 11,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 11
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21388,11 +21388,11 @@ $result_sectioning{'at_commands_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 12,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 12
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21409,11 +21409,11 @@ $result_sectioning{'at_commands_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 13,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 13
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21430,11 +21430,11 @@ $result_sectioning{'at_commands_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 14,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 14
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21451,11 +21451,11 @@ $result_sectioning{'at_commands_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 15,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 15
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21472,11 +21472,11 @@ $result_sectioning{'at_commands_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 16,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 16
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21493,11 +21493,11 @@ $result_sectioning{'at_commands_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 17,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 17
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21514,11 +21514,11 @@ $result_sectioning{'at_commands_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 18,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 18
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21535,11 +21535,11 @@ $result_sectioning{'at_commands_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 19,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 19
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21556,11 +21556,11 @@ $result_sectioning{'at_commands_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 20,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 20
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21577,11 +21577,11 @@ $result_sectioning{'at_commands_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 21,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 21
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21598,11 +21598,11 @@ $result_sectioning{'at_commands_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 22,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 22
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21619,11 +21619,11 @@ $result_sectioning{'at_commands_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 23,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 23
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21640,11 +21640,11 @@ $result_sectioning{'at_commands_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 24,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 24
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21661,11 +21661,11 @@ $result_sectioning{'at_commands_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 25,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 25
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21682,11 +21682,11 @@ $result_sectioning{'at_commands_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 26,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 26
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21703,11 +21703,11 @@ $result_sectioning{'at_commands_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 27,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 27
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21855,9 +21855,9 @@ $result_nodes{'at_commands_in_refs'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => '-_007b-_007d',
@@ -21871,9 +21871,9 @@ $result_nodes{'at_commands_in_refs'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           }
         },
         'normalized' => '----_0021---_002e--_002e-_003f-_0040',
@@ -21887,9 +21887,9 @@ $result_nodes{'at_commands_in_refs'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => 3,
             'structure' => {
-              'level' => 1
+              'level' => 1,
+              'number' => 3
             }
           },
           'normalized' => '_0040-_007b-_007d-_005c-_0023',
@@ -21903,9 +21903,9 @@ $result_nodes{'at_commands_in_refs'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => 4,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 4
               }
             },
             'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
@@ -21919,9 +21919,9 @@ $result_nodes{'at_commands_in_refs'} = {
                 'extra' => {
                   'spaces_before_argument' => ' '
                 },
-                'number' => 5,
                 'structure' => {
-                  'level' => 1
+                  'level' => 1,
+                  'number' => 5
                 }
               },
               'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
@@ -21935,9 +21935,9 @@ $result_nodes{'at_commands_in_refs'} = {
                   'extra' => {
                     'spaces_before_argument' => ' '
                   },
-                  'number' => 6,
                   'structure' => {
-                    'level' => 1
+                    'level' => 1,
+                    'number' => 6
                   }
                 },
                 'normalized' => '_2265-_2264-_2192',
@@ -21951,9 +21951,9 @@ $result_nodes{'at_commands_in_refs'} = {
                     'extra' => {
                       'spaces_before_argument' => ' '
                     },
-                    'number' => 7,
                     'structure' => {
-                      'level' => 1
+                      'level' => 1,
+                      'number' => 7
                     }
                   },
                   'normalized' => '_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae',
@@ -21967,9 +21967,9 @@ $result_nodes{'at_commands_in_refs'} = {
                       'extra' => {
                         'spaces_before_argument' => ' '
                       },
-                      'number' => 8,
                       'structure' => {
-                        'level' => 1
+                        'level' => 1,
+                        'number' => 8
                       }
                     },
                     'normalized' => '_21d2-_00b0-a-b--_00e5',
@@ -21983,9 +21983,9 @@ $result_nodes{'at_commands_in_refs'} = {
                         'extra' => {
                           'spaces_before_argument' => ' '
                         },
-                        'number' => 9,
                         'structure' => {
-                          'level' => 1
+                          'level' => 1,
+                          'number' => 9
                         }
                       },
                       'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
@@ -21999,9 +21999,9 @@ $result_nodes{'at_commands_in_refs'} = {
                           'extra' => {
                             'spaces_before_argument' => '  '
                           },
-                          'number' => 10,
                           'structure' => {
-                            'level' => 1
+                            'level' => 1,
+                            'number' => 10
                           }
                         },
                         'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
@@ -22015,9 +22015,9 @@ $result_nodes{'at_commands_in_refs'} = {
                             'extra' => {
                               'spaces_before_argument' => ' '
                             },
-                            'number' => 11,
                             'structure' => {
-                              'level' => 1
+                              'level' => 1,
+                              'number' => 11
                             }
                           },
                           'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
@@ -22031,9 +22031,9 @@ $result_nodes{'at_commands_in_refs'} = {
                               'extra' => {
                                 'spaces_before_argument' => ' '
                               },
-                              'number' => 12,
                               'structure' => {
-                                'level' => 1
+                                'level' => 1,
+                                'number' => 12
                               }
                             },
                             'normalized' => '_0131-_1e14-_1e08',
@@ -22047,9 +22047,9 @@ $result_nodes{'at_commands_in_refs'} = {
                                 'extra' => {
                                   'spaces_before_argument' => ' '
                                 },
-                                'number' => 13,
                                 'structure' => {
-                                  'level' => 1
+                                  'level' => 1,
+                                  'number' => 13
                                 }
                               },
                               'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a',
@@ -22063,9 +22063,9 @@ $result_nodes{'at_commands_in_refs'} = {
                                   'extra' => {
                                     'spaces_before_argument' => ' '
                                   },
-                                  'number' => 14,
                                   'structure' => {
-                                    'level' => 1
+                                    'level' => 1,
+                                    'number' => 14
                                   }
                                 },
                                 'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a',
@@ -22079,9 +22079,9 @@ $result_nodes{'at_commands_in_refs'} = {
                                     'extra' => {
                                       'spaces_before_argument' => ' '
                                     },
-                                    'number' => 15,
                                     'structure' => {
-                                      'level' => 1
+                                      'level' => 1,
+                                      'number' => 15
                                     }
                                   },
                                   'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
@@ -22095,9 +22095,9 @@ $result_nodes{'at_commands_in_refs'} = {
                                       'extra' => {
                                         'spaces_before_argument' => ' '
                                       },
-                                      'number' => 16,
                                       'structure' => {
-                                        'level' => 1
+                                        'level' => 1,
+                                        'number' => 16
                                       }
                                     },
                                     'normalized' => 'AAA-AAA-BBB',
@@ -22111,9 +22111,9 @@ $result_nodes{'at_commands_in_refs'} = {
                                         'extra' => {
                                           'spaces_before_argument' => ' '
                                         },
-                                        'number' => 17,
                                         'structure' => {
-                                          'level' => 1
+                                          'level' => 1,
+                                          'number' => 17
                                         }
                                       },
                                       'normalized' => 'CCC-CCC-DDD',
@@ -22127,9 +22127,9 @@ $result_nodes{'at_commands_in_refs'} = {
                                           'extra' => {
                                             'spaces_before_argument' => ' '
                                           },
-                                          'number' => 18,
                                           'structure' => {
-                                            'level' => 1
+                                            'level' => 1,
+                                            'number' => 18
                                           }
                                         },
                                         'normalized' => 
'someone_0040somewher-no_005fexplain_0040there',
@@ -22143,9 +22143,9 @@ $result_nodes{'at_commands_in_refs'} = {
                                             'extra' => {
                                               'spaces_before_argument' => ' '
                                             },
-                                            'number' => 19,
                                             'structure' => {
-                                              'level' => 1
+                                              'level' => 1,
+                                              'number' => 19
                                             }
                                           },
                                           'normalized' => 
'f_002d_002dile1-f_002d_002dile',
@@ -22159,9 +22159,9 @@ $result_nodes{'at_commands_in_refs'} = {
                                               'extra' => {
                                                 'spaces_before_argument' => ' '
                                               },
-                                              'number' => 20,
                                               'structure' => {
-                                                'level' => 1
+                                                'level' => 1,
+                                                'number' => 20
                                               }
                                             },
                                             'normalized' => 
'-_0040-_007b_007d-_002e-',
@@ -22175,9 +22175,9 @@ $result_nodes{'at_commands_in_refs'} = {
                                                 'extra' => {
                                                   'spaces_before_argument' => 
' '
                                                 },
-                                                'number' => 21,
                                                 'structure' => {
-                                                  'level' => 1
+                                                  'level' => 1,
+                                                  'number' => 21
                                                 }
                                               },
                                               'normalized' => 
'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
@@ -22191,9 +22191,9 @@ $result_nodes{'at_commands_in_refs'} = {
                                                   'extra' => {
                                                     'spaces_before_argument' 
=> ' '
                                                   },
-                                                  'number' => 22,
                                                   'structure' => {
-                                                    'level' => 1
+                                                    'level' => 1,
+                                                    'number' => 22
                                                   }
                                                 },
                                                 'normalized' => 
'env-code-option-samp-command-file-C_002dx-ESC',
@@ -22207,9 +22207,9 @@ $result_nodes{'at_commands_in_refs'} = {
                                                     'extra' => {
                                                       'spaces_before_argument' 
=> ' '
                                                     },
-                                                    'number' => 23,
                                                     'structure' => {
-                                                      'level' => 1
+                                                      'level' => 1,
+                                                      'number' => 23
                                                     }
                                                   },
                                                   'normalized' => '8_002e27in',
@@ -22223,9 +22223,9 @@ $result_nodes{'at_commands_in_refs'} = {
                                                       'extra' => {
                                                         
'spaces_before_argument' => ' '
                                                       },
-                                                      'number' => 24,
                                                       'structure' => {
-                                                        'level' => 1
+                                                        'level' => 1,
+                                                        'number' => 24
                                                       }
                                                     },
                                                     'normalized' => 
'sansserif-slanted',
@@ -22239,9 +22239,9 @@ $result_nodes{'at_commands_in_refs'} = {
                                                         'extra' => {
                                                           
'spaces_before_argument' => ' '
                                                         },
-                                                        'number' => 25,
                                                         'structure' => {
-                                                          'level' => 1
+                                                          'level' => 1,
+                                                          'number' => 25
                                                         }
                                                       },
                                                       'normalized' => 
'indicateurl',
@@ -22255,9 +22255,9 @@ $result_nodes{'at_commands_in_refs'} = {
                                                           'extra' => {
                                                             
'spaces_before_argument' => ' '
                                                           },
-                                                          'number' => 26,
                                                           'structure' => {
-                                                            'level' => 1
+                                                            'level' => 1,
+                                                            'number' => 26
                                                           }
                                                         },
                                                         'normalized' => 
'gH-3rd',
@@ -22271,9 +22271,9 @@ $result_nodes{'at_commands_in_refs'} = {
                                                             'extra' => {
                                                               
'spaces_before_argument' => ' '
                                                             },
-                                                            'number' => 27,
                                                             'structure' => {
-                                                              'level' => 1
+                                                              'level' => 1,
+                                                              '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 7789e67561..e151e5e7d1 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
@@ -4951,10 +4951,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 38,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -5192,10 +5192,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 41,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -5483,10 +5483,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 44,
         'macro' => ''
       },
-      'number' => 3,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 3
       }
     },
     {
@@ -5866,10 +5866,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 47,
         'macro' => ''
       },
-      'number' => 4,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 4
       }
     },
     {
@@ -6203,10 +6203,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 50,
         'macro' => ''
       },
-      'number' => 5,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 5
       }
     },
     {
@@ -6402,10 +6402,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 53,
         'macro' => ''
       },
-      'number' => 6,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 6
       }
     },
     {
@@ -6785,10 +6785,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 56,
         'macro' => ''
       },
-      'number' => 7,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 7
       }
     },
     {
@@ -7076,10 +7076,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 59,
         'macro' => ''
       },
-      'number' => 8,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 8
       }
     },
     {
@@ -7781,10 +7781,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 62,
         'macro' => ''
       },
-      'number' => 9,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 9
       }
     },
     {
@@ -8494,10 +8494,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 65,
         'macro' => ''
       },
-      'number' => 10,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 10
       }
     },
     {
@@ -8947,10 +8947,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 68,
         'macro' => ''
       },
-      'number' => 11,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 11
       }
     },
     {
@@ -9248,10 +9248,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 71,
         'macro' => ''
       },
-      'number' => 12,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 12
       }
     },
     {
@@ -9585,10 +9585,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 74,
         'macro' => ''
       },
-      'number' => 13,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 13
       }
     },
     {
@@ -9922,10 +9922,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 77,
         'macro' => ''
       },
-      'number' => 14,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 14
       }
     },
     {
@@ -10003,10 +10003,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 80,
         'macro' => ''
       },
-      'number' => 15,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 15
       }
     },
     {
@@ -10270,10 +10270,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 83,
         'macro' => ''
       },
-      'number' => 16,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 16
       }
     },
     {
@@ -10537,10 +10537,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 87,
         'macro' => ''
       },
-      'number' => 17,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 17
       }
     },
     {
@@ -10768,10 +10768,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 91,
         'macro' => ''
       },
-      'number' => 18,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 18
       }
     },
     {
@@ -11033,10 +11033,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 95,
         'macro' => ''
       },
-      'number' => 19,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 19
       }
     },
     {
@@ -11158,10 +11158,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 100,
         'macro' => ''
       },
-      'number' => 20,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 20
       }
     },
     {
@@ -11827,10 +11827,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 104,
         'macro' => ''
       },
-      'number' => 21,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 21
       }
     },
     {
@@ -12324,10 +12324,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 107,
         'macro' => ''
       },
-      'number' => 22,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 22
       }
     },
     {
@@ -12451,10 +12451,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 110,
         'macro' => ''
       },
-      'number' => 23,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 23
       }
     },
     {
@@ -12624,10 +12624,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 113,
         'macro' => ''
       },
-      'number' => 24,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 24
       }
     },
     {
@@ -12741,10 +12741,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 116,
         'macro' => ''
       },
-      'number' => 25,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 25
       }
     },
     {
@@ -12914,10 +12914,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 119,
         'macro' => ''
       },
-      'number' => 26,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 26
       }
     },
     {
@@ -17586,10 +17586,10 @@ $result_trees{'at_commands_in_refs_latin1'} = {
         'line_nr' => 122,
         'macro' => ''
       },
-      'number' => 27,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 27
       }
     },
     {
@@ -21236,10 +21236,10 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21256,11 +21256,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21277,11 +21277,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 3,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 3
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21298,11 +21298,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 4,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 4
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21319,11 +21319,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 5,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 5
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21340,11 +21340,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 6,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 6
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21361,11 +21361,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 7,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 7
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21382,11 +21382,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 8,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 8
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21403,11 +21403,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 9,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 9
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21424,11 +21424,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
             },
             'spaces_before_argument' => '  '
           },
-          'number' => 10,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 10
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21445,11 +21445,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 11,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 11
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21466,11 +21466,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 12,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 12
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21487,11 +21487,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 13,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 13
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21508,11 +21508,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 14,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 14
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21529,11 +21529,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 15,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 15
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21550,11 +21550,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 16,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 16
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21571,11 +21571,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 17,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 17
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21592,11 +21592,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 18,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 18
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21613,11 +21613,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 19,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 19
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21634,11 +21634,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 20,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 20
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21655,11 +21655,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 21,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 21
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21676,11 +21676,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 22,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 22
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21697,11 +21697,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 23,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 23
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21718,11 +21718,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 24,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 24
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21739,11 +21739,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 25,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 25
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21760,11 +21760,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 26,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 26
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21781,11 +21781,11 @@ $result_sectioning{'at_commands_in_refs_latin1'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 27,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 27
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21933,9 +21933,9 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => '-_007b-_007d',
@@ -21949,9 +21949,9 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           }
         },
         'normalized' => '----_0021---_002e--_002e-_003f-_0040',
@@ -21965,9 +21965,9 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => 3,
             'structure' => {
-              'level' => 1
+              'level' => 1,
+              'number' => 3
             }
           },
           'normalized' => '_0040-_007b-_007d-_005c-_0023',
@@ -21981,9 +21981,9 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => 4,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 4
               }
             },
             'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
@@ -21997,9 +21997,9 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                 'extra' => {
                   'spaces_before_argument' => ' '
                 },
-                'number' => 5,
                 'structure' => {
-                  'level' => 1
+                  'level' => 1,
+                  'number' => 5
                 }
               },
               'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
@@ -22013,9 +22013,9 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                   'extra' => {
                     'spaces_before_argument' => ' '
                   },
-                  'number' => 6,
                   'structure' => {
-                    'level' => 1
+                    'level' => 1,
+                    'number' => 6
                   }
                 },
                 'normalized' => '_2265-_2264-_2192',
@@ -22029,9 +22029,9 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                     'extra' => {
                       'spaces_before_argument' => ' '
                     },
-                    'number' => 7,
                     'structure' => {
-                      'level' => 1
+                      'level' => 1,
+                      'number' => 7
                     }
                   },
                   'normalized' => '_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae',
@@ -22045,9 +22045,9 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                       'extra' => {
                         'spaces_before_argument' => ' '
                       },
-                      'number' => 8,
                       'structure' => {
-                        'level' => 1
+                        'level' => 1,
+                        'number' => 8
                       }
                     },
                     'normalized' => '_21d2-_00b0-a-b--_00e5',
@@ -22061,9 +22061,9 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                         'extra' => {
                           'spaces_before_argument' => ' '
                         },
-                        'number' => 9,
                         'structure' => {
-                          'level' => 1
+                          'level' => 1,
+                          'number' => 9
                         }
                       },
                       'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
@@ -22077,9 +22077,9 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                           'extra' => {
                             'spaces_before_argument' => '  '
                           },
-                          'number' => 10,
                           'structure' => {
-                            'level' => 1
+                            'level' => 1,
+                            'number' => 10
                           }
                         },
                         'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
@@ -22093,9 +22093,9 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                             'extra' => {
                               'spaces_before_argument' => ' '
                             },
-                            'number' => 11,
                             'structure' => {
-                              'level' => 1
+                              'level' => 1,
+                              'number' => 11
                             }
                           },
                           'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
@@ -22109,9 +22109,9 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                               'extra' => {
                                 'spaces_before_argument' => ' '
                               },
-                              'number' => 12,
                               'structure' => {
-                                'level' => 1
+                                'level' => 1,
+                                'number' => 12
                               }
                             },
                             'normalized' => '_0131-_1e14-_1e08',
@@ -22125,9 +22125,9 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                 'extra' => {
                                   'spaces_before_argument' => ' '
                                 },
-                                'number' => 13,
                                 'structure' => {
-                                  'level' => 1
+                                  'level' => 1,
+                                  'number' => 13
                                 }
                               },
                               'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a',
@@ -22141,9 +22141,9 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                   'extra' => {
                                     'spaces_before_argument' => ' '
                                   },
-                                  'number' => 14,
                                   'structure' => {
-                                    'level' => 1
+                                    'level' => 1,
+                                    'number' => 14
                                   }
                                 },
                                 'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a',
@@ -22157,9 +22157,9 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                     'extra' => {
                                       'spaces_before_argument' => ' '
                                     },
-                                    'number' => 15,
                                     'structure' => {
-                                      'level' => 1
+                                      'level' => 1,
+                                      'number' => 15
                                     }
                                   },
                                   'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
@@ -22173,9 +22173,9 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                       'extra' => {
                                         'spaces_before_argument' => ' '
                                       },
-                                      'number' => 16,
                                       'structure' => {
-                                        'level' => 1
+                                        'level' => 1,
+                                        'number' => 16
                                       }
                                     },
                                     'normalized' => 'AAA-AAA-BBB',
@@ -22189,9 +22189,9 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                         'extra' => {
                                           'spaces_before_argument' => ' '
                                         },
-                                        'number' => 17,
                                         'structure' => {
-                                          'level' => 1
+                                          'level' => 1,
+                                          'number' => 17
                                         }
                                       },
                                       'normalized' => 'CCC-CCC-DDD',
@@ -22205,9 +22205,9 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                           'extra' => {
                                             'spaces_before_argument' => ' '
                                           },
-                                          'number' => 18,
                                           'structure' => {
-                                            'level' => 1
+                                            'level' => 1,
+                                            'number' => 18
                                           }
                                         },
                                         'normalized' => 
'someone_0040somewher-no_005fexplain_0040there',
@@ -22221,9 +22221,9 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                             'extra' => {
                                               'spaces_before_argument' => ' '
                                             },
-                                            'number' => 19,
                                             'structure' => {
-                                              'level' => 1
+                                              'level' => 1,
+                                              'number' => 19
                                             }
                                           },
                                           'normalized' => 
'f_002d_002dile1-f_002d_002dile',
@@ -22237,9 +22237,9 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                               'extra' => {
                                                 'spaces_before_argument' => ' '
                                               },
-                                              'number' => 20,
                                               'structure' => {
-                                                'level' => 1
+                                                'level' => 1,
+                                                'number' => 20
                                               }
                                             },
                                             'normalized' => 
'-_0040-_007b_007d-_002e-',
@@ -22253,9 +22253,9 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                 'extra' => {
                                                   'spaces_before_argument' => 
' '
                                                 },
-                                                'number' => 21,
                                                 'structure' => {
-                                                  'level' => 1
+                                                  'level' => 1,
+                                                  'number' => 21
                                                 }
                                               },
                                               'normalized' => 
'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
@@ -22269,9 +22269,9 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                   'extra' => {
                                                     'spaces_before_argument' 
=> ' '
                                                   },
-                                                  'number' => 22,
                                                   'structure' => {
-                                                    'level' => 1
+                                                    'level' => 1,
+                                                    'number' => 22
                                                   }
                                                 },
                                                 'normalized' => 
'env-code-option-samp-command-file-C_002dx-ESC',
@@ -22285,9 +22285,9 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                     'extra' => {
                                                       'spaces_before_argument' 
=> ' '
                                                     },
-                                                    'number' => 23,
                                                     'structure' => {
-                                                      'level' => 1
+                                                      'level' => 1,
+                                                      'number' => 23
                                                     }
                                                   },
                                                   'normalized' => '8_002e27in',
@@ -22301,9 +22301,9 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                       'extra' => {
                                                         
'spaces_before_argument' => ' '
                                                       },
-                                                      'number' => 24,
                                                       'structure' => {
-                                                        'level' => 1
+                                                        'level' => 1,
+                                                        'number' => 24
                                                       }
                                                     },
                                                     'normalized' => 
'sansserif-slanted',
@@ -22317,9 +22317,9 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                         'extra' => {
                                                           
'spaces_before_argument' => ' '
                                                         },
-                                                        'number' => 25,
                                                         'structure' => {
-                                                          'level' => 1
+                                                          'level' => 1,
+                                                          'number' => 25
                                                         }
                                                       },
                                                       'normalized' => 
'indicateurl',
@@ -22333,9 +22333,9 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                           'extra' => {
                                                             
'spaces_before_argument' => ' '
                                                           },
-                                                          'number' => 26,
                                                           'structure' => {
-                                                            'level' => 1
+                                                            'level' => 1,
+                                                            'number' => 26
                                                           }
                                                         },
                                                         'normalized' => 
'gH-3rd',
@@ -22349,9 +22349,9 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
                                                             'extra' => {
                                                               
'spaces_before_argument' => ' '
                                                             },
-                                                            'number' => 27,
                                                             'structure' => {
-                                                              'level' => 1
+                                                              'level' => 1,
+                                                              '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 c03cd907a7..704c2f2d57 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
@@ -4951,10 +4951,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 38,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -5192,10 +5192,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 41,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -5483,10 +5483,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 44,
         'macro' => ''
       },
-      'number' => 3,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 3
       }
     },
     {
@@ -5866,10 +5866,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 47,
         'macro' => ''
       },
-      'number' => 4,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 4
       }
     },
     {
@@ -6203,10 +6203,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 50,
         'macro' => ''
       },
-      'number' => 5,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 5
       }
     },
     {
@@ -6402,10 +6402,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 53,
         'macro' => ''
       },
-      'number' => 6,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 6
       }
     },
     {
@@ -6785,10 +6785,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 56,
         'macro' => ''
       },
-      'number' => 7,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 7
       }
     },
     {
@@ -7076,10 +7076,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 59,
         'macro' => ''
       },
-      'number' => 8,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 8
       }
     },
     {
@@ -7781,10 +7781,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 62,
         'macro' => ''
       },
-      'number' => 9,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 9
       }
     },
     {
@@ -8494,10 +8494,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 65,
         'macro' => ''
       },
-      'number' => 10,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 10
       }
     },
     {
@@ -8947,10 +8947,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 68,
         'macro' => ''
       },
-      'number' => 11,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 11
       }
     },
     {
@@ -9248,10 +9248,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 71,
         'macro' => ''
       },
-      'number' => 12,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 12
       }
     },
     {
@@ -9585,10 +9585,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 74,
         'macro' => ''
       },
-      'number' => 13,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 13
       }
     },
     {
@@ -9922,10 +9922,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 77,
         'macro' => ''
       },
-      'number' => 14,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 14
       }
     },
     {
@@ -10003,10 +10003,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 80,
         'macro' => ''
       },
-      'number' => 15,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 15
       }
     },
     {
@@ -10270,10 +10270,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 83,
         'macro' => ''
       },
-      'number' => 16,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 16
       }
     },
     {
@@ -10537,10 +10537,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 87,
         'macro' => ''
       },
-      'number' => 17,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 17
       }
     },
     {
@@ -10768,10 +10768,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 91,
         'macro' => ''
       },
-      'number' => 18,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 18
       }
     },
     {
@@ -11033,10 +11033,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 95,
         'macro' => ''
       },
-      'number' => 19,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 19
       }
     },
     {
@@ -11158,10 +11158,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 100,
         'macro' => ''
       },
-      'number' => 20,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 20
       }
     },
     {
@@ -11827,10 +11827,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 104,
         'macro' => ''
       },
-      'number' => 21,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 21
       }
     },
     {
@@ -12324,10 +12324,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 107,
         'macro' => ''
       },
-      'number' => 22,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 22
       }
     },
     {
@@ -12451,10 +12451,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 110,
         'macro' => ''
       },
-      'number' => 23,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 23
       }
     },
     {
@@ -12624,10 +12624,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 113,
         'macro' => ''
       },
-      'number' => 24,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 24
       }
     },
     {
@@ -12741,10 +12741,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 116,
         'macro' => ''
       },
-      'number' => 25,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 25
       }
     },
     {
@@ -12914,10 +12914,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 119,
         'macro' => ''
       },
-      'number' => 26,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 26
       }
     },
     {
@@ -17586,10 +17586,10 @@ $result_trees{'at_commands_in_refs_utf8'} = {
         'line_nr' => 122,
         'macro' => ''
       },
-      'number' => 27,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 27
       }
     },
     {
@@ -21236,10 +21236,10 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21256,11 +21256,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21277,11 +21277,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 3,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 3
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21298,11 +21298,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 4,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 4
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21319,11 +21319,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 5,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 5
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21340,11 +21340,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 6,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 6
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21361,11 +21361,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 7,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 7
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21382,11 +21382,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 8,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 8
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21403,11 +21403,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 9,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 9
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21424,11 +21424,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
             },
             'spaces_before_argument' => '  '
           },
-          'number' => 10,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 10
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21445,11 +21445,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 11,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 11
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21466,11 +21466,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 12,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 12
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21487,11 +21487,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 13,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 13
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21508,11 +21508,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 14,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 14
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21529,11 +21529,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 15,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 15
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21550,11 +21550,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 16,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 16
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21571,11 +21571,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 17,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 17
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21592,11 +21592,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 18,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 18
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21613,11 +21613,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 19,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 19
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21634,11 +21634,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 20,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 20
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21655,11 +21655,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 21,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 21
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21676,11 +21676,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 22,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 22
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21697,11 +21697,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 23,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 23
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21718,11 +21718,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 24,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 24
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21739,11 +21739,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 25,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 25
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21760,11 +21760,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 26,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 26
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21781,11 +21781,11 @@ $result_sectioning{'at_commands_in_refs_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 27,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 27
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -21933,9 +21933,9 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => '-_007b-_007d',
@@ -21949,9 +21949,9 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           }
         },
         'normalized' => '----_0021---_002e--_002e-_003f-_0040',
@@ -21965,9 +21965,9 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => 3,
             'structure' => {
-              'level' => 1
+              'level' => 1,
+              'number' => 3
             }
           },
           'normalized' => '_0040-_007b-_007d-_005c-_0023',
@@ -21981,9 +21981,9 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => 4,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 4
               }
             },
             'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e',
@@ -21997,9 +21997,9 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                 'extra' => {
                   'spaces_before_argument' => ' '
                 },
-                'number' => 5,
                 'structure' => {
-                  'level' => 1
+                  'level' => 1,
+                  'number' => 5
                 }
               },
               'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212',
@@ -22013,9 +22013,9 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                   'extra' => {
                     'spaces_before_argument' => ' '
                   },
-                  'number' => 6,
                   'structure' => {
-                    'level' => 1
+                    'level' => 1,
+                    'number' => 6
                   }
                 },
                 'normalized' => '_2265-_2264-_2192',
@@ -22029,9 +22029,9 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                     'extra' => {
                       'spaces_before_argument' => ' '
                     },
-                    'number' => 7,
                     'structure' => {
-                      'level' => 1
+                      'level' => 1,
+                      'number' => 7
                     }
                   },
                   'normalized' => '_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae',
@@ -22045,9 +22045,9 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                       'extra' => {
                         'spaces_before_argument' => ' '
                       },
-                      'number' => 8,
                       'structure' => {
-                        'level' => 1
+                        'level' => 1,
+                        'number' => 8
                       }
                     },
                     'normalized' => '_21d2-_00b0-a-b--_00e5',
@@ -22061,9 +22061,9 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                         'extra' => {
                           'spaces_before_argument' => ' '
                         },
-                        'number' => 9,
                         'structure' => {
-                          'level' => 1
+                          'level' => 1,
+                          'number' => 9
                         }
                       },
                       'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe',
@@ -22077,9 +22077,9 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                           'extra' => {
                             'spaces_before_argument' => '  '
                           },
-                          'number' => 10,
                           'structure' => {
-                            'level' => 1
+                            'level' => 1,
+                            'number' => 10
                           }
                         },
                         'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119',
@@ -22093,9 +22093,9 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                             'extra' => {
                               'spaces_before_argument' => ' '
                             },
-                            'number' => 11,
                             'structure' => {
-                              'level' => 1
+                              'level' => 1,
+                              'number' => 11
                             }
                           },
                           'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e',
@@ -22109,9 +22109,9 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                               'extra' => {
                                 'spaces_before_argument' => ' '
                               },
-                              'number' => 12,
                               'structure' => {
-                                'level' => 1
+                                'level' => 1,
+                                'number' => 12
                               }
                             },
                             'normalized' => '_0131-_1e14-_1e08',
@@ -22125,9 +22125,9 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                 'extra' => {
                                   'spaces_before_argument' => ' '
                                 },
-                                'number' => 13,
                                 'structure' => {
-                                  'level' => 1
+                                  'level' => 1,
+                                  'number' => 13
                                 }
                               },
                               'normalized' => 
'_201c-_201d-_2018-_2019-_201e-_201a',
@@ -22141,9 +22141,9 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                   'extra' => {
                                     'spaces_before_argument' => ' '
                                   },
-                                  'number' => 14,
                                   'structure' => {
-                                    'level' => 1
+                                    'level' => 1,
+                                    'number' => 14
                                   }
                                 },
                                 'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a',
@@ -22157,9 +22157,9 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                     'extra' => {
                                       'spaces_before_argument' => ' '
                                     },
-                                    'number' => 15,
                                     'structure' => {
-                                      'level' => 1
+                                      'level' => 1,
+                                      'number' => 15
                                     }
                                   },
                                   'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027',
@@ -22173,9 +22173,9 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                       'extra' => {
                                         'spaces_before_argument' => ' '
                                       },
-                                      'number' => 16,
                                       'structure' => {
-                                        'level' => 1
+                                        'level' => 1,
+                                        'number' => 16
                                       }
                                     },
                                     'normalized' => 'AAA-AAA-BBB',
@@ -22189,9 +22189,9 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                         'extra' => {
                                           'spaces_before_argument' => ' '
                                         },
-                                        'number' => 17,
                                         'structure' => {
-                                          'level' => 1
+                                          'level' => 1,
+                                          'number' => 17
                                         }
                                       },
                                       'normalized' => 'CCC-CCC-DDD',
@@ -22205,9 +22205,9 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                           'extra' => {
                                             'spaces_before_argument' => ' '
                                           },
-                                          'number' => 18,
                                           'structure' => {
-                                            'level' => 1
+                                            'level' => 1,
+                                            'number' => 18
                                           }
                                         },
                                         'normalized' => 
'someone_0040somewher-no_005fexplain_0040there',
@@ -22221,9 +22221,9 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                             'extra' => {
                                               'spaces_before_argument' => ' '
                                             },
-                                            'number' => 19,
                                             'structure' => {
-                                              'level' => 1
+                                              'level' => 1,
+                                              'number' => 19
                                             }
                                           },
                                           'normalized' => 
'f_002d_002dile1-f_002d_002dile',
@@ -22237,9 +22237,9 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                               'extra' => {
                                                 'spaces_before_argument' => ' '
                                               },
-                                              'number' => 20,
                                               'structure' => {
-                                                'level' => 1
+                                                'level' => 1,
+                                                'number' => 20
                                               }
                                             },
                                             'normalized' => 
'-_0040-_007b_007d-_002e-',
@@ -22253,9 +22253,9 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                 'extra' => {
                                                   'spaces_before_argument' => 
' '
                                                 },
-                                                'number' => 21,
                                                 'structure' => {
-                                                  'level' => 1
+                                                  'level' => 1,
+                                                  'number' => 21
                                                 }
                                               },
                                               'normalized' => 
'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i',
@@ -22269,9 +22269,9 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                   'extra' => {
                                                     'spaces_before_argument' 
=> ' '
                                                   },
-                                                  'number' => 22,
                                                   'structure' => {
-                                                    'level' => 1
+                                                    'level' => 1,
+                                                    'number' => 22
                                                   }
                                                 },
                                                 'normalized' => 
'env-code-option-samp-command-file-C_002dx-ESC',
@@ -22285,9 +22285,9 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                     'extra' => {
                                                       'spaces_before_argument' 
=> ' '
                                                     },
-                                                    'number' => 23,
                                                     'structure' => {
-                                                      'level' => 1
+                                                      'level' => 1,
+                                                      'number' => 23
                                                     }
                                                   },
                                                   'normalized' => '8_002e27in',
@@ -22301,9 +22301,9 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                       'extra' => {
                                                         
'spaces_before_argument' => ' '
                                                       },
-                                                      'number' => 24,
                                                       'structure' => {
-                                                        'level' => 1
+                                                        'level' => 1,
+                                                        'number' => 24
                                                       }
                                                     },
                                                     'normalized' => 
'sansserif-slanted',
@@ -22317,9 +22317,9 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                         'extra' => {
                                                           
'spaces_before_argument' => ' '
                                                         },
-                                                        'number' => 25,
                                                         'structure' => {
-                                                          'level' => 1
+                                                          'level' => 1,
+                                                          'number' => 25
                                                         }
                                                       },
                                                       'normalized' => 
'indicateurl',
@@ -22333,9 +22333,9 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                           'extra' => {
                                                             
'spaces_before_argument' => ' '
                                                           },
-                                                          'number' => 26,
                                                           'structure' => {
-                                                            'level' => 1
+                                                            'level' => 1,
+                                                            'number' => 26
                                                           }
                                                         },
                                                         'normalized' => 
'gH-3rd',
@@ -22349,9 +22349,9 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
                                                             'extra' => {
                                                               
'spaces_before_argument' => ' '
                                                             },
-                                                            'number' => 27,
                                                             'structure' => {
-                                                              'level' => 1
+                                                              'level' => 1,
+                                                              '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 eb64680ea7..f90a073cff 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
@@ -646,10 +646,10 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
         'line_nr' => 21,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -727,10 +727,10 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
         'line_nr' => 24,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -808,10 +808,10 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
         'line_nr' => 27,
         'macro' => ''
       },
-      'number' => 3,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 3
       }
     },
     {
@@ -889,10 +889,10 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
         'line_nr' => 30,
         'macro' => ''
       },
-      'number' => 4,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 4
       }
     },
     {
@@ -1414,10 +1414,10 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
         'line_nr' => 33,
         'macro' => ''
       },
-      'number' => 5,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 5
       }
     },
     {
@@ -1757,10 +1757,10 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1777,11 +1777,11 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1798,11 +1798,11 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 3,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 3
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1819,11 +1819,11 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 4,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 4
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1840,11 +1840,11 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 5,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 5
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1905,9 +1905,9 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc',
@@ -1921,9 +1921,9 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           }
         },
         'normalized' => '_00e9',
@@ -1937,9 +1937,9 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => 3,
             'structure' => {
-              'level' => 1
+              'level' => 1,
+              'number' => 3
             }
           },
           'normalized' => '_00e0-_00e8-_00f9',
@@ -1953,9 +1953,9 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => 4,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 4
               }
             },
             'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db',
@@ -1969,9 +1969,9 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
                 'extra' => {
                   'spaces_before_argument' => ' '
                 },
-                'number' => 5,
                 'structure' => {
-                  'level' => 1
+                  'level' => 1,
+                  '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 132cb5dd25..2127a8e1da 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
@@ -646,10 +646,10 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
         'line_nr' => 21,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -727,10 +727,10 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
         'line_nr' => 24,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -808,10 +808,10 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
         'line_nr' => 27,
         'macro' => ''
       },
-      'number' => 3,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 3
       }
     },
     {
@@ -889,10 +889,10 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
         'line_nr' => 30,
         'macro' => ''
       },
-      'number' => 4,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 4
       }
     },
     {
@@ -1414,10 +1414,10 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
         'line_nr' => 33,
         'macro' => ''
       },
-      'number' => 5,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 5
       }
     },
     {
@@ -1757,10 +1757,10 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1777,11 +1777,11 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1798,11 +1798,11 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 3,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 3
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1819,11 +1819,11 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 4,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 4
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1840,11 +1840,11 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 5,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 5
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1905,9 +1905,9 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc',
@@ -1921,9 +1921,9 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           }
         },
         'normalized' => '_00e9',
@@ -1937,9 +1937,9 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => 3,
             'structure' => {
-              'level' => 1
+              'level' => 1,
+              'number' => 3
             }
           },
           'normalized' => '_00e0-_00e8-_00f9',
@@ -1953,9 +1953,9 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => 4,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 4
               }
             },
             'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db',
@@ -1969,9 +1969,9 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
                 'extra' => {
                   'spaces_before_argument' => ' '
                 },
-                'number' => 5,
                 'structure' => {
-                  'level' => 1
+                  'level' => 1,
+                  '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 46c4e43d06..1e0b4add32 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
@@ -525,10 +525,10 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -689,10 +689,10 @@ $result_sectioning{'char_latin2_latin2_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -737,9 +737,9 @@ $result_nodes{'char_latin2_latin2_in_refs'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 af78301599..456a502ced 100644
--- a/tp/t/results/formats_encodings/japanese_shift_jis.pl
+++ b/tp/t/results/formats_encodings/japanese_shift_jis.pl
@@ -718,10 +718,10 @@ $result_trees{'japanese_shift_jis'} = {
         'line_nr' => 31,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -816,10 +816,10 @@ $result_trees{'japanese_shift_jis'} = {
         'line_nr' => 37,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -1048,10 +1048,10 @@ $result_sectioning{'japanese_shift_jis'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1068,11 +1068,11 @@ $result_sectioning{'japanese_shift_jis'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1120,9 +1120,9 @@ $result_nodes{'japanese_shift_jis'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'Preface',
@@ -1136,9 +1136,9 @@ $result_nodes{'japanese_shift_jis'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            '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 157dad42af..f6c9420f2e 100644
--- a/tp/t/results/formats_encodings/sample_utf8.pl
+++ b/tp/t/results/formats_encodings/sample_utf8.pl
@@ -1190,10 +1190,10 @@ $result_trees{'sample_utf8'} = {
         'line_nr' => 42,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -1288,10 +1288,10 @@ $result_trees{'sample_utf8'} = {
         'line_nr' => 62,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -1762,10 +1762,10 @@ $result_sectioning{'sample_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1782,11 +1782,11 @@ $result_sectioning{'sample_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1859,9 +1859,9 @@ $result_nodes{'sample_utf8'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => '_7b2c_4e00_7ae0_ff08First-Chapter_ff09',
@@ -1875,9 +1875,9 @@ $result_nodes{'sample_utf8'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           }
         },
         'normalized' => 'Second-Chapter-AE-_0104_0118-ae-_0105_0119',
diff --git a/tp/t/results/formatting/direntry_dircategory_info_split.pl 
b/tp/t/results/formatting/direntry_dircategory_info_split.pl
index 73966a5165..a8788a0f1f 100644
--- a/tp/t/results/formatting/direntry_dircategory_info_split.pl
+++ b/tp/t/results/formatting/direntry_dircategory_info_split.pl
@@ -941,10 +941,10 @@ $result_trees{'direntry_dircategory_info_split'} = {
         'line_nr' => 33,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -1197,10 +1197,10 @@ $result_sectioning{'direntry_dircategory_info_split'} = 
{
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1244,9 +1244,9 @@ $result_nodes{'direntry_dircategory_info_split'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
diff --git a/tp/t/results/formatting/float_copying.pl 
b/tp/t/results/formatting/float_copying.pl
index 34abad99ea..7b3cbd6aae 100644
--- a/tp/t/results/formatting/float_copying.pl
+++ b/tp/t/results/formatting/float_copying.pl
@@ -619,8 +619,10 @@ $result_trees{'float_copying'} = {
                 'line_nr' => 7,
                 'macro' => ''
               },
-              'number' => 1,
-              'parent' => {}
+              'parent' => {},
+              'structure' => {
+                'float_number' => 1
+              }
             },
             {
               'args' => [
@@ -1457,10 +1459,10 @@ $result_trees{'float_copying'} = {
         'line_nr' => 46,
         'macro' => ''
       },
-      'number' => 'A',
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 'A'
       }
     },
     {
@@ -1828,10 +1830,10 @@ $result_sectioning{'float_copying'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 'A',
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 'A'
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1875,9 +1877,9 @@ $result_nodes{'float_copying'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 'A',
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 'A'
         }
       },
       'isindex' => 1,
@@ -1962,7 +1964,9 @@ $result_floats{'float_copying'} = {
           'normalized' => 'Copyright notice'
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ]
 };
diff --git a/tp/t/results/formatting/split_nocopying.pl 
b/tp/t/results/formatting/split_nocopying.pl
index d11dc7369d..7842852335 100644
--- a/tp/t/results/formatting/split_nocopying.pl
+++ b/tp/t/results/formatting/split_nocopying.pl
@@ -371,10 +371,10 @@ $result_trees{'split_nocopying'} = {
         'line_nr' => 14,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -508,10 +508,10 @@ $result_sectioning{'split_nocopying'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -555,9 +555,9 @@ $result_nodes{'split_nocopying'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 d143bb58b3..67b072a397 100644
--- a/tp/t/results/formatting/split_nocopying_split.pl
+++ b/tp/t/results/formatting/split_nocopying_split.pl
@@ -371,10 +371,10 @@ $result_trees{'split_nocopying_split'} = {
         'line_nr' => 14,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -508,10 +508,10 @@ $result_sectioning{'split_nocopying_split'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -555,9 +555,9 @@ $result_nodes{'split_nocopying_split'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 cc502a97b5..911023e7b7 100644
--- a/tp/t/results/formatting/texi_bib_example.pl
+++ b/tp/t/results/formatting/texi_bib_example.pl
@@ -4232,10 +4232,10 @@ $result_trees{'texi_bib_example'} = {
         'line_nr' => 41,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {},
@@ -4461,10 +4461,10 @@ $result_trees{'texi_bib_example'} = {
         'line_nr' => 48,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -5440,10 +5440,10 @@ $result_sectioning{'texi_bib_example'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -5460,11 +5460,11 @@ $result_sectioning{'texi_bib_example'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -5512,9 +5512,9 @@ $result_nodes{'texi_bib_example'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'Introduction',
@@ -5528,9 +5528,9 @@ $result_nodes{'texi_bib_example'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           }
         },
         'normalized' => 'References',
diff --git a/tp/t/results/formatting/texi_glossary.pl 
b/tp/t/results/formatting/texi_glossary.pl
index 1df0607182..0f93e57009 100644
--- a/tp/t/results/formatting/texi_glossary.pl
+++ b/tp/t/results/formatting/texi_glossary.pl
@@ -869,10 +869,10 @@ $result_trees{'texi_glossary'} = {
                         'line_nr' => 46,
                         'macro' => ''
                       },
-                      'number' => 1,
                       'parent' => {},
                       'structure' => {
-                        'level' => 1
+                        'level' => 1,
+                        'number' => 1
                       }
                     },
                     'type' => 'paragraph'
@@ -1432,10 +1432,10 @@ $result_sectioning{'texi_glossary'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1479,9 +1479,9 @@ $result_nodes{'texi_glossary'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 2cdc8b2413..80926ca6fe 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
@@ -71,10 +71,10 @@ $result_trees{'character_number_leading_toc_stoc'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -256,10 +256,10 @@ $result_sectioning{'character_number_leading_toc_stoc'} = 
{
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
diff --git a/tp/t/results/html_tests/footnotestyle_separate_late.pl 
b/tp/t/results/html_tests/footnotestyle_separate_late.pl
index 4c895db9d5..d39693959e 100644
--- a/tp/t/results/html_tests/footnotestyle_separate_late.pl
+++ b/tp/t/results/html_tests/footnotestyle_separate_late.pl
@@ -260,10 +260,10 @@ $result_trees{'footnotestyle_separate_late'} = [
           'line_nr' => 7,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -430,10 +430,10 @@ $result_trees{'footnotestyle_separate_late'} = [
           'line_nr' => 12,
           'macro' => ''
         },
-        'number' => 2,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 2
         }
       }
     ],
@@ -571,10 +571,10 @@ $result_sectioning{'footnotestyle_separate_late'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -591,11 +591,11 @@ $result_sectioning{'footnotestyle_separate_late'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -643,9 +643,9 @@ $result_nodes{'footnotestyle_separate_late'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chap-f',
@@ -659,9 +659,9 @@ $result_nodes{'footnotestyle_separate_late'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           }
         },
         'normalized' => 'chap-s',
@@ -730,9 +730,9 @@ $result_elements{'footnotestyle_separate_late'} = [
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => 1,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 1
               }
             },
             'unit_command' => {}
@@ -755,9 +755,9 @@ $result_elements{'footnotestyle_separate_late'} = [
                     'extra' => {
                       'spaces_before_argument' => ' '
                     },
-                    'number' => 2,
                     'structure' => {
-                      'level' => 1
+                      'level' => 1,
+                      'number' => 2
                     }
                   },
                   'unit_command' => {}
diff --git a/tp/t/results/html_tests/index_below.pl 
b/tp/t/results/html_tests/index_below.pl
index 2b3487144d..d68775a689 100644
--- a/tp/t/results/html_tests/index_below.pl
+++ b/tp/t/results/html_tests/index_below.pl
@@ -96,10 +96,10 @@ $result_trees{'index_below'} = [
           'line_nr' => 3,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -219,10 +219,10 @@ $result_trees{'index_below'} = [
           'line_nr' => 5,
           'macro' => ''
         },
-        'number' => '1.1',
         'parent' => {},
         'structure' => {
-          'level' => 2
+          'level' => 2,
+          'number' => '1.1'
         }
       }
     ],
@@ -302,23 +302,23 @@ $result_sectioning{'index_below'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -376,9 +376,9 @@ $result_elements{'index_below'} = [
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => 1,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 1
               }
             },
             'unit_command' => {}
@@ -394,9 +394,9 @@ $result_elements{'index_below'} = [
                     'extra' => {
                       'spaces_before_argument' => ' '
                     },
-                    'number' => '1.1',
                     'structure' => {
-                      'level' => 2
+                      'level' => 2,
+                      'number' => '1.1'
                     }
                   },
                   'unit_command' => {}
diff --git a/tp/t/results/html_tests/redirection_same_labels.pl 
b/tp/t/results/html_tests/redirection_same_labels.pl
index 661aa75d6b..1721911b42 100644
--- a/tp/t/results/html_tests/redirection_same_labels.pl
+++ b/tp/t/results/html_tests/redirection_same_labels.pl
@@ -681,10 +681,10 @@ $result_trees{'redirection_same_labels'} = [
           'line_nr' => 15,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       {
@@ -1059,10 +1059,10 @@ $result_trees{'redirection_same_labels'} = [
           'line_nr' => 27,
           'macro' => ''
         },
-        'number' => 2,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 2
         }
       },
       {
@@ -1380,10 +1380,10 @@ $result_sectioning{'redirection_same_labels'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1400,11 +1400,11 @@ $result_sectioning{'redirection_same_labels'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1452,9 +1452,9 @@ $result_nodes{'redirection_same_labels'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'umlaut',
@@ -1500,9 +1500,9 @@ $result_nodes{'redirection_same_labels'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           }
         },
         'normalized' => 'circumflex',
@@ -1730,9 +1730,9 @@ $result_elements{'redirection_same_labels'} = [
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => 1,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 1
               }
             },
             'unit_command' => {}
@@ -1749,9 +1749,9 @@ $result_elements{'redirection_same_labels'} = [
                     'extra' => {
                       'spaces_before_argument' => ' '
                     },
-                    'number' => 2,
                     'structure' => {
-                      'level' => 1
+                      'level' => 1,
+                      'number' => 2
                     }
                   },
                   'unit_command' => {}
diff --git a/tp/t/results/html_tests/shortcontents_no_top.pl 
b/tp/t/results/html_tests/shortcontents_no_top.pl
index 8ec8ef2d10..f8dc7caabe 100644
--- a/tp/t/results/html_tests/shortcontents_no_top.pl
+++ b/tp/t/results/html_tests/shortcontents_no_top.pl
@@ -46,10 +46,10 @@ $result_trees{'shortcontents_no_top'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -86,10 +86,10 @@ $result_trees{'shortcontents_no_top'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -143,10 +143,10 @@ $result_trees{'shortcontents_no_top'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'number' => '2.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '2.1'
       }
     }
   ],
@@ -196,10 +196,10 @@ $result_sectioning{'shortcontents_no_top'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -207,24 +207,24 @@ $result_sectioning{'shortcontents_no_top'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 2,
       'section_childs' => [
         {
           'cmdname' => 'section',
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '2.1',
           'section_up' => {},
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '2.1'
           }
         }
       ],
       'section_prev' => {},
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       },
       'toplevel_prev' => {}
     }
diff --git a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl 
b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
index 95b4a88d03..b390ce91ff 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
@@ -447,10 +447,10 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -579,10 +579,10 @@ $result_sectioning{'test_xrefautomaticsectiontitle'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -626,9 +626,9 @@ $result_nodes{'test_xrefautomaticsectiontitle'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 f082481c2f..af7fc6c674 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
@@ -454,10 +454,10 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} 
= {
         'line_nr' => 12,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -589,10 +589,10 @@ 
$result_sectioning{'test_xrefautomaticsectiontitle_off_first'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -636,9 +636,9 @@ $result_nodes{'test_xrefautomaticsectiontitle_off_first'} = 
{
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 ea254ca456..40e6cede4f 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
@@ -190,10 +190,10 @@ $result_trees{'text_before_top_and_contents_after_title'} 
= {
         'line_nr' => 9,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -273,10 +273,10 @@ 
$result_sectioning{'text_before_top_and_contents_after_title'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
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 e52786e217..f71c0cbf76 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
@@ -190,10 +190,10 @@ 
$result_trees{'text_before_top_and_summarycontents_after_title'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -273,10 +273,10 @@ 
$result_sectioning{'text_before_top_and_summarycontents_after_title'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
diff --git a/tp/t/results/htmlxref/htmlxref.pl 
b/tp/t/results/htmlxref/htmlxref.pl
index 8f89f26418..04cfe99df3 100644
--- a/tp/t/results/htmlxref/htmlxref.pl
+++ b/tp/t/results/htmlxref/htmlxref.pl
@@ -2844,10 +2844,10 @@ $result_trees{'htmlxref'} = {
         'line_nr' => 68,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {},
@@ -3488,10 +3488,10 @@ $result_sectioning{'htmlxref'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -3535,9 +3535,9 @@ $result_nodes{'htmlxref'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'other-nodes',
diff --git a/tp/t/results/htmlxref/htmlxref_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_nodes.pl
index f031257438..771dfa516d 100644
--- a/tp/t/results/htmlxref/htmlxref_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_nodes.pl
@@ -2844,10 +2844,10 @@ $result_trees{'htmlxref_nodes'} = {
         'line_nr' => 68,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {},
@@ -3488,10 +3488,10 @@ $result_sectioning{'htmlxref_nodes'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -3535,9 +3535,9 @@ $result_nodes{'htmlxref_nodes'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'other-nodes',
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono.pl 
b/tp/t/results/htmlxref/htmlxref_only_mono.pl
index 70b2f869fc..c90d3d1609 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono.pl
@@ -2844,10 +2844,10 @@ $result_trees{'htmlxref_only_mono'} = {
         'line_nr' => 68,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {},
@@ -3488,10 +3488,10 @@ $result_sectioning{'htmlxref_only_mono'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -3535,9 +3535,9 @@ $result_nodes{'htmlxref_only_mono'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'other-nodes',
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
index b6c9c43034..895557c1af 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
@@ -2844,10 +2844,10 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
         'line_nr' => 68,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {},
@@ -3488,10 +3488,10 @@ $result_sectioning{'htmlxref_only_mono_nodes'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -3535,9 +3535,9 @@ $result_nodes{'htmlxref_only_mono_nodes'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'other-nodes',
diff --git a/tp/t/results/htmlxref/htmlxref_only_split.pl 
b/tp/t/results/htmlxref/htmlxref_only_split.pl
index 03b7eea95d..afe48aa221 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split.pl
@@ -2844,10 +2844,10 @@ $result_trees{'htmlxref_only_split'} = {
         'line_nr' => 68,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {},
@@ -3488,10 +3488,10 @@ $result_sectioning{'htmlxref_only_split'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -3535,9 +3535,9 @@ $result_nodes{'htmlxref_only_split'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'other-nodes',
diff --git a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
index 31e2ab327e..cab1e70f42 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
@@ -2844,10 +2844,10 @@ $result_trees{'htmlxref_only_split_nodes'} = {
         'line_nr' => 68,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {},
@@ -3488,10 +3488,10 @@ $result_sectioning{'htmlxref_only_split_nodes'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -3535,9 +3535,9 @@ $result_nodes{'htmlxref_only_split_nodes'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'other-nodes',
diff --git a/tp/t/results/indices/def_syn_indices.pl 
b/tp/t/results/indices/def_syn_indices.pl
index 0230d900fc..465521c47e 100644
--- a/tp/t/results/indices/def_syn_indices.pl
+++ b/tp/t/results/indices/def_syn_indices.pl
@@ -1387,10 +1387,10 @@ $result_trees{'def_syn_indices'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -1715,10 +1715,10 @@ $result_sectioning{'def_syn_indices'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1762,9 +1762,9 @@ $result_nodes{'def_syn_indices'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 39b9c1f577..61e7eec894 100644
--- a/tp/t/results/indices/double_seeentry_seealso.pl
+++ b/tp/t/results/indices/double_seeentry_seealso.pl
@@ -643,10 +643,10 @@ $result_trees{'double_seeentry_seealso'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -803,10 +803,10 @@ $result_sectioning{'double_seeentry_seealso'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -850,9 +850,9 @@ $result_nodes{'double_seeentry_seealso'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       '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 201afad7e0..3a27fc91d7 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -951,10 +951,10 @@ $result_trees{'printindex_index_entry_in_copying'} = {
         'line_nr' => 30,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -1176,10 +1176,10 @@ $result_sectioning{'printindex_index_entry_in_copying'} 
= {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1223,9 +1223,9 @@ $result_nodes{'printindex_index_entry_in_copying'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 07087eb5ee..e3d49e0086 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
@@ -544,10 +544,10 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
         'line_nr' => 24,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -699,10 +699,10 @@ 
$result_sectioning{'printindex_index_entry_in_copying_in_footnote'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -746,9 +746,9 @@ 
$result_nodes{'printindex_index_entry_in_copying_in_footnote'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 5272fb4e43..2a584b8145 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
@@ -917,10 +917,10 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
         'line_nr' => 29,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -1136,10 +1136,10 @@ 
$result_sectioning{'printindex_index_entry_in_copying_no_insertcopying'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1183,9 +1183,9 @@ 
$result_nodes{'printindex_index_entry_in_copying_no_insertcopying'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'isindex' => 1,
diff --git a/tp/t/results/indices/seeentry.pl b/tp/t/results/indices/seeentry.pl
index 847002fa30..16d128e0c5 100644
--- a/tp/t/results/indices/seeentry.pl
+++ b/tp/t/results/indices/seeentry.pl
@@ -543,10 +543,10 @@ $result_trees{'seeentry'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -686,10 +686,10 @@ $result_sectioning{'seeentry'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -731,9 +731,9 @@ $result_nodes{'seeentry'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'isindex' => 1,
diff --git a/tp/t/results/indices/subentries.pl 
b/tp/t/results/indices/subentries.pl
index cc9d9b8be9..e54ba317ce 100644
--- a/tp/t/results/indices/subentries.pl
+++ b/tp/t/results/indices/subentries.pl
@@ -947,10 +947,10 @@ $result_trees{'subentries'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -1150,10 +1150,10 @@ $result_sectioning{'subentries'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1195,9 +1195,9 @@ $result_nodes{'subentries'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 8558f451bc..b0b004e367 100644
--- a/tp/t/results/indices/subentry_and_sortas.pl
+++ b/tp/t/results/indices/subentry_and_sortas.pl
@@ -525,10 +525,10 @@ $result_trees{'subentry_and_sortas'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -656,10 +656,10 @@ $result_sectioning{'subentry_and_sortas'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -701,9 +701,9 @@ $result_nodes{'subentry_and_sortas'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 eda7909052..a22621c939 100644
--- a/tp/t/results/indices/syncode_index_print_both.pl
+++ b/tp/t/results/indices/syncode_index_print_both.pl
@@ -444,10 +444,10 @@ $result_trees{'syncode_index_print_both'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -582,10 +582,10 @@ $result_sectioning{'syncode_index_print_both'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -629,9 +629,9 @@ $result_nodes{'syncode_index_print_both'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'isindex' => 1,
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 11467a0d08..ce348ceb28 100644
--- a/tp/t/results/info_tests/before_node_and_section.pl
+++ b/tp/t/results/info_tests/before_node_and_section.pl
@@ -714,10 +714,10 @@ $result_trees{'before_node_and_section'} = {
         'line_nr' => 21,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -905,10 +905,10 @@ $result_sectioning{'before_node_and_section'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -952,9 +952,9 @@ $result_nodes{'before_node_and_section'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'isindex' => 1,
diff --git a/tp/t/results/info_tests/error_in_footnote.pl 
b/tp/t/results/info_tests/error_in_footnote.pl
index e9bfa36734..9b79707a04 100644
--- a/tp/t/results/info_tests/error_in_footnote.pl
+++ b/tp/t/results/info_tests/error_in_footnote.pl
@@ -303,8 +303,10 @@ $result_trees{'error_in_footnote'} = {
             'line_nr' => 4,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         },
         {
           'parent' => {},
@@ -569,7 +571,9 @@ $result_floats{'error_in_footnote'} = {
           'normalized' => 'Text'
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ]
 };
diff --git a/tp/t/results/info_tests/float_long_captions.pl 
b/tp/t/results/info_tests/float_long_captions.pl
index 1de35183d5..866fcf41f4 100644
--- a/tp/t/results/info_tests/float_long_captions.pl
+++ b/tp/t/results/info_tests/float_long_captions.pl
@@ -154,8 +154,10 @@ $result_trees{'float_long_captions'} = {
             'line_nr' => 3,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         },
         {
           'parent' => {},
@@ -280,8 +282,10 @@ $result_trees{'float_long_captions'} = {
             'line_nr' => 7,
             'macro' => ''
           },
-          'number' => 2,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 2
+          }
         },
         {
           'parent' => {},
@@ -471,7 +475,9 @@ $result_floats{'float_long_captions'} = {
           'normalized' => 'Text'
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     },
     {
       'cmdname' => 'float',
@@ -501,7 +507,9 @@ $result_floats{'float_long_captions'} = {
           'normalized' => 'Text'
         }
       },
-      'number' => 2
+      'structure' => {
+        'float_number' => 2
+      }
     }
   ]
 };
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 63af332d46..04ab1f4c4b 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
@@ -405,10 +405,10 @@ $result_trees{'index_entry_at_end_node'} = {
         'line_nr' => 11,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -518,10 +518,10 @@ $result_trees{'index_entry_at_end_node'} = {
         'line_nr' => 18,
         'macro' => ''
       },
-      'number' => 'A',
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 'A'
       }
     }
   ],
@@ -666,10 +666,10 @@ $result_sectioning{'index_entry_at_end_node'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -687,11 +687,11 @@ $result_sectioning{'index_entry_at_end_node'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 'A',
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 'A'
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -739,9 +739,9 @@ $result_nodes{'index_entry_at_end_node'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
@@ -755,9 +755,9 @@ $result_nodes{'index_entry_at_end_node'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 'A',
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 'A'
           }
         },
         'isindex' => 1,
diff --git a/tp/t/results/info_tests/space_in_menu.pl 
b/tp/t/results/info_tests/space_in_menu.pl
index c279589c97..f68ae07355 100644
--- a/tp/t/results/info_tests/space_in_menu.pl
+++ b/tp/t/results/info_tests/space_in_menu.pl
@@ -311,10 +311,10 @@ $result_trees{'space_in_menu'} = {
         'line_nr' => 11,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -419,10 +419,10 @@ $result_sectioning{'space_in_menu'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -466,9 +466,9 @@ $result_nodes{'space_in_menu'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 ffde01a012..c7293b2665 100644
--- a/tp/t/results/info_tests/split_no_copying.pl
+++ b/tp/t/results/info_tests/split_no_copying.pl
@@ -364,10 +364,10 @@ $result_trees{'split_no_copying'} = {
         'line_nr' => 14,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -501,10 +501,10 @@ $result_sectioning{'split_no_copying'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -548,9 +548,9 @@ $result_nodes{'split_no_copying'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 baa71544a2..7ccc884195 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
@@ -370,10 +370,10 @@ $result_trees{'split_test_before_first_node'} = {
         'line_nr' => 15,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -495,10 +495,10 @@ $result_sectioning{'split_test_before_first_node'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -542,9 +542,9 @@ $result_nodes{'split_test_before_first_node'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 1b191115f0..40740f207b 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
@@ -364,10 +364,10 @@ 
$result_trees{'split_test_before_first_node_no_empty_line'} = {
         'line_nr' => 14,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -486,10 +486,10 @@ 
$result_sectioning{'split_test_before_first_node_no_empty_line'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -533,9 +533,9 @@ $result_nodes{'split_test_before_first_node_no_empty_line'} 
= {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 e0a2955f31..3135faa2bc 100644
--- a/tp/t/results/info_tests/test_index.pl
+++ b/tp/t/results/info_tests/test_index.pl
@@ -257,10 +257,10 @@ $result_trees{'test_index'} = {
                       'line_nr' => 229,
                       'macro' => ''
                     },
-                    'number' => 'B',
                     'parent' => {},
                     'structure' => {
-                      'level' => 1
+                      'level' => 1,
+                      'number' => 'B'
                     }
                   }
                 },
@@ -2895,10 +2895,10 @@ $result_trees{'test_index'} = {
         'line_nr' => 32,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {},
@@ -3137,10 +3137,10 @@ $result_trees{'test_index'} = {
         'line_nr' => 206,
         'macro' => ''
       },
-      'number' => 'A',
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 'A'
       }
     },
     {
@@ -3177,10 +3177,10 @@ $result_trees{'test_index'} = {
         'line_nr' => 219,
         'macro' => ''
       },
-      'number' => 'A.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 'A.1'
       }
     },
     {
@@ -3217,10 +3217,10 @@ $result_trees{'test_index'} = {
         'line_nr' => 221,
         'macro' => ''
       },
-      'number' => 'A.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => 'A.1.1'
       }
     },
     {
@@ -3292,10 +3292,10 @@ $result_trees{'test_index'} = {
         'line_nr' => 223,
         'macro' => ''
       },
-      'number' => 'A.1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 4
+        'level' => 4,
+        'number' => 'A.1.1.1'
       }
     },
     {
@@ -4371,10 +4371,10 @@ $result_sectioning{'test_index'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -4392,50 +4392,50 @@ $result_sectioning{'test_index'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 'A',
           'section_childs' => [
             {
               'cmdname' => 'appendixsec',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => 'A.1',
               'section_childs' => [
                 {
                   'cmdname' => 'appendixsubsec',
                   'extra' => {
                     'spaces_before_argument' => ' '
                   },
-                  'number' => 'A.1.1',
                   'section_childs' => [
                     {
                       'cmdname' => 'appendixsubsubsec',
                       'extra' => {
                         'spaces_before_argument' => ' '
                       },
-                      'number' => 'A.1.1.1',
                       'section_up' => {},
                       'structure' => {
-                        'level' => 4
+                        'level' => 4,
+                        'number' => 'A.1.1.1'
                       }
                     }
                   ],
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => 'A.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => 'A.1'
               }
             }
           ],
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 'A'
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -4458,11 +4458,11 @@ $result_sectioning{'test_index'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 'B',
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 'B'
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -4521,9 +4521,9 @@ $result_nodes{'test_index'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'name',
@@ -4537,9 +4537,9 @@ $result_nodes{'test_index'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 'A',
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            '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 e8dbdd4991..93fd0eacdd 100644
--- a/tp/t/results/info_tests/text_before_node.pl
+++ b/tp/t/results/info_tests/text_before_node.pl
@@ -283,10 +283,10 @@ $result_trees{'text_before_node'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -380,10 +380,10 @@ $result_sectioning{'text_before_node'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -427,9 +427,9 @@ $result_nodes{'text_before_node'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter-node',
diff --git a/tp/t/results/invalid_nestings/float_in_style_command.pl 
b/tp/t/results/invalid_nestings/float_in_style_command.pl
index 66474a44fd..c9a685d61e 100644
--- a/tp/t/results/invalid_nestings/float_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/float_in_style_command.pl
@@ -166,8 +166,10 @@ $result_trees{'float_in_style_command'} = {
             'line_nr' => 2,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         }
       ],
       'parent' => {},
@@ -277,7 +279,9 @@ $result_floats{'float_in_style_command'} = {
           'normalized' => 'A'
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ]
 };
diff --git a/tp/t/results/invalid_nestings/on_section_line.pl 
b/tp/t/results/invalid_nestings/on_section_line.pl
index 8705c60617..8af316cb1c 100644
--- a/tp/t/results/invalid_nestings/on_section_line.pl
+++ b/tp/t/results/invalid_nestings/on_section_line.pl
@@ -166,10 +166,10 @@ $result_trees{'on_section_line'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     }
   ],
@@ -214,10 +214,10 @@ $result_sectioning{'on_section_line'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     }
   ],
diff --git a/tp/t/results/invalid_nestings/section_in_copying.pl 
b/tp/t/results/invalid_nestings/section_in_copying.pl
index 06c21f2550..48488cf22a 100644
--- a/tp/t/results/invalid_nestings/section_in_copying.pl
+++ b/tp/t/results/invalid_nestings/section_in_copying.pl
@@ -83,10 +83,10 @@ $result_trees{'section_in_copying'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     }
   ],
@@ -123,10 +123,10 @@ $result_sectioning{'section_in_copying'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     }
   ],
diff --git a/tp/t/results/invalid_nestings/section_in_flushright.pl 
b/tp/t/results/invalid_nestings/section_in_flushright.pl
index 26c3c11a66..8967fbed72 100644
--- a/tp/t/results/invalid_nestings/section_in_flushright.pl
+++ b/tp/t/results/invalid_nestings/section_in_flushright.pl
@@ -83,10 +83,10 @@ $result_trees{'section_in_flushright'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     }
   ],
@@ -126,10 +126,10 @@ $result_sectioning{'section_in_flushright'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     }
   ],
diff --git a/tp/t/results/invalid_nestings/section_in_footnote.pl 
b/tp/t/results/invalid_nestings/section_in_footnote.pl
index 0247dad53c..da0965f166 100644
--- a/tp/t/results/invalid_nestings/section_in_footnote.pl
+++ b/tp/t/results/invalid_nestings/section_in_footnote.pl
@@ -84,10 +84,10 @@ $result_trees{'section_in_footnote'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     }
   ],
@@ -123,10 +123,10 @@ $result_sectioning{'section_in_footnote'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     }
   ],
diff --git a/tp/t/results/invalid_nestings/section_in_math.pl 
b/tp/t/results/invalid_nestings/section_in_math.pl
index c1fa84837d..ad877d4fa3 100644
--- a/tp/t/results/invalid_nestings/section_in_math.pl
+++ b/tp/t/results/invalid_nestings/section_in_math.pl
@@ -149,10 +149,10 @@ $result_trees{'section_in_math'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     },
     {
@@ -182,10 +182,10 @@ $result_trees{'section_in_math'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 2
       }
     }
   ],
@@ -245,10 +245,10 @@ $result_sectioning{'section_in_math'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     },
     {
@@ -256,11 +256,11 @@ $result_sectioning{'section_in_math'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 2,
       'section_prev' => {},
       'section_up' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 2
       },
       'toplevel_prev' => {}
     }
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 c8687a6cd5..408de470db 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
@@ -184,10 +184,10 @@ $result_trees{'section_in_nested_block_commands'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     }
   ],
@@ -247,10 +247,10 @@ $result_sectioning{'section_in_nested_block_commands'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     }
   ],
diff --git a/tp/t/results/invalid_nestings/section_in_table.pl 
b/tp/t/results/invalid_nestings/section_in_table.pl
index 065065d63a..6cd8194417 100644
--- a/tp/t/results/invalid_nestings/section_in_table.pl
+++ b/tp/t/results/invalid_nestings/section_in_table.pl
@@ -159,10 +159,10 @@ $result_trees{'section_in_table'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     }
   ],
@@ -215,10 +215,10 @@ $result_sectioning{'section_in_table'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     }
   ],
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 f6fca910b4..0f31392dbf 100644
--- a/tp/t/results/invalid_nestings/section_on_def_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_def_line.pl
@@ -103,10 +103,10 @@ $result_trees{'section_on_def_line'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     }
   ],
@@ -146,10 +146,10 @@ $result_sectioning{'section_on_def_line'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     }
   ],
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 78a98defbb..e6bb45d443 100644
--- a/tp/t/results/invalid_nestings/section_on_defx_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_defx_line.pl
@@ -206,10 +206,10 @@ $result_trees{'section_on_defx_line'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     }
   ],
@@ -266,10 +266,10 @@ $result_sectioning{'section_on_defx_line'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     }
   ],
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 ee2a51118e..c3231c8596 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
@@ -82,10 +82,10 @@ $result_trees{'section_on_index_entry_line'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     }
   ],
@@ -121,10 +121,10 @@ $result_sectioning{'section_on_index_entry_line'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     }
   ],
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 74905aa08a..b8e1245f05 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
@@ -341,10 +341,10 @@ 
$result_trees{'style_not_closed_no_newline_root_commands'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -465,10 +465,10 @@ 
$result_sectioning{'style_not_closed_no_newline_root_commands'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -512,9 +512,9 @@ $result_nodes{'style_not_closed_no_newline_root_commands'} 
= {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 e7301506f5..066f7aafaa 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
@@ -353,10 +353,10 @@ $result_trees{'style_not_closed_root_commands'} = {
         'line_nr' => 11,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -483,10 +483,10 @@ $result_sectioning{'style_not_closed_root_commands'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -530,9 +530,9 @@ $result_nodes{'style_not_closed_root_commands'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 98dc70a64e..f82c9a5b8e 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
@@ -74,10 +74,10 @@ $result_trees{'unclosed_verb_on_section_line'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     }
   ],
@@ -112,10 +112,10 @@ $result_sectioning{'unclosed_verb_on_section_line'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     }
   ],
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 6f68ed3db3..c8357d7073 100644
--- a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
@@ -1119,10 +1119,10 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -1388,10 +1388,10 @@ $result_sectioning{'inter_item_commands_in_enumerate'} 
= {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1435,9 +1435,9 @@ $result_nodes{'inter_item_commands_in_enumerate'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 b50aef99e2..43055322d7 100644
--- a/tp/t/results/itemize/inter_item_commands_in_itemize.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
@@ -756,10 +756,10 @@ $result_trees{'inter_item_commands_in_itemize'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -940,10 +940,10 @@ $result_sectioning{'inter_item_commands_in_itemize'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -987,9 +987,9 @@ $result_nodes{'inter_item_commands_in_itemize'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
diff --git a/tp/t/results/languages/appendix_translated.pl 
b/tp/t/results/languages/appendix_translated.pl
index efa4616e8c..669231a3b8 100644
--- a/tp/t/results/languages/appendix_translated.pl
+++ b/tp/t/results/languages/appendix_translated.pl
@@ -179,10 +179,10 @@ $result_trees{'appendix_translated'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'number' => 'A',
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 'A'
       }
     }
   ],
@@ -249,10 +249,10 @@ $result_sectioning{'appendix_translated'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 'A',
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 'A'
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
diff --git a/tp/t/results/languages/multiple_lang_chapters.pl 
b/tp/t/results/languages/multiple_lang_chapters.pl
index bb74a0c742..6796a79424 100644
--- a/tp/t/results/languages/multiple_lang_chapters.pl
+++ b/tp/t/results/languages/multiple_lang_chapters.pl
@@ -906,10 +906,10 @@ $result_trees{'multiple_lang_chapters'} = {
         'line_nr' => 25,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -1233,10 +1233,10 @@ $result_trees{'multiple_lang_chapters'} = {
         'line_nr' => 33,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -1514,10 +1514,10 @@ $result_trees{'multiple_lang_chapters'} = {
         'line_nr' => 41,
         'macro' => ''
       },
-      'number' => 3,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 3
       }
     },
     {
@@ -1624,10 +1624,10 @@ $result_trees{'multiple_lang_chapters'} = {
         'line_nr' => 48,
         'macro' => ''
       },
-      'number' => 4,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 4
       }
     },
     {
@@ -1751,10 +1751,10 @@ $result_trees{'multiple_lang_chapters'} = {
         'line_nr' => 52,
         'macro' => ''
       },
-      'number' => 5,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 5
       }
     }
   ],
@@ -2114,10 +2114,10 @@ $result_sectioning{'multiple_lang_chapters'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -2134,11 +2134,11 @@ $result_sectioning{'multiple_lang_chapters'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -2155,11 +2155,11 @@ $result_sectioning{'multiple_lang_chapters'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 3,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 3
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -2176,11 +2176,11 @@ $result_sectioning{'multiple_lang_chapters'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 4,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 4
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -2197,11 +2197,11 @@ $result_sectioning{'multiple_lang_chapters'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 5,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 5
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -2261,9 +2261,9 @@ $result_nodes{'multiple_lang_chapters'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter-ja',
@@ -2277,9 +2277,9 @@ $result_nodes{'multiple_lang_chapters'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           }
         },
         'normalized' => 'chapter-en',
@@ -2293,9 +2293,9 @@ $result_nodes{'multiple_lang_chapters'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => 3,
             'structure' => {
-              'level' => 1
+              'level' => 1,
+              'number' => 3
             }
           },
           'normalized' => 'chapter-fr_005fFR',
@@ -2309,9 +2309,9 @@ $result_nodes{'multiple_lang_chapters'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => 4,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 4
               }
             },
             'normalized' => 'chapter-de',
@@ -2325,9 +2325,9 @@ $result_nodes{'multiple_lang_chapters'} = {
                 'extra' => {
                   'spaces_before_argument' => ' '
                 },
-                'number' => 5,
                 'structure' => {
-                  'level' => 1
+                  'level' => 1,
+                  '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 756df41580..63257e5ccf 100644
--- a/tp/t/results/languages/multiple_lang_chapters_latex.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_latex.pl
@@ -906,10 +906,10 @@ $result_trees{'multiple_lang_chapters_latex'} = {
         'line_nr' => 25,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -1233,10 +1233,10 @@ $result_trees{'multiple_lang_chapters_latex'} = {
         'line_nr' => 33,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -1514,10 +1514,10 @@ $result_trees{'multiple_lang_chapters_latex'} = {
         'line_nr' => 41,
         'macro' => ''
       },
-      'number' => 3,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 3
       }
     },
     {
@@ -1624,10 +1624,10 @@ $result_trees{'multiple_lang_chapters_latex'} = {
         'line_nr' => 48,
         'macro' => ''
       },
-      'number' => 4,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 4
       }
     },
     {
@@ -1751,10 +1751,10 @@ $result_trees{'multiple_lang_chapters_latex'} = {
         'line_nr' => 52,
         'macro' => ''
       },
-      'number' => 5,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 5
       }
     }
   ],
@@ -2114,10 +2114,10 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -2134,11 +2134,11 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -2155,11 +2155,11 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 3,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 3
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -2176,11 +2176,11 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 4,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 4
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -2197,11 +2197,11 @@ $result_sectioning{'multiple_lang_chapters_latex'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 5,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 5
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -2261,9 +2261,9 @@ $result_nodes{'multiple_lang_chapters_latex'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter-ja',
@@ -2277,9 +2277,9 @@ $result_nodes{'multiple_lang_chapters_latex'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           }
         },
         'normalized' => 'chapter-en',
@@ -2293,9 +2293,9 @@ $result_nodes{'multiple_lang_chapters_latex'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => 3,
             'structure' => {
-              'level' => 1
+              'level' => 1,
+              'number' => 3
             }
           },
           'normalized' => 'chapter-fr_005fFR',
@@ -2309,9 +2309,9 @@ $result_nodes{'multiple_lang_chapters_latex'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => 4,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 4
               }
             },
             'normalized' => 'chapter-de',
@@ -2325,9 +2325,9 @@ $result_nodes{'multiple_lang_chapters_latex'} = {
                 'extra' => {
                   'spaces_before_argument' => ' '
                 },
-                'number' => 5,
                 'structure' => {
-                  'level' => 1
+                  'level' => 1,
+                  '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 76a96445c3..02d394e0d1 100644
--- a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
@@ -877,10 +877,10 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
         'line_nr' => 25,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -1204,10 +1204,10 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
         'line_nr' => 33,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -1485,10 +1485,10 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
         'line_nr' => 41,
         'macro' => ''
       },
-      'number' => 3,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 3
       }
     },
     {
@@ -1595,10 +1595,10 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
         'line_nr' => 48,
         'macro' => ''
       },
-      'number' => 4,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 4
       }
     },
     {
@@ -1722,10 +1722,10 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
         'line_nr' => 52,
         'macro' => ''
       },
-      'number' => 5,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 5
       }
     }
   ],
@@ -2081,10 +2081,10 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} 
= {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -2101,11 +2101,11 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} 
= {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -2122,11 +2122,11 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} 
= {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 3,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 3
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -2143,11 +2143,11 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} 
= {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 4,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 4
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -2164,11 +2164,11 @@ $result_sectioning{'multiple_lang_chapters_texi2html'} 
= {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 5,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 5
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -2228,9 +2228,9 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter-ja',
@@ -2244,9 +2244,9 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           }
         },
         'normalized' => 'chapter-en',
@@ -2260,9 +2260,9 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => 3,
             'structure' => {
-              'level' => 1
+              'level' => 1,
+              'number' => 3
             }
           },
           'normalized' => 'chapter-fr_005fFR',
@@ -2276,9 +2276,9 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => 4,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 4
               }
             },
             'normalized' => 'chapter-de',
@@ -2292,9 +2292,9 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
                 'extra' => {
                   'spaces_before_argument' => ' '
                 },
-                'number' => 5,
                 'structure' => {
-                  'level' => 1
+                  'level' => 1,
+                  'number' => 5
                 }
               },
               'normalized' => 'chapter-pt_005fBR',
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 abd3200162..cfd35bc6cb 100644
--- a/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
@@ -871,10 +871,10 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
         'line_nr' => 20,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -1098,10 +1098,10 @@ 
$result_sectioning{'anchor_links_xref_xrefautomaticsectiontitle'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1145,9 +1145,9 @@ 
$result_nodes{'anchor_links_xref_xrefautomaticsectiontitle'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 ddbf6dd7a3..d920844299 100644
--- a/tp/t/results/latex_tests/custom_headings.pl
+++ b/tp/t/results/latex_tests/custom_headings.pl
@@ -449,10 +449,10 @@ $result_trees{'custom_headings'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -489,10 +489,10 @@ $result_trees{'custom_headings'} = {
         'line_nr' => 20,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -641,10 +641,10 @@ $result_trees{'custom_headings'} = {
         'line_nr' => 22,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -757,10 +757,10 @@ $result_trees{'custom_headings'} = {
         'line_nr' => 34,
         'macro' => ''
       },
-      'number' => 3,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 3
       }
     }
   ],
@@ -981,23 +981,23 @@ $result_sectioning{'custom_headings'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1007,11 +1007,11 @@ $result_sectioning{'custom_headings'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1021,11 +1021,11 @@ $result_sectioning{'custom_headings'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 3,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 3
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1078,9 +1078,9 @@ $result_nodes{'custom_headings'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 d11f44717f..78d1aa7507 100644
--- a/tp/t/results/latex_tests/float_and_refs.pl
+++ b/tp/t/results/latex_tests/float_and_refs.pl
@@ -352,8 +352,10 @@ $result_trees{'float_and_refs'} = {
             'line_nr' => 9,
             'macro' => ''
           },
-          'number' => '1.1',
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => '1.1'
+          }
         },
         {
           'parent' => {},
@@ -527,8 +529,10 @@ $result_trees{'float_and_refs'} = {
             'line_nr' => 15,
             'macro' => ''
           },
-          'number' => '1.1',
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => '1.1'
+          }
         },
         {
           'parent' => {},
@@ -702,8 +706,10 @@ $result_trees{'float_and_refs'} = {
             'line_nr' => 21,
             'macro' => ''
           },
-          'number' => '1.1',
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => '1.1'
+          }
         },
         {
           'parent' => {},
@@ -720,10 +726,10 @@ $result_trees{'float_and_refs'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -1714,10 +1720,10 @@ $result_trees{'float_and_refs'} = {
         'line_nr' => 27,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -1853,10 +1859,10 @@ $result_trees{'float_and_refs'} = {
         'line_nr' => 47,
         'macro' => ''
       },
-      'number' => 3,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 3
       }
     }
   ],
@@ -2271,10 +2277,10 @@ $result_sectioning{'float_and_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -2284,11 +2290,11 @@ $result_sectioning{'float_and_refs'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -2298,11 +2304,11 @@ $result_sectioning{'float_and_refs'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 3,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 3
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -2354,9 +2360,9 @@ $result_nodes{'float_and_refs'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
@@ -2404,9 +2410,9 @@ $result_floats{'float_and_refs'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           }
         },
         'normalized' => 'no-type',
@@ -2421,7 +2427,9 @@ $result_floats{'float_and_refs'} = {
           'normalized' => ''
         }
       },
-      'number' => '1.1'
+      'structure' => {
+        'float_number' => '1.1'
+      }
     }
   ],
   'Figure' => [
@@ -2460,7 +2468,9 @@ $result_floats{'float_and_refs'} = {
           'normalized' => 'Figure'
         }
       },
-      'number' => '1.1'
+      'structure' => {
+        'float_number' => '1.1'
+      }
     }
   ],
   'Thing' => [
@@ -2499,7 +2509,9 @@ $result_floats{'float_and_refs'} = {
           'normalized' => 'Thing'
         }
       },
-      'number' => '1.1'
+      'structure' => {
+        'float_number' => '1.1'
+      }
     }
   ]
 };
diff --git a/tp/t/results/latex_tests/fonttextsize.pl 
b/tp/t/results/latex_tests/fonttextsize.pl
index b7780fb395..18b997d106 100644
--- a/tp/t/results/latex_tests/fonttextsize.pl
+++ b/tp/t/results/latex_tests/fonttextsize.pl
@@ -240,10 +240,10 @@ $result_trees{'fonttextsize'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -280,10 +280,10 @@ $result_trees{'fonttextsize'} = {
         'line_nr' => 11,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -362,10 +362,10 @@ $result_trees{'fonttextsize'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -448,10 +448,10 @@ $result_trees{'fonttextsize'} = {
         'line_nr' => 17,
         'macro' => ''
       },
-      'number' => '1.1.2',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.2'
       }
     },
     {
@@ -534,10 +534,10 @@ $result_trees{'fonttextsize'} = {
         'line_nr' => 22,
         'macro' => ''
       },
-      'number' => '1.1.3',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.3'
       }
     },
     {
@@ -585,10 +585,10 @@ $result_trees{'fonttextsize'} = {
         'line_nr' => 27,
         'macro' => ''
       },
-      'number' => '1.1.4',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.4'
       }
     }
   ],
@@ -751,24 +751,22 @@ $result_sectioning{'fonttextsize'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
                   'extra' => {
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 },
                 {
@@ -776,11 +774,11 @@ $result_sectioning{'fonttextsize'} = {
                   'extra' => {
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.2',
                   'section_prev' => {},
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.2'
                   }
                 },
                 {
@@ -788,11 +786,11 @@ $result_sectioning{'fonttextsize'} = {
                   'extra' => {
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.3',
                   'section_prev' => {},
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.3'
                   }
                 },
                 {
@@ -800,23 +798,25 @@ $result_sectioning{'fonttextsize'} = {
                   'extra' => {
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.4',
                   'section_prev' => {},
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.4'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -868,9 +868,9 @@ $result_nodes{'fonttextsize'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
diff --git a/tp/t/results/latex_tests/indices.pl 
b/tp/t/results/latex_tests/indices.pl
index 46db7013d1..c05afb5c9c 100644
--- a/tp/t/results/latex_tests/indices.pl
+++ b/tp/t/results/latex_tests/indices.pl
@@ -1026,10 +1026,10 @@ $result_trees{'indices'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -1254,10 +1254,10 @@ $result_sectioning{'indices'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1301,9 +1301,9 @@ $result_nodes{'indices'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'isindex' => 1,
diff --git a/tp/t/results/latex_tests/pagesizes.pl 
b/tp/t/results/latex_tests/pagesizes.pl
index d080d77a17..ae59063594 100644
--- a/tp/t/results/latex_tests/pagesizes.pl
+++ b/tp/t/results/latex_tests/pagesizes.pl
@@ -271,10 +271,10 @@ $result_trees{'pagesizes'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -373,10 +373,10 @@ $result_trees{'pagesizes'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     }
   ],
@@ -487,10 +487,10 @@ $result_sectioning{'pagesizes'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -500,11 +500,11 @@ $result_sectioning{'pagesizes'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -552,9 +552,9 @@ $result_nodes{'pagesizes'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
diff --git a/tp/t/results/latex_tests/pagetype.pl 
b/tp/t/results/latex_tests/pagetype.pl
index f1aaf97f07..9969e27529 100644
--- a/tp/t/results/latex_tests/pagetype.pl
+++ b/tp/t/results/latex_tests/pagetype.pl
@@ -320,10 +320,10 @@ $result_trees{'pagetype'} = {
         'line_nr' => 11,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -371,10 +371,10 @@ $result_trees{'pagetype'} = {
         'line_nr' => 22,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     }
   ],
@@ -506,10 +506,10 @@ $result_sectioning{'pagetype'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -519,11 +519,11 @@ $result_sectioning{'pagetype'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -571,9 +571,9 @@ $result_nodes{'pagetype'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 152eb603ee..8229af20e2 100644
--- a/tp/t/results/latex_tests/settitle_and_headings.pl
+++ b/tp/t/results/latex_tests/settitle_and_headings.pl
@@ -219,10 +219,10 @@ $result_trees{'settitle_and_headings'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -294,10 +294,10 @@ $result_sectioning{'settitle_and_headings'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
diff --git a/tp/t/results/latex_tests/shorttitlepage.pl 
b/tp/t/results/latex_tests/shorttitlepage.pl
index 9c11fa7759..73166c4d7d 100644
--- a/tp/t/results/latex_tests/shorttitlepage.pl
+++ b/tp/t/results/latex_tests/shorttitlepage.pl
@@ -256,10 +256,10 @@ $result_trees{'shorttitlepage'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -349,10 +349,10 @@ $result_sectioning{'shorttitlepage'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -396,9 +396,9 @@ $result_nodes{'shorttitlepage'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 2e2b054663..cdf2ceabd9 100644
--- a/tp/t/results/latex_tests/titlepage_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_classical.pl
@@ -574,10 +574,10 @@ $result_trees{'titlepage_classical'} = {
         'line_nr' => 25,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -727,10 +727,10 @@ $result_sectioning{'titlepage_classical'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -774,9 +774,9 @@ $result_nodes{'titlepage_classical'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 5598bfcd98..b94741e297 100644
--- a/tp/t/results/latex_tests/titlepage_in_top_node.pl
+++ b/tp/t/results/latex_tests/titlepage_in_top_node.pl
@@ -318,10 +318,10 @@ $result_trees{'titlepage_in_top_node'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -425,10 +425,10 @@ $result_sectioning{'titlepage_in_top_node'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -472,9 +472,9 @@ $result_nodes{'titlepage_in_top_node'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 349ab2e6d5..3025ae1eb0 100644
--- a/tp/t/results/latex_tests/titlepage_long_title.pl
+++ b/tp/t/results/latex_tests/titlepage_long_title.pl
@@ -309,10 +309,10 @@ $result_trees{'titlepage_long_title'} = {
         'line_nr' => 11,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -410,10 +410,10 @@ $result_sectioning{'titlepage_long_title'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -457,9 +457,9 @@ $result_nodes{'titlepage_long_title'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 4e03610d20..81eac6fe8b 100644
--- a/tp/t/results/latex_tests/titlepage_no_author.pl
+++ b/tp/t/results/latex_tests/titlepage_no_author.pl
@@ -295,10 +295,10 @@ $result_trees{'titlepage_no_author'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -392,10 +392,10 @@ $result_sectioning{'titlepage_no_author'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -439,9 +439,9 @@ $result_nodes{'titlepage_no_author'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 a5bb141a98..26e46b2c92 100644
--- a/tp/t/results/latex_tests/titlepage_no_title.pl
+++ b/tp/t/results/latex_tests/titlepage_no_title.pl
@@ -329,10 +329,10 @@ $result_trees{'titlepage_no_title'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -434,10 +434,10 @@ $result_sectioning{'titlepage_no_title'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -481,9 +481,9 @@ $result_nodes{'titlepage_no_title'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 7e6ee7fa47..c5253947f6 100644
--- a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
@@ -751,10 +751,10 @@ $result_trees{'titlepage_with_commands_classical'} = {
         'line_nr' => 31,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -940,10 +940,10 @@ $result_sectioning{'titlepage_with_commands_classical'} = 
{
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -987,9 +987,9 @@ $result_nodes{'titlepage_with_commands_classical'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
diff --git a/tp/t/results/layout/navigation.pl 
b/tp/t/results/layout/navigation.pl
index 2c42fbebc0..6478ced0c5 100644
--- a/tp/t/results/layout/navigation.pl
+++ b/tp/t/results/layout/navigation.pl
@@ -459,10 +459,10 @@ $result_trees{'navigation'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -882,10 +882,10 @@ $result_trees{'navigation'} = {
         'line_nr' => 20,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -986,10 +986,10 @@ $result_trees{'navigation'} = {
         'line_nr' => 54,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -1289,7 +1289,6 @@ $result_sectioning{'navigation'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -1303,7 +1302,6 @@ $result_sectioning{'navigation'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
@@ -1317,22 +1315,24 @@ $result_sectioning{'navigation'} = {
                     },
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1378,9 +1378,9 @@ $result_nodes{'navigation'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
@@ -1394,9 +1394,9 @@ $result_nodes{'navigation'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         'normalized' => 'section',
@@ -1410,9 +1410,9 @@ $result_nodes{'navigation'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '1.1.1',
             'structure' => {
-              'level' => 3
+              'level' => 3,
+              '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 633f3f2546..d9fd912cec 100644
--- a/tp/t/results/layout/navigation_chapter.pl
+++ b/tp/t/results/layout/navigation_chapter.pl
@@ -459,10 +459,10 @@ $result_trees{'navigation_chapter'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -882,10 +882,10 @@ $result_trees{'navigation_chapter'} = {
         'line_nr' => 20,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -986,10 +986,10 @@ $result_trees{'navigation_chapter'} = {
         'line_nr' => 54,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -1289,7 +1289,6 @@ $result_sectioning{'navigation_chapter'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -1303,7 +1302,6 @@ $result_sectioning{'navigation_chapter'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
@@ -1317,22 +1315,24 @@ $result_sectioning{'navigation_chapter'} = {
                     },
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1378,9 +1378,9 @@ $result_nodes{'navigation_chapter'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
@@ -1394,9 +1394,9 @@ $result_nodes{'navigation_chapter'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         'normalized' => 'section',
@@ -1410,9 +1410,9 @@ $result_nodes{'navigation_chapter'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '1.1.1',
             'structure' => {
-              'level' => 3
+              'level' => 3,
+              '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 2d74dffa1e..75d22b7b18 100644
--- a/tp/t/results/layout/navigation_chapter_no_header.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header.pl
@@ -459,10 +459,10 @@ $result_trees{'navigation_chapter_no_header'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -882,10 +882,10 @@ $result_trees{'navigation_chapter_no_header'} = {
         'line_nr' => 20,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -986,10 +986,10 @@ $result_trees{'navigation_chapter_no_header'} = {
         'line_nr' => 54,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -1289,7 +1289,6 @@ $result_sectioning{'navigation_chapter_no_header'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -1303,7 +1302,6 @@ $result_sectioning{'navigation_chapter_no_header'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
@@ -1317,22 +1315,24 @@ $result_sectioning{'navigation_chapter_no_header'} = {
                     },
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1378,9 +1378,9 @@ $result_nodes{'navigation_chapter_no_header'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
@@ -1394,9 +1394,9 @@ $result_nodes{'navigation_chapter_no_header'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         'normalized' => 'section',
@@ -1410,9 +1410,9 @@ $result_nodes{'navigation_chapter_no_header'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '1.1.1',
             'structure' => {
-              'level' => 3
+              'level' => 3,
+              '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 a633cb9786..4734ad2336 100644
--- a/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
@@ -459,10 +459,10 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -882,10 +882,10 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
         'line_nr' => 20,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -986,10 +986,10 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
         'line_nr' => 54,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -1289,7 +1289,6 @@ 
$result_sectioning{'navigation_chapter_no_header_vertical'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -1303,7 +1302,6 @@ 
$result_sectioning{'navigation_chapter_no_header_vertical'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
@@ -1317,22 +1315,24 @@ 
$result_sectioning{'navigation_chapter_no_header_vertical'} = {
                     },
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1378,9 +1378,9 @@ $result_nodes{'navigation_chapter_no_header_vertical'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
@@ -1394,9 +1394,9 @@ $result_nodes{'navigation_chapter_no_header_vertical'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         'normalized' => 'section',
@@ -1410,9 +1410,9 @@ $result_nodes{'navigation_chapter_no_header_vertical'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '1.1.1',
             'structure' => {
-              'level' => 3
+              'level' => 3,
+              '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 94c4a99301..906b922034 100644
--- a/tp/t/results/layout/navigation_chapter_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_vertical.pl
@@ -459,10 +459,10 @@ $result_trees{'navigation_chapter_vertical'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -882,10 +882,10 @@ $result_trees{'navigation_chapter_vertical'} = {
         'line_nr' => 20,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -986,10 +986,10 @@ $result_trees{'navigation_chapter_vertical'} = {
         'line_nr' => 54,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -1289,7 +1289,6 @@ $result_sectioning{'navigation_chapter_vertical'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -1303,7 +1302,6 @@ $result_sectioning{'navigation_chapter_vertical'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
@@ -1317,22 +1315,24 @@ $result_sectioning{'navigation_chapter_vertical'} = {
                     },
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1378,9 +1378,9 @@ $result_nodes{'navigation_chapter_vertical'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
@@ -1394,9 +1394,9 @@ $result_nodes{'navigation_chapter_vertical'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         'normalized' => 'section',
@@ -1410,9 +1410,9 @@ $result_nodes{'navigation_chapter_vertical'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '1.1.1',
             'structure' => {
-              'level' => 3
+              'level' => 3,
+              '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 be98b9870a..230b21fa16 100644
--- a/tp/t/results/layout/navigation_no_header.pl
+++ b/tp/t/results/layout/navigation_no_header.pl
@@ -459,10 +459,10 @@ $result_trees{'navigation_no_header'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -882,10 +882,10 @@ $result_trees{'navigation_no_header'} = {
         'line_nr' => 20,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -986,10 +986,10 @@ $result_trees{'navigation_no_header'} = {
         'line_nr' => 54,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -1289,7 +1289,6 @@ $result_sectioning{'navigation_no_header'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -1303,7 +1302,6 @@ $result_sectioning{'navigation_no_header'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
@@ -1317,22 +1315,24 @@ $result_sectioning{'navigation_no_header'} = {
                     },
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1378,9 +1378,9 @@ $result_nodes{'navigation_no_header'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
@@ -1394,9 +1394,9 @@ $result_nodes{'navigation_no_header'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         'normalized' => 'section',
@@ -1410,9 +1410,9 @@ $result_nodes{'navigation_no_header'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '1.1.1',
             'structure' => {
-              'level' => 3
+              'level' => 3,
+              '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 d6fc9fed0d..259499ffef 100644
--- a/tp/t/results/layout/navigation_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_no_header_vertical.pl
@@ -459,10 +459,10 @@ $result_trees{'navigation_no_header_vertical'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -882,10 +882,10 @@ $result_trees{'navigation_no_header_vertical'} = {
         'line_nr' => 20,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -986,10 +986,10 @@ $result_trees{'navigation_no_header_vertical'} = {
         'line_nr' => 54,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -1289,7 +1289,6 @@ $result_sectioning{'navigation_no_header_vertical'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -1303,7 +1302,6 @@ $result_sectioning{'navigation_no_header_vertical'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
@@ -1317,22 +1315,24 @@ $result_sectioning{'navigation_no_header_vertical'} = {
                     },
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1378,9 +1378,9 @@ $result_nodes{'navigation_no_header_vertical'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
@@ -1394,9 +1394,9 @@ $result_nodes{'navigation_no_header_vertical'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         'normalized' => 'section',
@@ -1410,9 +1410,9 @@ $result_nodes{'navigation_no_header_vertical'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '1.1.1',
             'structure' => {
-              'level' => 3
+              'level' => 3,
+              '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 18282c4e4d..a4176d0439 100644
--- a/tp/t/results/layout/navigation_node.pl
+++ b/tp/t/results/layout/navigation_node.pl
@@ -459,10 +459,10 @@ $result_trees{'navigation_node'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -882,10 +882,10 @@ $result_trees{'navigation_node'} = {
         'line_nr' => 20,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -986,10 +986,10 @@ $result_trees{'navigation_node'} = {
         'line_nr' => 54,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -1289,7 +1289,6 @@ $result_sectioning{'navigation_node'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -1303,7 +1302,6 @@ $result_sectioning{'navigation_node'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
@@ -1317,22 +1315,24 @@ $result_sectioning{'navigation_node'} = {
                     },
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1378,9 +1378,9 @@ $result_nodes{'navigation_node'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
@@ -1394,9 +1394,9 @@ $result_nodes{'navigation_node'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         'normalized' => 'section',
@@ -1410,9 +1410,9 @@ $result_nodes{'navigation_node'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '1.1.1',
             'structure' => {
-              'level' => 3
+              'level' => 3,
+              '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 a97da91f18..bc16ecb52a 100644
--- a/tp/t/results/layout/navigation_node_no_header.pl
+++ b/tp/t/results/layout/navigation_node_no_header.pl
@@ -459,10 +459,10 @@ $result_trees{'navigation_node_no_header'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -882,10 +882,10 @@ $result_trees{'navigation_node_no_header'} = {
         'line_nr' => 20,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -986,10 +986,10 @@ $result_trees{'navigation_node_no_header'} = {
         'line_nr' => 54,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -1289,7 +1289,6 @@ $result_sectioning{'navigation_node_no_header'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -1303,7 +1302,6 @@ $result_sectioning{'navigation_node_no_header'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
@@ -1317,22 +1315,24 @@ $result_sectioning{'navigation_node_no_header'} = {
                     },
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1378,9 +1378,9 @@ $result_nodes{'navigation_node_no_header'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
@@ -1394,9 +1394,9 @@ $result_nodes{'navigation_node_no_header'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         'normalized' => 'section',
@@ -1410,9 +1410,9 @@ $result_nodes{'navigation_node_no_header'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '1.1.1',
             'structure' => {
-              'level' => 3
+              'level' => 3,
+              '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 1645957b2c..28eff69ce7 100644
--- a/tp/t/results/layout/navigation_node_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_node_no_header_vertical.pl
@@ -459,10 +459,10 @@ $result_trees{'navigation_node_no_header_vertical'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -882,10 +882,10 @@ $result_trees{'navigation_node_no_header_vertical'} = {
         'line_nr' => 20,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -986,10 +986,10 @@ $result_trees{'navigation_node_no_header_vertical'} = {
         'line_nr' => 54,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -1289,7 +1289,6 @@ $result_sectioning{'navigation_node_no_header_vertical'} 
= {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -1303,7 +1302,6 @@ $result_sectioning{'navigation_node_no_header_vertical'} 
= {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
@@ -1317,22 +1315,24 @@ 
$result_sectioning{'navigation_node_no_header_vertical'} = {
                     },
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1378,9 +1378,9 @@ $result_nodes{'navigation_node_no_header_vertical'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
@@ -1394,9 +1394,9 @@ $result_nodes{'navigation_node_no_header_vertical'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         'normalized' => 'section',
@@ -1410,9 +1410,9 @@ $result_nodes{'navigation_node_no_header_vertical'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '1.1.1',
             'structure' => {
-              'level' => 3
+              'level' => 3,
+              '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 b4349a16d0..a3ebd5cbb4 100644
--- a/tp/t/results/layout/navigation_node_vertical.pl
+++ b/tp/t/results/layout/navigation_node_vertical.pl
@@ -459,10 +459,10 @@ $result_trees{'navigation_node_vertical'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -882,10 +882,10 @@ $result_trees{'navigation_node_vertical'} = {
         'line_nr' => 20,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -986,10 +986,10 @@ $result_trees{'navigation_node_vertical'} = {
         'line_nr' => 54,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -1289,7 +1289,6 @@ $result_sectioning{'navigation_node_vertical'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -1303,7 +1302,6 @@ $result_sectioning{'navigation_node_vertical'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
@@ -1317,22 +1315,24 @@ $result_sectioning{'navigation_node_vertical'} = {
                     },
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1378,9 +1378,9 @@ $result_nodes{'navigation_node_vertical'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
@@ -1394,9 +1394,9 @@ $result_nodes{'navigation_node_vertical'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         'normalized' => 'section',
@@ -1410,9 +1410,9 @@ $result_nodes{'navigation_node_vertical'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '1.1.1',
             'structure' => {
-              'level' => 3
+              'level' => 3,
+              '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 fae8c491eb..041ab20b19 100644
--- a/tp/t/results/layout/navigation_section.pl
+++ b/tp/t/results/layout/navigation_section.pl
@@ -459,10 +459,10 @@ $result_trees{'navigation_section'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -882,10 +882,10 @@ $result_trees{'navigation_section'} = {
         'line_nr' => 20,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -986,10 +986,10 @@ $result_trees{'navigation_section'} = {
         'line_nr' => 54,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -1289,7 +1289,6 @@ $result_sectioning{'navigation_section'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -1303,7 +1302,6 @@ $result_sectioning{'navigation_section'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
@@ -1317,22 +1315,24 @@ $result_sectioning{'navigation_section'} = {
                     },
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1378,9 +1378,9 @@ $result_nodes{'navigation_section'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
@@ -1394,9 +1394,9 @@ $result_nodes{'navigation_section'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         'normalized' => 'section',
@@ -1410,9 +1410,9 @@ $result_nodes{'navigation_section'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '1.1.1',
             'structure' => {
-              'level' => 3
+              'level' => 3,
+              '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 64caff1ad1..8057309bc7 100644
--- a/tp/t/results/layout/navigation_section_no_header.pl
+++ b/tp/t/results/layout/navigation_section_no_header.pl
@@ -459,10 +459,10 @@ $result_trees{'navigation_section_no_header'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -882,10 +882,10 @@ $result_trees{'navigation_section_no_header'} = {
         'line_nr' => 20,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -986,10 +986,10 @@ $result_trees{'navigation_section_no_header'} = {
         'line_nr' => 54,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -1289,7 +1289,6 @@ $result_sectioning{'navigation_section_no_header'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -1303,7 +1302,6 @@ $result_sectioning{'navigation_section_no_header'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
@@ -1317,22 +1315,24 @@ $result_sectioning{'navigation_section_no_header'} = {
                     },
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1378,9 +1378,9 @@ $result_nodes{'navigation_section_no_header'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
@@ -1394,9 +1394,9 @@ $result_nodes{'navigation_section_no_header'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         'normalized' => 'section',
@@ -1410,9 +1410,9 @@ $result_nodes{'navigation_section_no_header'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '1.1.1',
             'structure' => {
-              'level' => 3
+              'level' => 3,
+              '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 9d90740bc1..95c5a9d064 100644
--- a/tp/t/results/layout/navigation_section_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_section_no_header_vertical.pl
@@ -459,10 +459,10 @@ $result_trees{'navigation_section_no_header_vertical'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -882,10 +882,10 @@ $result_trees{'navigation_section_no_header_vertical'} = {
         'line_nr' => 20,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -986,10 +986,10 @@ $result_trees{'navigation_section_no_header_vertical'} = {
         'line_nr' => 54,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -1289,7 +1289,6 @@ 
$result_sectioning{'navigation_section_no_header_vertical'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -1303,7 +1302,6 @@ 
$result_sectioning{'navigation_section_no_header_vertical'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
@@ -1317,22 +1315,24 @@ 
$result_sectioning{'navigation_section_no_header_vertical'} = {
                     },
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1378,9 +1378,9 @@ $result_nodes{'navigation_section_no_header_vertical'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
@@ -1394,9 +1394,9 @@ $result_nodes{'navigation_section_no_header_vertical'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         'normalized' => 'section',
@@ -1410,9 +1410,9 @@ $result_nodes{'navigation_section_no_header_vertical'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '1.1.1',
             'structure' => {
-              'level' => 3
+              'level' => 3,
+              '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 73988d63b5..993429ecd9 100644
--- a/tp/t/results/layout/navigation_section_vertical.pl
+++ b/tp/t/results/layout/navigation_section_vertical.pl
@@ -459,10 +459,10 @@ $result_trees{'navigation_section_vertical'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -882,10 +882,10 @@ $result_trees{'navigation_section_vertical'} = {
         'line_nr' => 20,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -986,10 +986,10 @@ $result_trees{'navigation_section_vertical'} = {
         'line_nr' => 54,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -1289,7 +1289,6 @@ $result_sectioning{'navigation_section_vertical'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -1303,7 +1302,6 @@ $result_sectioning{'navigation_section_vertical'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
@@ -1317,22 +1315,24 @@ $result_sectioning{'navigation_section_vertical'} = {
                     },
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1378,9 +1378,9 @@ $result_nodes{'navigation_section_vertical'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
@@ -1394,9 +1394,9 @@ $result_nodes{'navigation_section_vertical'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         'normalized' => 'section',
@@ -1410,9 +1410,9 @@ $result_nodes{'navigation_section_vertical'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '1.1.1',
             'structure' => {
-              'level' => 3
+              'level' => 3,
+              '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 e9be9d7476..cf25fc1d16 100644
--- a/tp/t/results/layout/navigation_vertical.pl
+++ b/tp/t/results/layout/navigation_vertical.pl
@@ -459,10 +459,10 @@ $result_trees{'navigation_vertical'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -882,10 +882,10 @@ $result_trees{'navigation_vertical'} = {
         'line_nr' => 20,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -986,10 +986,10 @@ $result_trees{'navigation_vertical'} = {
         'line_nr' => 54,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -1289,7 +1289,6 @@ $result_sectioning{'navigation_vertical'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -1303,7 +1302,6 @@ $result_sectioning{'navigation_vertical'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
@@ -1317,22 +1315,24 @@ $result_sectioning{'navigation_vertical'} = {
                     },
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1378,9 +1378,9 @@ $result_nodes{'navigation_vertical'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
@@ -1394,9 +1394,9 @@ $result_nodes{'navigation_vertical'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         'normalized' => 'section',
@@ -1410,9 +1410,9 @@ $result_nodes{'navigation_vertical'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '1.1.1',
             'structure' => {
-              'level' => 3
+              'level' => 3,
+              '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 48e61c3b2a..088b02b42f 100644
--- a/tp/t/results/layout/no_monolithic.pl
+++ b/tp/t/results/layout/no_monolithic.pl
@@ -528,10 +528,10 @@ $result_trees{'no_monolithic'} = {
         'line_nr' => 17,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -697,10 +697,10 @@ $result_sectioning{'no_monolithic'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -744,9 +744,9 @@ $result_nodes{'no_monolithic'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 3c686796a3..a6099d6b1a 100644
--- a/tp/t/results/macro/macro_in_misc_commands.pl
+++ b/tp/t/results/macro/macro_in_misc_commands.pl
@@ -3497,10 +3497,10 @@ $result_trees{'macro_in_misc_commands'} = {
         'line_nr' => 204,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -4299,10 +4299,10 @@ $result_sectioning{'macro_in_misc_commands'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -4346,9 +4346,9 @@ $result_nodes{'macro_in_misc_commands'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'node-atext',
diff --git a/tp/t/results/menu/comment_on_menu_line.pl 
b/tp/t/results/menu/comment_on_menu_line.pl
index 7401ddd337..b75ef840a1 100644
--- a/tp/t/results/menu/comment_on_menu_line.pl
+++ b/tp/t/results/menu/comment_on_menu_line.pl
@@ -222,10 +222,10 @@ $result_trees{'comment_on_menu_line'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -339,10 +339,10 @@ $result_sectioning{'comment_on_menu_line'} = {
         },
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -360,9 +360,9 @@ $result_nodes{'comment_on_menu_line'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     'normalized' => 'Top',
diff --git a/tp/t/results/menu/detailmenu_on_subnodes.pl 
b/tp/t/results/menu/detailmenu_on_subnodes.pl
index ac32def457..d3acddcf6b 100644
--- a/tp/t/results/menu/detailmenu_on_subnodes.pl
+++ b/tp/t/results/menu/detailmenu_on_subnodes.pl
@@ -792,10 +792,10 @@ $result_trees{'detailmenu_on_subnodes'} = {
         'line_nr' => 21,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -873,10 +873,10 @@ $result_trees{'detailmenu_on_subnodes'} = {
         'line_nr' => 28,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -1127,10 +1127,10 @@ $result_trees{'detailmenu_on_subnodes'} = {
         'line_nr' => 31,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -1208,10 +1208,10 @@ $result_trees{'detailmenu_on_subnodes'} = {
         'line_nr' => 39,
         'macro' => ''
       },
-      'number' => '2.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '2.1'
       }
     },
     {
@@ -1579,7 +1579,6 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -1593,16 +1592,17 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1619,7 +1619,6 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -1633,10 +1632,10 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '2.1',
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '2.1'
               }
             },
             {
@@ -1661,7 +1660,8 @@ $result_sectioning{'detailmenu_on_subnodes'} = {
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1713,9 +1713,9 @@ $result_nodes{'detailmenu_on_subnodes'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
@@ -1729,9 +1729,9 @@ $result_nodes{'detailmenu_on_subnodes'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         'normalized' => 'section',
@@ -1762,9 +1762,9 @@ $result_nodes{'detailmenu_on_subnodes'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           }
         },
         'normalized' => 'chapter-2',
@@ -1778,9 +1778,9 @@ $result_nodes{'detailmenu_on_subnodes'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '2.1',
             'structure' => {
-              'level' => 2
+              'level' => 2,
+              'number' => '2.1'
             }
           },
           'normalized' => 'section-chap-2',
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 93c8e14f7b..c2a17baf18 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
@@ -513,8 +513,10 @@ $result_trees{'comment_space_command_on_line'} = {
             'line_nr' => 14,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         },
         {
           'parent' => {},
@@ -822,7 +824,9 @@ $result_floats{'comment_space_command_on_line'} = {
           'normalized' => 'Text'
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ]
 };
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 fc166fd45d..9494089516 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
@@ -101,10 +101,10 @@ $result_trees{'no_empty_line_between_headings'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -134,10 +134,10 @@ $result_trees{'no_empty_line_between_headings'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     }
   ],
@@ -187,23 +187,23 @@ $result_sectioning{'no_empty_line_between_headings'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
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 b77bb69030..1cb483157b 100644
--- a/tp/t/results/misc_commands/text_before_line_command.pl
+++ b/tp/t/results/misc_commands/text_before_line_command.pl
@@ -286,10 +286,10 @@ $result_trees{'text_before_line_command'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -372,10 +372,10 @@ $result_sectioning{'text_before_line_command'} = {
         },
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -393,9 +393,9 @@ $result_nodes{'text_before_line_command'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        '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 696a5e2c90..cd928c6c8f 100644
--- a/tp/t/results/morecoverage/formatting_fr.pl
+++ b/tp/t/results/morecoverage/formatting_fr.pl
@@ -2470,10 +2470,10 @@ $result_trees{'formatting_fr'} = {
         'line_nr' => 85,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -2900,10 +2900,10 @@ $result_trees{'formatting_fr'} = {
         'line_nr' => 100,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -3194,10 +3194,10 @@ $result_trees{'formatting_fr'} = {
         'line_nr' => 114,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -3275,10 +3275,10 @@ $result_trees{'formatting_fr'} = {
         'line_nr' => 124,
         'macro' => ''
       },
-      'number' => '1.1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 4
+        'level' => 4,
+        'number' => '1.1.1.1'
       }
     },
     {
@@ -3356,10 +3356,10 @@ $result_trees{'formatting_fr'} = {
         'line_nr' => 127,
         'macro' => ''
       },
-      'number' => '1.1.1.2',
       'parent' => {},
       'structure' => {
-        'level' => 4
+        'level' => 4,
+        'number' => '1.1.1.2'
       }
     },
     {
@@ -4333,7 +4333,6 @@ $result_sectioning{'formatting_fr'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -4347,7 +4346,6 @@ $result_sectioning{'formatting_fr'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
@@ -4361,7 +4359,6 @@ $result_sectioning{'formatting_fr'} = {
                     },
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_childs' => [
                     {
                       'cmdname' => 'subsubsection',
@@ -4375,10 +4372,10 @@ $result_sectioning{'formatting_fr'} = {
                         },
                         'spaces_before_argument' => ' '
                       },
-                      'number' => '1.1.1.1',
                       'section_up' => {},
                       'structure' => {
-                        'level' => 4
+                        'level' => 4,
+                        'number' => '1.1.1.1'
                       }
                     },
                     {
@@ -4393,29 +4390,32 @@ $result_sectioning{'formatting_fr'} = {
                         },
                         'spaces_before_argument' => ' '
                       },
-                      'number' => '1.1.1.2',
                       'section_prev' => {},
                       'section_up' => {},
                       'structure' => {
-                        'level' => 4
+                        'level' => 4,
+                        'number' => '1.1.1.2'
                       }
                     }
                   ],
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -4490,9 +4490,9 @@ $result_nodes{'formatting_fr'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
diff --git a/tp/t/results/morecoverage/texi_formatting.pl 
b/tp/t/results/morecoverage/texi_formatting.pl
index 2db99002ae..3b4de5ba8c 100644
--- a/tp/t/results/morecoverage/texi_formatting.pl
+++ b/tp/t/results/morecoverage/texi_formatting.pl
@@ -2470,10 +2470,10 @@ $result_trees{'texi_formatting'} = {
         'line_nr' => 85,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -2900,10 +2900,10 @@ $result_trees{'texi_formatting'} = {
         'line_nr' => 100,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -3194,10 +3194,10 @@ $result_trees{'texi_formatting'} = {
         'line_nr' => 114,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -3275,10 +3275,10 @@ $result_trees{'texi_formatting'} = {
         'line_nr' => 124,
         'macro' => ''
       },
-      'number' => '1.1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 4
+        'level' => 4,
+        'number' => '1.1.1.1'
       }
     },
     {
@@ -3356,10 +3356,10 @@ $result_trees{'texi_formatting'} = {
         'line_nr' => 127,
         'macro' => ''
       },
-      'number' => '1.1.1.2',
       'parent' => {},
       'structure' => {
-        'level' => 4
+        'level' => 4,
+        'number' => '1.1.1.2'
       }
     },
     {
@@ -4333,7 +4333,6 @@ $result_sectioning{'texi_formatting'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -4347,7 +4346,6 @@ $result_sectioning{'texi_formatting'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
@@ -4361,7 +4359,6 @@ $result_sectioning{'texi_formatting'} = {
                     },
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_childs' => [
                     {
                       'cmdname' => 'subsubsection',
@@ -4375,10 +4372,10 @@ $result_sectioning{'texi_formatting'} = {
                         },
                         'spaces_before_argument' => ' '
                       },
-                      'number' => '1.1.1.1',
                       'section_up' => {},
                       'structure' => {
-                        'level' => 4
+                        'level' => 4,
+                        'number' => '1.1.1.1'
                       }
                     },
                     {
@@ -4393,29 +4390,32 @@ $result_sectioning{'texi_formatting'} = {
                         },
                         'spaces_before_argument' => ' '
                       },
-                      'number' => '1.1.1.2',
                       'section_prev' => {},
                       'section_up' => {},
                       'structure' => {
-                        'level' => 4
+                        'level' => 4,
+                        'number' => '1.1.1.2'
                       }
                     }
                   ],
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -4490,9 +4490,9 @@ $result_nodes{'texi_formatting'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
diff --git a/tp/t/results/moreindices/index_no_node.pl 
b/tp/t/results/moreindices/index_no_node.pl
index 6d87b95447..128622b63f 100644
--- a/tp/t/results/moreindices/index_no_node.pl
+++ b/tp/t/results/moreindices/index_no_node.pl
@@ -1112,10 +1112,10 @@ $result_trees{'index_no_node'} = {
         'line_nr' => 42,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -1169,10 +1169,10 @@ $result_trees{'index_no_node'} = {
         'line_nr' => 49,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -1482,11 +1482,11 @@ $result_sectioning{'index_no_node'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_prev' => {},
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       },
       'toplevel_prev' => {},
       'toplevel_up' => {}
@@ -1496,11 +1496,11 @@ $result_sectioning{'index_no_node'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 2,
       'section_prev' => {},
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       },
       'toplevel_prev' => {},
       'toplevel_up' => {}
diff --git a/tp/t/results/moreindices/index_split.pl 
b/tp/t/results/moreindices/index_split.pl
index cf30829573..c27405366b 100644
--- a/tp/t/results/moreindices/index_split.pl
+++ b/tp/t/results/moreindices/index_split.pl
@@ -1461,10 +1461,10 @@ $result_trees{'index_split'} = {
         'line_nr' => 37,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -1858,10 +1858,10 @@ $result_trees{'index_split'} = {
         'line_nr' => 52,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -1956,10 +1956,10 @@ $result_trees{'index_split'} = {
         'line_nr' => 67,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -2186,10 +2186,10 @@ $result_trees{'index_split'} = {
         'line_nr' => 72,
         'macro' => ''
       },
-      'number' => '1.1.2',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.2'
       }
     },
     {
@@ -2284,10 +2284,10 @@ $result_trees{'index_split'} = {
         'line_nr' => 83,
         'macro' => ''
       },
-      'number' => '1.2',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.2'
       }
     },
     {
@@ -2450,10 +2450,10 @@ $result_trees{'index_split'} = {
         'line_nr' => 88,
         'macro' => ''
       },
-      'number' => '1.3',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.3'
       }
     },
     {
@@ -3118,10 +3118,10 @@ $result_trees{'index_split'} = {
         'line_nr' => 117,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -3835,7 +3835,6 @@ $result_sectioning{'index_split'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -3850,7 +3849,6 @@ $result_sectioning{'index_split'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
@@ -3864,10 +3862,10 @@ $result_sectioning{'index_split'} = {
                     },
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 },
                 {
@@ -3883,17 +3881,18 @@ $result_sectioning{'index_split'} = {
                     },
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.2',
                   'section_prev' => {},
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.2'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             },
             {
@@ -3908,11 +3907,11 @@ $result_sectioning{'index_split'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.2',
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.2'
               }
             },
             {
@@ -3928,17 +3927,18 @@ $result_sectioning{'index_split'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.3',
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.3'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -3955,11 +3955,11 @@ $result_sectioning{'index_split'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -4032,9 +4032,9 @@ $result_nodes{'index_split'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'isindex' => 1,
@@ -4049,9 +4049,9 @@ $result_nodes{'index_split'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         'isindex' => 1,
@@ -4066,9 +4066,9 @@ $result_nodes{'index_split'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '1.1.1',
             'structure' => {
-              'level' => 3
+              'level' => 3,
+              'number' => '1.1.1'
             }
           },
           'normalized' => 'subsection-1',
@@ -4082,9 +4082,9 @@ $result_nodes{'index_split'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1.2',
               'structure' => {
-                'level' => 3
+                'level' => 3,
+                'number' => '1.1.2'
               }
             },
             'isindex' => 1,
@@ -4119,9 +4119,9 @@ $result_nodes{'index_split'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '1.2',
             'structure' => {
-              'level' => 2
+              'level' => 2,
+              'number' => '1.2'
             }
           },
           'normalized' => 'section-2',
@@ -4135,9 +4135,9 @@ $result_nodes{'index_split'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.3',
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.3'
               }
             },
             'isindex' => 1,
@@ -4184,9 +4184,9 @@ $result_nodes{'index_split'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            '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 a8ba1ab123..0560768926 100644
--- a/tp/t/results/moreindices/index_split_nodes.pl
+++ b/tp/t/results/moreindices/index_split_nodes.pl
@@ -1461,10 +1461,10 @@ $result_trees{'index_split_nodes'} = {
         'line_nr' => 37,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -1858,10 +1858,10 @@ $result_trees{'index_split_nodes'} = {
         'line_nr' => 52,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -1956,10 +1956,10 @@ $result_trees{'index_split_nodes'} = {
         'line_nr' => 67,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -2186,10 +2186,10 @@ $result_trees{'index_split_nodes'} = {
         'line_nr' => 72,
         'macro' => ''
       },
-      'number' => '1.1.2',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.2'
       }
     },
     {
@@ -2284,10 +2284,10 @@ $result_trees{'index_split_nodes'} = {
         'line_nr' => 83,
         'macro' => ''
       },
-      'number' => '1.2',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.2'
       }
     },
     {
@@ -2450,10 +2450,10 @@ $result_trees{'index_split_nodes'} = {
         'line_nr' => 88,
         'macro' => ''
       },
-      'number' => '1.3',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.3'
       }
     },
     {
@@ -3118,10 +3118,10 @@ $result_trees{'index_split_nodes'} = {
         'line_nr' => 117,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -3835,7 +3835,6 @@ $result_sectioning{'index_split_nodes'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -3850,7 +3849,6 @@ $result_sectioning{'index_split_nodes'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
@@ -3864,10 +3862,10 @@ $result_sectioning{'index_split_nodes'} = {
                     },
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 },
                 {
@@ -3883,17 +3881,18 @@ $result_sectioning{'index_split_nodes'} = {
                     },
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.2',
                   'section_prev' => {},
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.2'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             },
             {
@@ -3908,11 +3907,11 @@ $result_sectioning{'index_split_nodes'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.2',
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.2'
               }
             },
             {
@@ -3928,17 +3927,18 @@ $result_sectioning{'index_split_nodes'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.3',
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.3'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -3955,11 +3955,11 @@ $result_sectioning{'index_split_nodes'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -4032,9 +4032,9 @@ $result_nodes{'index_split_nodes'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'isindex' => 1,
@@ -4049,9 +4049,9 @@ $result_nodes{'index_split_nodes'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         'isindex' => 1,
@@ -4066,9 +4066,9 @@ $result_nodes{'index_split_nodes'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '1.1.1',
             'structure' => {
-              'level' => 3
+              'level' => 3,
+              'number' => '1.1.1'
             }
           },
           'normalized' => 'subsection-1',
@@ -4082,9 +4082,9 @@ $result_nodes{'index_split_nodes'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1.2',
               'structure' => {
-                'level' => 3
+                'level' => 3,
+                'number' => '1.1.2'
               }
             },
             'isindex' => 1,
@@ -4119,9 +4119,9 @@ $result_nodes{'index_split_nodes'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '1.2',
             'structure' => {
-              'level' => 2
+              'level' => 2,
+              'number' => '1.2'
             }
           },
           'normalized' => 'section-2',
@@ -4135,9 +4135,9 @@ $result_nodes{'index_split_nodes'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.3',
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.3'
               }
             },
             'isindex' => 1,
@@ -4184,9 +4184,9 @@ $result_nodes{'index_split_nodes'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            '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 4df9adcae5..563105c105 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
@@ -2560,10 +2560,10 @@ 
$result_trees{'nodes_before_top_and_sections_monolithic'} = {
         'line_nr' => 87,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -3300,10 +3300,10 @@ 
$result_sectioning{'nodes_before_top_and_sections_monolithic'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
diff --git a/tp/t/results/moreindices/split_chapter_index.pl 
b/tp/t/results/moreindices/split_chapter_index.pl
index 3afbc7d983..1922735ce8 100644
--- a/tp/t/results/moreindices/split_chapter_index.pl
+++ b/tp/t/results/moreindices/split_chapter_index.pl
@@ -918,10 +918,10 @@ $result_trees{'split_chapter_index'} = {
         'line_nr' => 17,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -1209,10 +1209,10 @@ $result_trees{'split_chapter_index'} = {
         'line_nr' => 38,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -1354,10 +1354,10 @@ $result_trees{'split_chapter_index'} = {
         'line_nr' => 49,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -1700,7 +1700,6 @@ $result_sectioning{'split_chapter_index'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -1714,7 +1713,6 @@ $result_sectioning{'split_chapter_index'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
@@ -1728,22 +1726,24 @@ $result_sectioning{'split_chapter_index'} = {
                     },
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1789,9 +1789,9 @@ $result_nodes{'split_chapter_index'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'isindex' => 1,
@@ -1806,9 +1806,9 @@ $result_nodes{'split_chapter_index'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         'normalized' => 'section-1',
@@ -1822,9 +1822,9 @@ $result_nodes{'split_chapter_index'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '1.1.1',
             'structure' => {
-              'level' => 3
+              'level' => 3,
+              'number' => '1.1.1'
             }
           },
           'normalized' => 'subsection-1',
diff --git a/tp/t/results/moresectioning/equivalent_nodes.pl 
b/tp/t/results/moresectioning/equivalent_nodes.pl
index 9fd80838fc..15a6154e8a 100644
--- a/tp/t/results/moresectioning/equivalent_nodes.pl
+++ b/tp/t/results/moresectioning/equivalent_nodes.pl
@@ -515,7 +515,8 @@ $result_trees{'equivalent_nodes'} = {
             'line_nr' => 17,
             'macro' => ''
           },
-          'parent' => {}
+          'parent' => {},
+          'structure' => {}
         },
         {
           'parent' => {},
@@ -1041,7 +1042,8 @@ $result_floats{'equivalent_nodes'} = {
           ],
           'normalized' => 'Figure'
         }
-      }
+      },
+      'structure' => {}
     }
   ]
 };
diff --git a/tp/t/results/moresectioning/equivalent_nodes_no_node.pl 
b/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
index 6d93337837..189694ba72 100644
--- a/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
+++ b/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
@@ -515,7 +515,8 @@ $result_trees{'equivalent_nodes_no_node'} = {
             'line_nr' => 17,
             'macro' => ''
           },
-          'parent' => {}
+          'parent' => {},
+          'structure' => {}
         },
         {
           'parent' => {},
@@ -1041,7 +1042,8 @@ $result_floats{'equivalent_nodes_no_node'} = {
           ],
           'normalized' => 'Figure'
         }
-      }
+      },
+      'structure' => {}
     }
   ]
 };
diff --git a/tp/t/results/moresectioning/more_sections_than_nodes.pl 
b/tp/t/results/moresectioning/more_sections_than_nodes.pl
index 39168535c9..10a6637239 100644
--- a/tp/t/results/moresectioning/more_sections_than_nodes.pl
+++ b/tp/t/results/moresectioning/more_sections_than_nodes.pl
@@ -416,10 +416,10 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 14,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -497,10 +497,10 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 17,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -537,10 +537,10 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'number' => '2.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '2.1'
       }
     },
     {
@@ -789,10 +789,10 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 22,
         'macro' => ''
       },
-      'number' => 3,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 3
       }
     },
     {
@@ -829,10 +829,10 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 28,
         'macro' => ''
       },
-      'number' => '3.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '3.1'
       }
     },
     {
@@ -910,10 +910,10 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 31,
         'macro' => ''
       },
-      'number' => '3.2',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '3.2'
       }
     },
     {
@@ -950,10 +950,10 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 33,
         'macro' => ''
       },
-      'number' => '3.3',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '3.3'
       }
     },
     {
@@ -990,10 +990,10 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 35,
         'macro' => ''
       },
-      'number' => 4,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 4
       }
     },
     {
@@ -1030,10 +1030,10 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 37,
         'macro' => ''
       },
-      'number' => '4.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '4.1'
       }
     },
     {
@@ -1070,10 +1070,10 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 39,
         'macro' => ''
       },
-      'number' => '4.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '4.1.1'
       }
     },
     {
@@ -1189,10 +1189,10 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 42,
         'macro' => ''
       },
-      'number' => '4.1.2',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '4.1.2'
       }
     },
     {
@@ -1229,10 +1229,10 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 44,
         'macro' => ''
       },
-      'number' => 'A',
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 'A'
       }
     },
     {
@@ -1528,10 +1528,10 @@ $result_sectioning{'more_sections_than_nodes'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1548,24 +1548,24 @@ $result_sectioning{'more_sections_than_nodes'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_childs' => [
             {
               'cmdname' => 'section',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '2.1',
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '2.1'
               }
             }
           ],
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1582,17 +1582,16 @@ $result_sectioning{'more_sections_than_nodes'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 3,
           'section_childs' => [
             {
               'cmdname' => 'section',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '3.1',
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '3.1'
               }
             },
             {
@@ -1607,11 +1606,11 @@ $result_sectioning{'more_sections_than_nodes'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '3.2',
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '3.2'
               }
             },
             {
@@ -1619,18 +1618,19 @@ $result_sectioning{'more_sections_than_nodes'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '3.3',
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '3.3'
               }
             }
           ],
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 3
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1640,24 +1640,22 @@ $result_sectioning{'more_sections_than_nodes'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 4,
           'section_childs' => [
             {
               'cmdname' => 'section',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '4.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
                   'extra' => {
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '4.1.1',
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '4.1.1'
                   }
                 },
                 {
@@ -1672,24 +1670,26 @@ $result_sectioning{'more_sections_than_nodes'} = {
                     },
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '4.1.2',
                   'section_prev' => {},
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '4.1.2'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '4.1'
               }
             }
           ],
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 4
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1699,11 +1699,11 @@ $result_sectioning{'more_sections_than_nodes'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 'A',
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 'A'
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1773,9 +1773,9 @@ $result_nodes{'more_sections_than_nodes'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 2,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 2
         }
       },
       'normalized' => 'n-c2',
@@ -1789,9 +1789,9 @@ $result_nodes{'more_sections_than_nodes'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 3,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 3
           }
         },
         'normalized' => 'n-c3',
@@ -1805,9 +1805,9 @@ $result_nodes{'more_sections_than_nodes'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '3.2',
             'structure' => {
-              'level' => 2
+              'level' => 2,
+              'number' => '3.2'
             }
           },
           'normalized' => 'n-c3-s-2',
@@ -1838,9 +1838,9 @@ $result_nodes{'more_sections_than_nodes'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '4.1.2',
             'structure' => {
-              'level' => 3
+              'level' => 3,
+              '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 52642f9d8f..f1ff1ae497 100644
--- a/tp/t/results/moresectioning/node_footnote_end.pl
+++ b/tp/t/results/moresectioning/node_footnote_end.pl
@@ -1006,10 +1006,10 @@ $result_trees{'node_footnote_end'} = {
         'line_nr' => 25,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -1447,10 +1447,10 @@ $result_sectioning{'node_footnote_end'} = {
         },
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -1486,9 +1486,9 @@ $result_nodes{'node_footnote_end'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => 1,
             'structure' => {
-              'level' => 1
+              'level' => 1,
+              'number' => 1
             }
           },
           'normalized' => 'chapter',
diff --git a/tp/t/results/moresectioning/node_footnote_separated.pl 
b/tp/t/results/moresectioning/node_footnote_separated.pl
index e509efc659..a7dafbe183 100644
--- a/tp/t/results/moresectioning/node_footnote_separated.pl
+++ b/tp/t/results/moresectioning/node_footnote_separated.pl
@@ -1006,10 +1006,10 @@ $result_trees{'node_footnote_separated'} = {
         'line_nr' => 25,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -1447,10 +1447,10 @@ $result_sectioning{'node_footnote_separated'} = {
         },
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -1486,9 +1486,9 @@ $result_nodes{'node_footnote_separated'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => 1,
             'structure' => {
-              'level' => 1
+              'level' => 1,
+              'number' => 1
             }
           },
           'normalized' => 'chapter',
diff --git a/tp/t/results/moresectioning/node_footnote_use_node.pl 
b/tp/t/results/moresectioning/node_footnote_use_node.pl
index e49e4eb449..0c2251d8b0 100644
--- a/tp/t/results/moresectioning/node_footnote_use_node.pl
+++ b/tp/t/results/moresectioning/node_footnote_use_node.pl
@@ -1006,10 +1006,10 @@ $result_trees{'node_footnote_use_node'} = {
         'line_nr' => 25,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -1447,10 +1447,10 @@ $result_sectioning{'node_footnote_use_node'} = {
         },
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -1486,9 +1486,9 @@ $result_nodes{'node_footnote_use_node'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => 1,
             'structure' => {
-              'level' => 1
+              'level' => 1,
+              'number' => 1
             }
           },
           'normalized' => 'chapter',
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 77b30b2694..851657e711 100644
--- a/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
+++ b/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
@@ -539,10 +539,10 @@ $result_trees{'nodes_after_top_before_chapter'} = {
         'line_nr' => 18,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -696,10 +696,10 @@ $result_sectioning{'nodes_after_top_before_chapter'} = {
         },
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -729,9 +729,9 @@ $result_nodes{'nodes_after_top_before_chapter'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            '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 a265f4c715..9d0c33a8f9 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
@@ -539,10 +539,10 @@ 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
         'line_nr' => 18,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -696,10 +696,10 @@ 
$result_sectioning{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
         },
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -729,9 +729,9 @@ 
$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            '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 fa8a968926..32930d3c70 100644
--- a/tp/t/results/moresectioning/nodes_after_top_before_section.pl
+++ b/tp/t/results/moresectioning/nodes_after_top_before_section.pl
@@ -539,10 +539,10 @@ $result_trees{'nodes_after_top_before_section'} = {
         'line_nr' => 18,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => 1
       }
     },
     {
@@ -696,10 +696,10 @@ $result_sectioning{'nodes_after_top_before_section'} = {
         },
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => 1
       }
     }
   ],
@@ -729,9 +729,9 @@ $result_nodes{'nodes_after_top_before_section'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'structure' => {
-            'level' => 3
+            'level' => 3,
+            '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 21ec1df492..03854a7e6a 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
@@ -539,10 +539,10 @@ $result_trees{'nodes_after_top_before_section_use_nodes'} 
= {
         'line_nr' => 18,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => 1
       }
     },
     {
@@ -696,10 +696,10 @@ 
$result_sectioning{'nodes_after_top_before_section_use_nodes'} = {
         },
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => 1
       }
     }
   ],
@@ -729,9 +729,9 @@ $result_nodes{'nodes_after_top_before_section_use_nodes'} = 
{
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'structure' => {
-            'level' => 3
+            'level' => 3,
+            '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 f4c8ef4b63..d90d4ca7a1 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
@@ -539,10 +539,10 @@ 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
         'line_nr' => 18,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => 1
       }
     },
     {
@@ -696,10 +696,10 @@ 
$result_sectioning{'nodes_after_top_before_section_use_nodes_chapter'} = {
         },
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => 1
       }
     }
   ],
@@ -729,9 +729,9 @@ 
$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'structure' => {
-            'level' => 3
+            'level' => 3,
+            '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 fd11c6b3ff..ecc2757964 100644
--- a/tp/t/results/moresectioning/placed_things_before_element.pl
+++ b/tp/t/results/moresectioning/placed_things_before_element.pl
@@ -464,8 +464,10 @@ $result_trees{'placed_things_before_element'} = {
             'line_nr' => 22,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         },
         {
           'parent' => {},
@@ -832,10 +834,10 @@ $result_trees{'placed_things_before_element'} = {
         'line_nr' => 35,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     },
     {
@@ -1066,10 +1068,10 @@ $result_sectioning{'placed_things_before_element'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     }
   ],
@@ -1111,7 +1113,9 @@ $result_floats{'placed_things_before_element'} = {
           'normalized' => ''
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ]
 };
diff --git a/tp/t/results/moresectioning/sectioning_frames.pl 
b/tp/t/results/moresectioning/sectioning_frames.pl
index 56a4b6ba0c..ef7ee57586 100644
--- a/tp/t/results/moresectioning/sectioning_frames.pl
+++ b/tp/t/results/moresectioning/sectioning_frames.pl
@@ -1057,10 +1057,10 @@ $result_trees{'sectioning_frames'} = {
         'line_nr' => 30,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -2107,10 +2107,10 @@ $result_trees{'sectioning_frames'} = {
         'line_nr' => 74,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -2360,10 +2360,10 @@ $result_trees{'sectioning_frames'} = {
         'line_nr' => 84,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -3173,7 +3173,6 @@ $result_sectioning{'sectioning_frames'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'unnumberedsec',
@@ -3314,17 +3313,18 @@ $result_sectioning{'sectioning_frames'} = {
                 },
                 'spaces_before_argument' => '  '
               },
-              'number' => '1.1',
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -3341,11 +3341,11 @@ $result_sectioning{'sectioning_frames'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -3428,9 +3428,9 @@ $result_nodes{'sectioning_frames'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'First-node',
@@ -3592,9 +3592,9 @@ $result_nodes{'sectioning_frames'} = {
               'extra' => {
                 'spaces_before_argument' => '  '
               },
-              'number' => '1.1',
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                '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 faa1da7cf4..846b490880 100644
--- a/tp/t/results/moresectioning/top_node_up_explicit.pl
+++ b/tp/t/results/moresectioning/top_node_up_explicit.pl
@@ -489,10 +489,10 @@ $result_trees{'top_node_up_explicit'} = {
         'line_nr' => 17,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -650,10 +650,10 @@ $result_sectioning{'top_node_up_explicit'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -697,9 +697,9 @@ $result_nodes{'top_node_up_explicit'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 5623a3adbe..ec48a3c303 100644
--- a/tp/t/results/moresectioning/top_node_up_implicit.pl
+++ b/tp/t/results/moresectioning/top_node_up_implicit.pl
@@ -395,10 +395,10 @@ $result_trees{'top_node_up_implicit'} = {
         'line_nr' => 16,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -538,10 +538,10 @@ $result_sectioning{'top_node_up_implicit'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -585,9 +585,9 @@ $result_nodes{'top_node_up_implicit'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 b56fb67ba2..a55da9c8d8 100644
--- a/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
+++ b/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
@@ -607,10 +607,10 @@ $result_trees{'two_footnotes_in_nodes'} = {
         'line_nr' => 21,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -800,10 +800,10 @@ $result_sectioning{'two_footnotes_in_nodes'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -847,9 +847,9 @@ $result_nodes{'two_footnotes_in_nodes'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 62e51fff1d..e76662d9c4 100644
--- a/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl
+++ b/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl
@@ -607,10 +607,10 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
         'line_nr' => 21,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -800,10 +800,10 @@ $result_sectioning{'two_footnotes_in_nodes_separated'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -847,9 +847,9 @@ $result_nodes{'two_footnotes_in_nodes_separated'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
diff --git a/tp/t/results/paragraph/commands_in_flushright.pl 
b/tp/t/results/paragraph/commands_in_flushright.pl
index da2fa9ca88..3a2bece250 100644
--- a/tp/t/results/paragraph/commands_in_flushright.pl
+++ b/tp/t/results/paragraph/commands_in_flushright.pl
@@ -861,8 +861,10 @@ $result_trees{'commands_in_flushright'} = {
                 'line_nr' => 35,
                 'macro' => ''
               },
-              'number' => 1,
-              'parent' => {}
+              'parent' => {},
+              'structure' => {
+                'float_number' => 1
+              }
             },
             {
               'parent' => {},
@@ -1511,7 +1513,9 @@ $result_floats{'commands_in_flushright'} = {
           'normalized' => 'label'
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ]
 };
diff --git a/tp/t/results/plaintext_tests/japanese_utf8.pl 
b/tp/t/results/plaintext_tests/japanese_utf8.pl
index 9453caccfd..66f664e39b 100644
--- a/tp/t/results/plaintext_tests/japanese_utf8.pl
+++ b/tp/t/results/plaintext_tests/japanese_utf8.pl
@@ -718,10 +718,10 @@ $result_trees{'japanese_utf8'} = {
         'line_nr' => 31,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -816,10 +816,10 @@ $result_trees{'japanese_utf8'} = {
         'line_nr' => 37,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -1048,10 +1048,10 @@ $result_sectioning{'japanese_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1068,11 +1068,11 @@ $result_sectioning{'japanese_utf8'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1120,9 +1120,9 @@ $result_nodes{'japanese_utf8'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'Preface',
@@ -1136,9 +1136,9 @@ $result_nodes{'japanese_utf8'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            '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 6e120287a8..e44e0c86b2 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
@@ -155,10 +155,10 @@ $result_trees{'no_empty_line_after_section'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -259,10 +259,10 @@ $result_trees{'no_empty_line_after_section'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -331,10 +331,10 @@ $result_trees{'no_empty_line_after_section'} = {
         'line_nr' => 14,
         'macro' => ''
       },
-      'number' => '1.2',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.2'
       }
     }
   ],
@@ -436,17 +436,16 @@ $result_sectioning{'no_empty_line_after_section'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             },
             {
@@ -454,17 +453,18 @@ $result_sectioning{'no_empty_line_after_section'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.2',
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.2'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
diff --git a/tp/t/results/plaintext_tests/quote_node_names.pl 
b/tp/t/results/plaintext_tests/quote_node_names.pl
index d95f0b9973..1e3aef6f04 100644
--- a/tp/t/results/plaintext_tests/quote_node_names.pl
+++ b/tp/t/results/plaintext_tests/quote_node_names.pl
@@ -1248,10 +1248,10 @@ $result_trees{'quote_node_names'} = {
         'line_nr' => 28,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {},
@@ -1289,10 +1289,10 @@ $result_trees{'quote_node_names'} = {
         'line_nr' => 33,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {},
@@ -1330,10 +1330,10 @@ $result_trees{'quote_node_names'} = {
         'line_nr' => 36,
         'macro' => ''
       },
-      'number' => 3,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 3
       }
     },
     {},
@@ -1389,10 +1389,10 @@ $result_trees{'quote_node_names'} = {
         'line_nr' => 39,
         'macro' => ''
       },
-      'number' => 4,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 4
       }
     },
     {
@@ -1788,10 +1788,10 @@ $result_sectioning{'quote_node_names'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1808,11 +1808,11 @@ $result_sectioning{'quote_node_names'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1829,11 +1829,11 @@ $result_sectioning{'quote_node_names'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 3,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 3
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1850,11 +1850,11 @@ $result_sectioning{'quote_node_names'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 4,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 4
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1908,9 +1908,9 @@ $result_nodes{'quote_node_names'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'blah_003ablah',
@@ -1924,9 +1924,9 @@ $result_nodes{'quote_node_names'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           }
         },
         'normalized' => 'blumpty_002efump',
@@ -1940,9 +1940,9 @@ $result_nodes{'quote_node_names'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => 3,
             'structure' => {
-              'level' => 1
+              'level' => 1,
+              'number' => 3
             }
           },
           'normalized' => 'normal-node',
@@ -1956,9 +1956,9 @@ $result_nodes{'quote_node_names'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => 4,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 4
               }
             },
             'normalized' => 'secret_002cnode',
diff --git a/tp/t/results/preformatted/caption_in_example.pl 
b/tp/t/results/preformatted/caption_in_example.pl
index 27437de17e..c85555d39e 100644
--- a/tp/t/results/preformatted/caption_in_example.pl
+++ b/tp/t/results/preformatted/caption_in_example.pl
@@ -204,7 +204,8 @@ $result_trees{'caption_in_example'} = {
             'line_nr' => 1,
             'macro' => ''
           },
-          'parent' => {}
+          'parent' => {},
+          'structure' => {}
         }
       ],
       'parent' => {},
@@ -307,7 +308,8 @@ $result_floats{'caption_in_example'} = {
           ],
           'normalized' => 'float'
         }
-      }
+      },
+      'structure' => {}
     }
   ]
 };
diff --git a/tp/t/results/regions/ref_in_copying.pl 
b/tp/t/results/regions/ref_in_copying.pl
index 0b98d59dbd..c01a922f69 100644
--- a/tp/t/results/regions/ref_in_copying.pl
+++ b/tp/t/results/regions/ref_in_copying.pl
@@ -408,10 +408,10 @@ $result_trees{'ref_in_copying'} = {
         'line_nr' => 15,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -531,10 +531,10 @@ $result_sectioning{'ref_in_copying'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -578,9 +578,9 @@ $result_nodes{'ref_in_copying'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'GFDL',
diff --git a/tp/t/results/sectioning/anchor_in_footnote.pl 
b/tp/t/results/sectioning/anchor_in_footnote.pl
index 5fd0595e29..a34fbf5799 100644
--- a/tp/t/results/sectioning/anchor_in_footnote.pl
+++ b/tp/t/results/sectioning/anchor_in_footnote.pl
@@ -408,10 +408,10 @@ $result_trees{'anchor_in_footnote'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -533,10 +533,10 @@ $result_sectioning{'anchor_in_footnote'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -580,9 +580,9 @@ $result_nodes{'anchor_in_footnote'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 7ad7f53b5f..3d5a600202 100644
--- a/tp/t/results/sectioning/anchor_in_footnote_separate.pl
+++ b/tp/t/results/sectioning/anchor_in_footnote_separate.pl
@@ -440,10 +440,10 @@ $result_trees{'anchor_in_footnote_separate'} = {
         'line_nr' => 14,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -569,10 +569,10 @@ $result_sectioning{'anchor_in_footnote_separate'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -616,9 +616,9 @@ $result_nodes{'anchor_in_footnote_separate'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 9a269fdabe..f7db81a805 100644
--- a/tp/t/results/sectioning/chapter_before_and_after_part.pl
+++ b/tp/t/results/sectioning/chapter_before_and_after_part.pl
@@ -47,10 +47,10 @@ $result_trees{'chapter_before_and_after_part'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -154,10 +154,10 @@ $result_trees{'chapter_before_and_after_part'} = [
           'line_nr' => 5,
           'macro' => ''
         },
-        'number' => 2,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 2
         }
       }
     ],
@@ -221,10 +221,10 @@ $result_sectioning{'chapter_before_and_after_part'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -236,10 +236,10 @@ $result_sectioning{'chapter_before_and_after_part'} = {
             'associated_part' => {},
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {}
         },
@@ -279,9 +279,9 @@ $result_elements{'chapter_before_and_after_part'} = [
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'unit_command' => {}
@@ -304,9 +304,9 @@ $result_elements{'chapter_before_and_after_part'} = [
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => 2,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 2
               }
             },
             'unit_command' => {}
diff --git a/tp/t/results/sectioning/chapter_before_part.pl 
b/tp/t/results/sectioning/chapter_before_part.pl
index 3e0c970eb4..cdffb6c5f2 100644
--- a/tp/t/results/sectioning/chapter_before_part.pl
+++ b/tp/t/results/sectioning/chapter_before_part.pl
@@ -47,10 +47,10 @@ $result_trees{'chapter_before_part'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -140,10 +140,10 @@ $result_sectioning{'chapter_before_part'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -188,9 +188,9 @@ $result_elements{'chapter_before_part'} = [
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'unit_command' => {}
diff --git a/tp/t/results/sectioning/chapter_between_nodes.pl 
b/tp/t/results/sectioning/chapter_between_nodes.pl
index d90c22fc0c..d09198d469 100644
--- a/tp/t/results/sectioning/chapter_between_nodes.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes.pl
@@ -306,10 +306,10 @@ $result_trees{'chapter_between_nodes'} = {
         'line_nr' => 11,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -449,10 +449,10 @@ $result_trees{'chapter_between_nodes'} = {
         'line_nr' => 16,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     }
   ],
@@ -581,7 +581,6 @@ $result_sectioning{'chapter_between_nodes'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -595,16 +594,17 @@ $result_sectioning{'chapter_between_nodes'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -649,9 +649,9 @@ $result_nodes{'chapter_between_nodes'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => '1.1',
         'structure' => {
-          'level' => 2
+          'level' => 2,
+          '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 fce9e6c14e..5a6fee4b25 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
@@ -210,10 +210,10 @@ $result_trees{'chapter_node_before_and_after_part'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -348,10 +348,10 @@ $result_trees{'chapter_node_before_and_after_part'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     }
   ],
@@ -448,10 +448,10 @@ $result_sectioning{'chapter_node_before_and_after_part'} 
= {
         },
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -470,10 +470,10 @@ $result_sectioning{'chapter_node_before_and_after_part'} 
= {
             'associated_part' => {},
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {}
         },
@@ -507,9 +507,9 @@ $result_nodes{'chapter_node_before_and_after_part'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     'normalized' => 'Top',
@@ -532,9 +532,9 @@ $result_nodes{'chapter_node_before_and_after_part'} = {
           },
           'spaces_before_argument' => ' '
         },
-        'number' => 2,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 2
         }
       },
       'normalized' => 'after',
diff --git a/tp/t/results/sectioning/chapter_sections.pl 
b/tp/t/results/sectioning/chapter_sections.pl
index 30a3e689b8..aa4a3c35e0 100644
--- a/tp/t/results/sectioning/chapter_sections.pl
+++ b/tp/t/results/sectioning/chapter_sections.pl
@@ -96,10 +96,10 @@ $result_trees{'chapter_sections'} = [
           'line_nr' => 3,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -148,10 +148,10 @@ $result_trees{'chapter_sections'} = [
           'line_nr' => 5,
           'macro' => ''
         },
-        'number' => '1.1',
         'parent' => {},
         'structure' => {
-          'level' => 2
+          'level' => 2,
+          'number' => '1.1'
         }
       }
     ],
@@ -200,10 +200,10 @@ $result_trees{'chapter_sections'} = [
           'line_nr' => 7,
           'macro' => ''
         },
-        'number' => 2,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 2
         }
       }
     ],
@@ -252,10 +252,10 @@ $result_trees{'chapter_sections'} = [
           'line_nr' => 9,
           'macro' => ''
         },
-        'number' => '2.1',
         'parent' => {},
         'structure' => {
-          'level' => 2
+          'level' => 2,
+          'number' => '2.1'
         }
       }
     ],
@@ -304,10 +304,10 @@ $result_trees{'chapter_sections'} = [
           'line_nr' => 11,
           'macro' => ''
         },
-        'number' => '2.1.1',
         'parent' => {},
         'structure' => {
-          'level' => 3
+          'level' => 3,
+          'number' => '2.1.1'
         }
       }
     ],
@@ -356,10 +356,10 @@ $result_trees{'chapter_sections'} = [
           'line_nr' => 13,
           'macro' => ''
         },
-        'number' => '2.1.2',
         'parent' => {},
         'structure' => {
-          'level' => 3
+          'level' => 3,
+          'number' => '2.1.2'
         }
       }
     ],
@@ -401,10 +401,10 @@ $result_trees{'chapter_sections'} = [
           'line_nr' => 15,
           'macro' => ''
         },
-        'number' => 3,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 3
         }
       }
     ],
@@ -534,24 +534,24 @@ $result_sectioning{'chapter_sections'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_childs' => [
         {
           'cmdname' => 'section',
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'section_up' => {},
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         }
       ],
       'section_prev' => {},
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       },
       'toplevel_prev' => {}
     },
@@ -560,24 +560,22 @@ $result_sectioning{'chapter_sections'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 2,
       'section_childs' => [
         {
           'cmdname' => 'section',
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '2.1',
           'section_childs' => [
             {
               'cmdname' => 'subsection',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '2.1.1',
               'section_up' => {},
               'structure' => {
-                'level' => 3
+                'level' => 3,
+                'number' => '2.1.1'
               }
             },
             {
@@ -585,24 +583,26 @@ $result_sectioning{'chapter_sections'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '2.1.2',
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 3
+                'level' => 3,
+                'number' => '2.1.2'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '2.1'
           }
         }
       ],
       'section_prev' => {},
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       },
       'toplevel_prev' => {}
     },
@@ -611,11 +611,11 @@ $result_sectioning{'chapter_sections'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 3,
       'section_prev' => {},
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 3
       },
       'toplevel_prev' => {}
     }
@@ -669,9 +669,9 @@ $result_elements{'chapter_sections'} = [
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => 1,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 1
               }
             },
             'unit_command' => {}
@@ -687,9 +687,9 @@ $result_elements{'chapter_sections'} = [
                     'extra' => {
                       'spaces_before_argument' => ' '
                     },
-                    'number' => 2,
                     'structure' => {
-                      'level' => 1
+                      'level' => 1,
+                      'number' => 2
                     }
                   },
                   'unit_command' => {}
@@ -703,9 +703,9 @@ $result_elements{'chapter_sections'} = [
                           'extra' => {
                             'spaces_before_argument' => ' '
                           },
-                          'number' => '1.1',
                           'structure' => {
-                            'level' => 2
+                            'level' => 2,
+                            'number' => '1.1'
                           }
                         },
                         'unit_command' => {}
@@ -730,9 +730,9 @@ $result_elements{'chapter_sections'} = [
                           'extra' => {
                             'spaces_before_argument' => ' '
                           },
-                          'number' => 3,
                           'structure' => {
-                            'level' => 1
+                            'level' => 1,
+                            'number' => 3
                           }
                         },
                         'unit_command' => {}
@@ -746,9 +746,9 @@ $result_elements{'chapter_sections'} = [
                                 'extra' => {
                                   'spaces_before_argument' => ' '
                                 },
-                                'number' => '2.1.2',
                                 'structure' => {
-                                  'level' => 3
+                                  'level' => 3,
+                                  'number' => '2.1.2'
                                 }
                               },
                               'unit_command' => {}
@@ -762,9 +762,9 @@ $result_elements{'chapter_sections'} = [
                                       'extra' => {
                                         'spaces_before_argument' => ' '
                                       },
-                                      'number' => '2.1.1',
                                       'structure' => {
-                                        'level' => 3
+                                        'level' => 3,
+                                        'number' => '2.1.1'
                                       }
                                     },
                                     'unit_command' => {}
@@ -778,9 +778,9 @@ $result_elements{'chapter_sections'} = [
                                             'extra' => {
                                               'spaces_before_argument' => ' '
                                             },
-                                            'number' => '2.1',
                                             'structure' => {
-                                              'level' => 2
+                                              'level' => 2,
+                                              'number' => '2.1'
                                             }
                                           },
                                           'unit_command' => {}
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 c8b57f2a82..afec36e9c6 100644
--- a/tp/t/results/sectioning/character_and_spaces_in_refs.pl
+++ b/tp/t/results/sectioning/character_and_spaces_in_refs.pl
@@ -1377,10 +1377,10 @@ $result_trees{'character_and_spaces_in_refs'} = {
         'line_nr' => 24,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {},
@@ -1714,10 +1714,10 @@ $result_sectioning{'character_and_spaces_in_refs'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1761,9 +1761,9 @@ $result_nodes{'character_and_spaces_in_refs'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'other-nodes',
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 a9d52b7cc3..761ee13140 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
@@ -1049,10 +1049,10 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                                 'line_nr' => 24,
                                 'macro' => ''
                               },
-                              'number' => 1,
                               'parent' => {},
                               'structure' => {
-                                'level' => 1
+                                'level' => 1,
+                                'number' => 1
                               }
                             }
                           ],
@@ -1787,10 +1787,10 @@ $result_sectioning{'character_and_spaces_in_refs_out'} 
= {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1834,9 +1834,9 @@ $result_nodes{'character_and_spaces_in_refs_out'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'other-nodes',
@@ -2059,9 +2059,9 @@ $result_elements{'character_and_spaces_in_refs_out'} = [
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => 1,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 1
               }
             },
             'unit_command' => {}
diff --git a/tp/t/results/sectioning/complex.pl 
b/tp/t/results/sectioning/complex.pl
index 100e074167..a45f0af8ce 100644
--- a/tp/t/results/sectioning/complex.pl
+++ b/tp/t/results/sectioning/complex.pl
@@ -903,10 +903,10 @@ $result_trees{'complex'} = [
           'line_nr' => 13,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -2057,10 +2057,10 @@ $result_trees{'complex'} = [
           'line_nr' => 57,
           'macro' => ''
         },
-        'number' => '1.1',
         'parent' => {},
         'structure' => {
-          'level' => 2
+          'level' => 2,
+          'number' => '1.1'
         }
       },
       {
@@ -2323,10 +2323,10 @@ $result_trees{'complex'} = [
           'line_nr' => 67,
           'macro' => ''
         },
-        'number' => 2,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 2
         }
       }
     ],
@@ -3345,7 +3345,6 @@ $result_sectioning{'complex'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'unnumberedsec',
@@ -3486,17 +3485,18 @@ $result_sectioning{'complex'} = {
                 },
                 'spaces_before_argument' => '  '
               },
-              'number' => '1.1',
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -3513,11 +3513,11 @@ $result_sectioning{'complex'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -3624,9 +3624,9 @@ $result_nodes{'complex'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'First-node',
@@ -3788,9 +3788,9 @@ $result_nodes{'complex'} = {
               'extra' => {
                 'spaces_before_argument' => '  '
               },
-              'number' => '1.1',
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             },
             'normalized' => 'numbered',
@@ -4260,9 +4260,9 @@ $result_elements{'complex'} = [
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => 1,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 1
               }
             },
             'unit_command' => {}
@@ -4279,9 +4279,9 @@ $result_elements{'complex'} = [
                     'extra' => {
                       'spaces_before_argument' => ' '
                     },
-                    'number' => 2,
                     'structure' => {
-                      'level' => 1
+                      'level' => 1,
+                      'number' => 2
                     }
                   },
                   'unit_command' => {}
@@ -4296,9 +4296,9 @@ $result_elements{'complex'} = [
                           'extra' => {
                             'spaces_before_argument' => '  '
                           },
-                          'number' => '1.1',
                           'structure' => {
-                            'level' => 2
+                            'level' => 2,
+                            'number' => '1.1'
                           }
                         },
                         'unit_command' => {}
diff --git a/tp/t/results/sectioning/complex_split_at_node.pl 
b/tp/t/results/sectioning/complex_split_at_node.pl
index a81082bb01..3bedebdabd 100644
--- a/tp/t/results/sectioning/complex_split_at_node.pl
+++ b/tp/t/results/sectioning/complex_split_at_node.pl
@@ -903,10 +903,10 @@ $result_trees{'complex_split_at_node'} = [
           'line_nr' => 13,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -2057,10 +2057,10 @@ $result_trees{'complex_split_at_node'} = [
           'line_nr' => 57,
           'macro' => ''
         },
-        'number' => '1.1',
         'parent' => {},
         'structure' => {
-          'level' => 2
+          'level' => 2,
+          'number' => '1.1'
         }
       }
     ],
@@ -2335,10 +2335,10 @@ $result_trees{'complex_split_at_node'} = [
           'line_nr' => 67,
           'macro' => ''
         },
-        'number' => 2,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 2
         }
       }
     ],
@@ -3375,7 +3375,6 @@ $result_sectioning{'complex_split_at_node'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'unnumberedsec',
@@ -3516,17 +3515,18 @@ $result_sectioning{'complex_split_at_node'} = {
                 },
                 'spaces_before_argument' => '  '
               },
-              'number' => '1.1',
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -3543,11 +3543,11 @@ $result_sectioning{'complex_split_at_node'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -3654,9 +3654,9 @@ $result_nodes{'complex_split_at_node'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'First-node',
@@ -3818,9 +3818,9 @@ $result_nodes{'complex_split_at_node'} = {
               'extra' => {
                 'spaces_before_argument' => '  '
               },
-              'number' => '1.1',
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             },
             'normalized' => 'numbered',
@@ -4290,9 +4290,9 @@ $result_elements{'complex_split_at_node'} = [
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => 1,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 1
               }
             },
             'unit_command' => {}
@@ -4309,9 +4309,9 @@ $result_elements{'complex_split_at_node'} = [
                     'extra' => {
                       'spaces_before_argument' => ' '
                     },
-                    'number' => 2,
                     'structure' => {
-                      'level' => 1
+                      'level' => 1,
+                      'number' => 2
                     }
                   },
                   'unit_command' => {}
@@ -4333,9 +4333,9 @@ $result_elements{'complex_split_at_node'} = [
                                 'extra' => {
                                   'spaces_before_argument' => '  '
                                 },
-                                'number' => '1.1',
                                 'structure' => {
-                                  'level' => 2
+                                  'level' => 2,
+                                  'number' => '1.1'
                                 }
                               },
                               'unit_command' => {}
diff --git a/tp/t/results/sectioning/contents.pl 
b/tp/t/results/sectioning/contents.pl
index 3803cde3d8..40f61e659f 100644
--- a/tp/t/results/sectioning/contents.pl
+++ b/tp/t/results/sectioning/contents.pl
@@ -85,10 +85,10 @@ $result_trees{'contents'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -125,10 +125,10 @@ $result_trees{'contents'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -165,10 +165,10 @@ $result_trees{'contents'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -205,10 +205,10 @@ $result_trees{'contents'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'number' => '1.1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 4
+        'level' => 4,
+        'number' => '1.1.1.1'
       }
     },
     {
@@ -285,10 +285,10 @@ $result_trees{'contents'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -325,10 +325,10 @@ $result_trees{'contents'} = {
         'line_nr' => 15,
         'macro' => ''
       },
-      'number' => 3,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 3
       }
     },
     {
@@ -404,10 +404,10 @@ $result_trees{'contents'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'number' => 'A',
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 'A'
       }
     },
     {
@@ -461,10 +461,10 @@ $result_trees{'contents'} = {
         'line_nr' => 21,
         'macro' => ''
       },
-      'number' => 'A.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 'A.1'
       }
     }
   ],
@@ -593,49 +593,49 @@ $result_sectioning{'contents'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
                   'extra' => {
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_childs' => [
                     {
                       'cmdname' => 'subsubsection',
                       'extra' => {
                         'spaces_before_argument' => ' '
                       },
-                      'number' => '1.1.1.1',
                       'section_up' => {},
                       'structure' => {
-                        'level' => 4
+                        'level' => 4,
+                        'number' => '1.1.1.1'
                       }
                     }
                   ],
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -655,10 +655,10 @@ $result_sectioning{'contents'} = {
             'associated_part' => {},
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -672,11 +672,11 @@ $result_sectioning{'contents'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 3,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 3
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -706,24 +706,24 @@ $result_sectioning{'contents'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 'A',
       'section_childs' => [
         {
           'cmdname' => 'appendixsec',
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 'A.1',
           'section_up' => {},
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => 'A.1'
           }
         }
       ],
       'section_prev' => {},
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 'A'
       },
       'toplevel_prev' => {},
       'toplevel_up' => {}
diff --git a/tp/t/results/sectioning/contents_and_shortcontents.pl 
b/tp/t/results/sectioning/contents_and_shortcontents.pl
index c887c8cc41..cd0f9e15ec 100644
--- a/tp/t/results/sectioning/contents_and_shortcontents.pl
+++ b/tp/t/results/sectioning/contents_and_shortcontents.pl
@@ -85,10 +85,10 @@ $result_trees{'contents_and_shortcontents'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -125,10 +125,10 @@ $result_trees{'contents_and_shortcontents'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -165,10 +165,10 @@ $result_trees{'contents_and_shortcontents'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -205,10 +205,10 @@ $result_trees{'contents_and_shortcontents'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'number' => '1.1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 4
+        'level' => 4,
+        'number' => '1.1.1.1'
       }
     },
     {
@@ -285,10 +285,10 @@ $result_trees{'contents_and_shortcontents'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -325,10 +325,10 @@ $result_trees{'contents_and_shortcontents'} = {
         'line_nr' => 15,
         'macro' => ''
       },
-      'number' => 3,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 3
       }
     },
     {
@@ -404,10 +404,10 @@ $result_trees{'contents_and_shortcontents'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'number' => 'A',
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 'A'
       }
     },
     {
@@ -484,10 +484,10 @@ $result_trees{'contents_and_shortcontents'} = {
         'line_nr' => 21,
         'macro' => ''
       },
-      'number' => 'A.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 'A.1'
       }
     }
   ],
@@ -622,49 +622,49 @@ $result_sectioning{'contents_and_shortcontents'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
                   'extra' => {
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_childs' => [
                     {
                       'cmdname' => 'subsubsection',
                       'extra' => {
                         'spaces_before_argument' => ' '
                       },
-                      'number' => '1.1.1.1',
                       'section_up' => {},
                       'structure' => {
-                        'level' => 4
+                        'level' => 4,
+                        'number' => '1.1.1.1'
                       }
                     }
                   ],
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -684,10 +684,10 @@ $result_sectioning{'contents_and_shortcontents'} = {
             'associated_part' => {},
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -701,11 +701,11 @@ $result_sectioning{'contents_and_shortcontents'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 3,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 3
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -735,24 +735,24 @@ $result_sectioning{'contents_and_shortcontents'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 'A',
       'section_childs' => [
         {
           'cmdname' => 'appendixsec',
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 'A.1',
           'section_up' => {},
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => 'A.1'
           }
         }
       ],
       'section_prev' => {},
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 'A'
       },
       'toplevel_prev' => {},
       'toplevel_up' => {}
diff --git a/tp/t/results/sectioning/contents_at_document_begin.pl 
b/tp/t/results/sectioning/contents_at_document_begin.pl
index f8297a1efa..f70c85b8ee 100644
--- a/tp/t/results/sectioning/contents_at_document_begin.pl
+++ b/tp/t/results/sectioning/contents_at_document_begin.pl
@@ -209,10 +209,10 @@ $result_trees{'contents_at_document_begin'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -303,10 +303,10 @@ $result_sectioning{'contents_at_document_begin'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
diff --git a/tp/t/results/sectioning/contents_at_end_document.pl 
b/tp/t/results/sectioning/contents_at_end_document.pl
index ee7e5ba64a..97c0393680 100644
--- a/tp/t/results/sectioning/contents_at_end_document.pl
+++ b/tp/t/results/sectioning/contents_at_end_document.pl
@@ -209,10 +209,10 @@ $result_trees{'contents_at_end_document'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -303,10 +303,10 @@ $result_sectioning{'contents_at_end_document'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
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 cf60e4100d..99e13cfbd2 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
@@ -302,10 +302,10 @@ $result_trees{'contents_at_end_document_after_node'} = {
         'line_nr' => 12,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -533,10 +533,10 @@ $result_sectioning{'contents_at_end_document_after_node'} 
= {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
diff --git a/tp/t/results/sectioning/contents_in_document.pl 
b/tp/t/results/sectioning/contents_in_document.pl
index 4f7e92bb7a..bc272cc7c1 100644
--- a/tp/t/results/sectioning/contents_in_document.pl
+++ b/tp/t/results/sectioning/contents_in_document.pl
@@ -209,10 +209,10 @@ $result_trees{'contents_in_document'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -303,10 +303,10 @@ $result_sectioning{'contents_in_document'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
diff --git a/tp/t/results/sectioning/contents_in_html_text.pl 
b/tp/t/results/sectioning/contents_in_html_text.pl
index 8bdadf68f2..9519c65087 100644
--- a/tp/t/results/sectioning/contents_in_html_text.pl
+++ b/tp/t/results/sectioning/contents_in_html_text.pl
@@ -85,10 +85,10 @@ $result_trees{'contents_in_html_text'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -125,10 +125,10 @@ $result_trees{'contents_in_html_text'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -199,10 +199,10 @@ $result_trees{'contents_in_html_text'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     }
   ],
@@ -270,23 +270,23 @@ $result_sectioning{'contents_in_html_text'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -296,11 +296,11 @@ $result_sectioning{'contents_in_html_text'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
diff --git a/tp/t/results/sectioning/double_node_anchor_float.pl 
b/tp/t/results/sectioning/double_node_anchor_float.pl
index 6e1e10d638..a0f4baeb78 100644
--- a/tp/t/results/sectioning/double_node_anchor_float.pl
+++ b/tp/t/results/sectioning/double_node_anchor_float.pl
@@ -280,7 +280,8 @@ $result_trees{'double_node_anchor_float'} = {
             'line_nr' => 11,
             'macro' => ''
           },
-          'parent' => {}
+          'parent' => {},
+          'structure' => {}
         },
         {
           'parent' => {},
@@ -364,7 +365,8 @@ $result_trees{'double_node_anchor_float'} = {
             'line_nr' => 14,
             'macro' => ''
           },
-          'parent' => {}
+          'parent' => {},
+          'structure' => {}
         },
         {
           'parent' => {},
@@ -452,8 +454,10 @@ $result_trees{'double_node_anchor_float'} = {
             'line_nr' => 17,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         },
         {
           'parent' => {},
@@ -773,7 +777,8 @@ $result_floats{'double_node_anchor_float'} = {
           ],
           'normalized' => 'Text'
         }
-      }
+      },
+      'structure' => {}
     },
     {
       'cmdname' => 'float',
@@ -795,7 +800,8 @@ $result_floats{'double_node_anchor_float'} = {
           ],
           'normalized' => 'Text'
         }
-      }
+      },
+      'structure' => {}
     },
     {
       'cmdname' => 'float',
@@ -819,7 +825,9 @@ $result_floats{'double_node_anchor_float'} = {
           'normalized' => 'Text'
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ]
 };
diff --git a/tp/t/results/sectioning/double_part.pl 
b/tp/t/results/sectioning/double_part.pl
index 889421f5ef..9c0611f6c7 100644
--- a/tp/t/results/sectioning/double_part.pl
+++ b/tp/t/results/sectioning/double_part.pl
@@ -410,10 +410,10 @@ $result_trees{'double_part'} = [
           'line_nr' => 15,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -576,10 +576,10 @@ $result_sectioning{'double_part'} = {
             'associated_part' => {},
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -643,9 +643,9 @@ $result_nodes{'double_part'} = {
           },
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'node-chapter',
@@ -782,9 +782,9 @@ $result_elements{'double_part'} = [
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => 1,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 1
               }
             },
             'unit_command' => {}
diff --git a/tp/t/results/sectioning/equivalent_labels.pl 
b/tp/t/results/sectioning/equivalent_labels.pl
index e677df8446..b02352f6c6 100644
--- a/tp/t/results/sectioning/equivalent_labels.pl
+++ b/tp/t/results/sectioning/equivalent_labels.pl
@@ -191,8 +191,10 @@ $result_trees{'equivalent_labels'} = {
             'line_nr' => 5,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         },
         {
           'parent' => {},
@@ -567,7 +569,9 @@ $result_menus{'equivalent_labels'} = {
       'menu_up_hash' => {
         'Top' => 1
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     },
     'menu_up' => {},
     'menu_up_hash' => {
@@ -625,7 +629,9 @@ $result_floats{'equivalent_labels'} = {
           'normalized' => 'truc'
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ]
 };
diff --git a/tp/t/results/sectioning/external_node_in_menu.pl 
b/tp/t/results/sectioning/external_node_in_menu.pl
index bc36070422..79f2850d81 100644
--- a/tp/t/results/sectioning/external_node_in_menu.pl
+++ b/tp/t/results/sectioning/external_node_in_menu.pl
@@ -412,10 +412,10 @@ $result_trees{'external_node_in_menu'} = {
         'line_nr' => 11,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -486,10 +486,10 @@ $result_trees{'external_node_in_menu'} = {
         'line_nr' => 14,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     }
   ],
@@ -623,10 +623,10 @@ $result_sectioning{'external_node_in_menu'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -643,11 +643,11 @@ $result_sectioning{'external_node_in_menu'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -695,9 +695,9 @@ $result_nodes{'external_node_in_menu'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'nchapter1',
@@ -711,9 +711,9 @@ $result_nodes{'external_node_in_menu'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            '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 b1c3934345..45ad169130 100644
--- a/tp/t/results/sectioning/hole_in_sectioning.pl
+++ b/tp/t/results/sectioning/hole_in_sectioning.pl
@@ -85,10 +85,10 @@ $result_trees{'hole_in_sectioning'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -125,10 +125,10 @@ $result_trees{'hole_in_sectioning'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -165,10 +165,10 @@ $result_trees{'hole_in_sectioning'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -198,10 +198,10 @@ $result_trees{'hole_in_sectioning'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'number' => '1.1.2',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.2'
       }
     }
   ],
@@ -269,24 +269,22 @@ $result_sectioning{'hole_in_sectioning'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsubsection',
                   'extra' => {
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 },
                 {
@@ -294,23 +292,25 @@ $result_sectioning{'hole_in_sectioning'} = {
                   'extra' => {
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.2',
                   'section_prev' => {},
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.2'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
diff --git a/tp/t/results/sectioning/lone_Top_node.pl 
b/tp/t/results/sectioning/lone_Top_node.pl
index 67515b19ab..ba1c127c84 100644
--- a/tp/t/results/sectioning/lone_Top_node.pl
+++ b/tp/t/results/sectioning/lone_Top_node.pl
@@ -281,10 +281,10 @@ $result_trees{'lone_Top_node'} = [
           'line_nr' => 10,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -373,10 +373,10 @@ $result_sectioning{'lone_Top_node'} = {
         },
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -400,9 +400,9 @@ $result_nodes{'lone_Top_node'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'First',
@@ -494,9 +494,9 @@ $result_elements{'lone_Top_node'} = [
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'unit_command' => {}
diff --git a/tp/t/results/sectioning/lowered_subsubsection.pl 
b/tp/t/results/sectioning/lowered_subsubsection.pl
index 410468fc4a..324aa52af5 100644
--- a/tp/t/results/sectioning/lowered_subsubsection.pl
+++ b/tp/t/results/sectioning/lowered_subsubsection.pl
@@ -392,10 +392,10 @@ $result_trees{'lowered_subsubsection'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -589,10 +589,10 @@ $result_trees{'lowered_subsubsection'} = {
         'line_nr' => 16,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -843,10 +843,10 @@ $result_trees{'lowered_subsubsection'} = {
         'line_nr' => 23,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -936,10 +936,10 @@ $result_trees{'lowered_subsubsection'} = {
         'line_nr' => 31,
         'macro' => ''
       },
-      'number' => '1.1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 4
+        'level' => 4,
+        'number' => '1.1.1.1'
       }
     },
     {
@@ -1134,10 +1134,10 @@ $result_trees{'lowered_subsubsection'} = {
         'line_nr' => 35,
         'macro' => ''
       },
-      'number' => '1.1.1.2',
       'parent' => {},
       'structure' => {
-        'level' => 4
+        'level' => 4,
+        'number' => '1.1.1.2'
       }
     },
     {
@@ -1245,10 +1245,10 @@ $result_trees{'lowered_subsubsection'} = {
         'line_nr' => 42,
         'macro' => ''
       },
-      'number' => '1.1.1.3',
       'parent' => {},
       'structure' => {
-        'level' => 4
+        'level' => 4,
+        'number' => '1.1.1.3'
       }
     },
     {
@@ -1545,7 +1545,6 @@ $result_sectioning{'lowered_subsubsection'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -1559,7 +1558,6 @@ $result_sectioning{'lowered_subsubsection'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
@@ -1573,7 +1571,6 @@ $result_sectioning{'lowered_subsubsection'} = {
                     },
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_childs' => [
                     {
                       'cmdname' => 'subsubsection',
@@ -1587,10 +1584,10 @@ $result_sectioning{'lowered_subsubsection'} = {
                         },
                         'spaces_before_argument' => ' '
                       },
-                      'number' => '1.1.1.1',
                       'section_up' => {},
                       'structure' => {
-                        'level' => 4
+                        'level' => 4,
+                        'number' => '1.1.1.1'
                       }
                     },
                     {
@@ -1606,11 +1603,11 @@ $result_sectioning{'lowered_subsubsection'} = {
                         'sections_level' => -1,
                         'spaces_before_argument' => ' '
                       },
-                      'number' => '1.1.1.2',
                       'section_prev' => {},
                       'section_up' => {},
                       'structure' => {
-                        'level' => 4
+                        'level' => 4,
+                        'number' => '1.1.1.2'
                       }
                     },
                     {
@@ -1626,29 +1623,32 @@ $result_sectioning{'lowered_subsubsection'} = {
                         'sections_level' => -1,
                         'spaces_before_argument' => ' '
                       },
-                      'number' => '1.1.1.3',
                       'section_prev' => {},
                       'section_up' => {},
                       'structure' => {
-                        'level' => 4
+                        'level' => 4,
+                        'number' => '1.1.1.3'
                       }
                     }
                   ],
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1697,9 +1697,9 @@ $result_nodes{'lowered_subsubsection'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'Chapter',
@@ -1713,9 +1713,9 @@ $result_nodes{'lowered_subsubsection'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         'normalized' => 'Section',
@@ -1729,9 +1729,9 @@ $result_nodes{'lowered_subsubsection'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '1.1.1',
             'structure' => {
-              'level' => 3
+              'level' => 3,
+              'number' => '1.1.1'
             }
           },
           'normalized' => 'Subsection',
@@ -1745,9 +1745,9 @@ $result_nodes{'lowered_subsubsection'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1.1.1',
               'structure' => {
-                'level' => 4
+                'level' => 4,
+                'number' => '1.1.1.1'
               }
             },
             'normalized' => 'Subsubsection',
@@ -1762,9 +1762,9 @@ $result_nodes{'lowered_subsubsection'} = {
                   'sections_level' => -1,
                   'spaces_before_argument' => ' '
                 },
-                'number' => '1.1.1.2',
                 'structure' => {
-                  'level' => 4
+                  'level' => 4,
+                  'number' => '1.1.1.2'
                 }
               },
               'normalized' => 'Lowered-subsec',
@@ -1779,9 +1779,9 @@ $result_nodes{'lowered_subsubsection'} = {
                     'sections_level' => -1,
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1.3',
                   'structure' => {
-                    'level' => 4
+                    'level' => 4,
+                    '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 0dde0116b3..2ca9f2d799 100644
--- a/tp/t/results/sectioning/loweredheading.pl
+++ b/tp/t/results/sectioning/loweredheading.pl
@@ -84,10 +84,10 @@ $result_trees{'loweredheading'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => 1
       }
     },
     {
@@ -138,10 +138,10 @@ $result_sectioning{'loweredheading'} = {
         'sections_level' => -1,
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => 1
       }
     }
   ],
diff --git a/tp/t/results/sectioning/menutextorder.pl 
b/tp/t/results/sectioning/menutextorder.pl
index 2a7c9754e0..8a850f9b89 100644
--- a/tp/t/results/sectioning/menutextorder.pl
+++ b/tp/t/results/sectioning/menutextorder.pl
@@ -377,10 +377,10 @@ $result_trees{'menutextorder'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -458,10 +458,10 @@ $result_trees{'menutextorder'} = {
         'line_nr' => 14,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -545,10 +545,10 @@ $result_trees{'menutextorder'} = {
         'line_nr' => 17,
         'macro' => ''
       },
-      'number' => '1.2',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.2'
       }
     },
     {
@@ -856,10 +856,10 @@ $result_trees{'menutextorder'} = {
         'line_nr' => 21,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -937,10 +937,10 @@ $result_trees{'menutextorder'} = {
         'line_nr' => 30,
         'macro' => ''
       },
-      'number' => '2.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '2.1'
       }
     },
     {
@@ -1018,10 +1018,10 @@ $result_trees{'menutextorder'} = {
         'line_nr' => 33,
         'macro' => ''
       },
-      'number' => '2.2',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '2.2'
       }
     },
     {
@@ -1092,10 +1092,10 @@ $result_trees{'menutextorder'} = {
         'line_nr' => 36,
         'macro' => ''
       },
-      'number' => '2.3',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '2.3'
       }
     }
   ],
@@ -1335,7 +1335,6 @@ $result_sectioning{'menutextorder'} = {
         },
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_childs' => [
         {
           'cmdname' => 'section',
@@ -1349,10 +1348,10 @@ $result_sectioning{'menutextorder'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'section_up' => {},
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         {
@@ -1367,17 +1366,18 @@ $result_sectioning{'menutextorder'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => '1.2',
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.2'
           }
         }
       ],
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -1392,7 +1392,6 @@ $result_sectioning{'menutextorder'} = {
         },
         'spaces_before_argument' => ' '
       },
-      'number' => 2,
       'section_childs' => [
         {
           'cmdname' => 'section',
@@ -1406,10 +1405,10 @@ $result_sectioning{'menutextorder'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => '2.1',
           'section_up' => {},
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '2.1'
           }
         },
         {
@@ -1424,11 +1423,11 @@ $result_sectioning{'menutextorder'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => '2.2',
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '2.2'
           }
         },
         {
@@ -1443,18 +1442,19 @@ $result_sectioning{'menutextorder'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => '2.3',
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '2.3'
           }
         }
       ],
       'section_prev' => {},
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       },
       'toplevel_prev' => {}
     }
@@ -1484,9 +1484,9 @@ $result_nodes{'menutextorder'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     'normalized' => 'bar',
@@ -1500,9 +1500,9 @@ $result_nodes{'menutextorder'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => '1.2',
         'structure' => {
-          'level' => 2
+          'level' => 2,
+          'number' => '1.2'
         }
       },
       'normalized' => 'onesub2',
@@ -1516,9 +1516,9 @@ $result_nodes{'menutextorder'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         'normalized' => 'onesub1',
@@ -1552,9 +1552,9 @@ $result_nodes{'menutextorder'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 2,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 2
         }
       },
       'normalized' => 'foo',
@@ -1568,9 +1568,9 @@ $result_nodes{'menutextorder'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '2.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '2.1'
           }
         },
         'normalized' => 'sub1',
@@ -1584,9 +1584,9 @@ $result_nodes{'menutextorder'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '2.2',
             'structure' => {
-              'level' => 2
+              'level' => 2,
+              'number' => '2.2'
             }
           },
           'normalized' => 'sub2',
@@ -1600,9 +1600,9 @@ $result_nodes{'menutextorder'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '2.3',
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                '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 16ae0d75ec..c77b5dac69 100644
--- a/tp/t/results/sectioning/more_sections_than_nodes.pl
+++ b/tp/t/results/sectioning/more_sections_than_nodes.pl
@@ -356,10 +356,10 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -437,10 +437,10 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -477,10 +477,10 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 15,
         'macro' => ''
       },
-      'number' => '2.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '2.1'
       }
     },
     {
@@ -729,10 +729,10 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 18,
         'macro' => ''
       },
-      'number' => 3,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 3
       }
     },
     {
@@ -769,10 +769,10 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 24,
         'macro' => ''
       },
-      'number' => '3.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '3.1'
       }
     },
     {
@@ -850,10 +850,10 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 27,
         'macro' => ''
       },
-      'number' => '3.2',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '3.2'
       }
     },
     {
@@ -890,10 +890,10 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 29,
         'macro' => ''
       },
-      'number' => '3.3',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '3.3'
       }
     },
     {
@@ -930,10 +930,10 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 31,
         'macro' => ''
       },
-      'number' => 4,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 4
       }
     },
     {
@@ -970,10 +970,10 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 33,
         'macro' => ''
       },
-      'number' => '4.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '4.1'
       }
     },
     {
@@ -1010,10 +1010,10 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 35,
         'macro' => ''
       },
-      'number' => '4.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '4.1.1'
       }
     },
     {
@@ -1129,10 +1129,10 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 38,
         'macro' => ''
       },
-      'number' => '4.1.2',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '4.1.2'
       }
     },
     {
@@ -1162,10 +1162,10 @@ $result_trees{'more_sections_than_nodes'} = {
         'line_nr' => 40,
         'macro' => ''
       },
-      'number' => 'A',
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 'A'
       }
     }
   ],
@@ -1430,10 +1430,10 @@ $result_sectioning{'more_sections_than_nodes'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1450,24 +1450,24 @@ $result_sectioning{'more_sections_than_nodes'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_childs' => [
             {
               'cmdname' => 'section',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '2.1',
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '2.1'
               }
             }
           ],
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1484,17 +1484,16 @@ $result_sectioning{'more_sections_than_nodes'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 3,
           'section_childs' => [
             {
               'cmdname' => 'section',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '3.1',
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '3.1'
               }
             },
             {
@@ -1509,11 +1508,11 @@ $result_sectioning{'more_sections_than_nodes'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '3.2',
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '3.2'
               }
             },
             {
@@ -1521,18 +1520,19 @@ $result_sectioning{'more_sections_than_nodes'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '3.3',
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '3.3'
               }
             }
           ],
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 3
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1542,24 +1542,22 @@ $result_sectioning{'more_sections_than_nodes'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 4,
           'section_childs' => [
             {
               'cmdname' => 'section',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '4.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
                   'extra' => {
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '4.1.1',
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '4.1.1'
                   }
                 },
                 {
@@ -1574,24 +1572,26 @@ $result_sectioning{'more_sections_than_nodes'} = {
                     },
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '4.1.2',
                   'section_prev' => {},
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '4.1.2'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '4.1'
               }
             }
           ],
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 4
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1601,11 +1601,11 @@ $result_sectioning{'more_sections_than_nodes'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 'A',
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 'A'
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1675,9 +1675,9 @@ $result_nodes{'more_sections_than_nodes'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 2,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 2
         }
       },
       'normalized' => 'n-c2',
@@ -1691,9 +1691,9 @@ $result_nodes{'more_sections_than_nodes'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 3,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 3
           }
         },
         'normalized' => 'n-c3',
@@ -1707,9 +1707,9 @@ $result_nodes{'more_sections_than_nodes'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '3.2',
             'structure' => {
-              'level' => 2
+              'level' => 2,
+              'number' => '3.2'
             }
           },
           'normalized' => 'n-c3-s-2',
@@ -1740,9 +1740,9 @@ $result_nodes{'more_sections_than_nodes'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '4.1.2',
             'structure' => {
-              'level' => 3
+              'level' => 3,
+              '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 6197896836..cfbba66e85 100644
--- a/tp/t/results/sectioning/next_in_menu_is_below.pl
+++ b/tp/t/results/sectioning/next_in_menu_is_below.pl
@@ -456,10 +456,10 @@ $result_trees{'next_in_menu_is_below'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -653,10 +653,10 @@ $result_trees{'next_in_menu_is_below'} = {
         'line_nr' => 17,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -727,10 +727,10 @@ $result_trees{'next_in_menu_is_below'} = {
         'line_nr' => 24,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     }
   ],
@@ -911,7 +911,6 @@ $result_sectioning{'next_in_menu_is_below'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -925,7 +924,6 @@ $result_sectioning{'next_in_menu_is_below'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
@@ -939,22 +937,24 @@ $result_sectioning{'next_in_menu_is_below'} = {
                     },
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1000,9 +1000,9 @@ $result_nodes{'next_in_menu_is_below'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
@@ -1016,9 +1016,9 @@ $result_nodes{'next_in_menu_is_below'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         'normalized' => 'section',
@@ -1032,9 +1032,9 @@ $result_nodes{'next_in_menu_is_below'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '1.1.1',
             'structure' => {
-              'level' => 3
+              'level' => 3,
+              '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 587c498c92..d3bfe80f48 100644
--- a/tp/t/results/sectioning/no_argument_and_contents.pl
+++ b/tp/t/results/sectioning/no_argument_and_contents.pl
@@ -122,10 +122,10 @@ $result_trees{'no_argument_and_contents'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -176,10 +176,10 @@ $result_sectioning{'no_argument_and_contents'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
diff --git a/tp/t/results/sectioning/no_element.pl 
b/tp/t/results/sectioning/no_element.pl
index e8bc1113e4..79117d1219 100644
--- a/tp/t/results/sectioning/no_element.pl
+++ b/tp/t/results/sectioning/no_element.pl
@@ -448,8 +448,10 @@ $result_trees{'no_element'} = {
             'line_nr' => 21,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         },
         {
           'parent' => {},
@@ -862,7 +864,9 @@ $result_floats{'no_element'} = {
           'normalized' => ''
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ]
 };
diff --git a/tp/t/results/sectioning/no_menu.pl 
b/tp/t/results/sectioning/no_menu.pl
index 20d521d771..529d83cfda 100644
--- a/tp/t/results/sectioning/no_menu.pl
+++ b/tp/t/results/sectioning/no_menu.pl
@@ -160,10 +160,10 @@ $result_trees{'no_menu'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -241,10 +241,10 @@ $result_trees{'no_menu'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -315,10 +315,10 @@ $result_trees{'no_menu'} = {
         'line_nr' => 11,
         'macro' => ''
       },
-      'number' => 3,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 3
       }
     }
   ],
@@ -411,10 +411,10 @@ $result_sectioning{'no_menu'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -431,11 +431,11 @@ $result_sectioning{'no_menu'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -452,11 +452,11 @@ $result_sectioning{'no_menu'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 3,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 3
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -506,9 +506,9 @@ $result_nodes{'no_menu'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'c1',
@@ -522,9 +522,9 @@ $result_nodes{'no_menu'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           }
         },
         'normalized' => 'c2',
@@ -538,9 +538,9 @@ $result_nodes{'no_menu'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => 3,
             'structure' => {
-              'level' => 1
+              'level' => 1,
+              '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 bf939817ab..acdb911b3d 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
@@ -359,10 +359,10 @@ $result_trees{'node_part_chapter_after_chapter'} = [
           'line_nr' => 11,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -510,10 +510,10 @@ $result_trees{'node_part_chapter_after_chapter'} = [
           'line_nr' => 16,
           'macro' => ''
         },
-        'number' => 2,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 2
         }
       }
     ],
@@ -670,10 +670,10 @@ $result_sectioning{'node_part_chapter_after_chapter'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -700,10 +700,10 @@ $result_sectioning{'node_part_chapter_after_chapter'} = {
             'associated_part' => {},
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -759,9 +759,9 @@ $result_nodes{'node_part_chapter_after_chapter'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter-node',
@@ -784,9 +784,9 @@ $result_nodes{'node_part_chapter_after_chapter'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           }
         },
         'normalized' => 'part-chapter-node',
@@ -925,9 +925,9 @@ $result_elements{'node_part_chapter_after_chapter'} = [
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => 1,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 1
               }
             },
             'unit_command' => {}
@@ -953,9 +953,9 @@ $result_elements{'node_part_chapter_after_chapter'} = [
                       },
                       'spaces_before_argument' => ' '
                     },
-                    'number' => 2,
                     'structure' => {
-                      'level' => 1
+                      'level' => 1,
+                      'number' => 2
                     }
                   },
                   'unit_command' => {}
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 b81a76e319..7bfa78569c 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_top.pl
@@ -328,10 +328,10 @@ $result_trees{'node_part_chapter_after_top'} = [
           'line_nr' => 11,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -456,10 +456,10 @@ $result_sectioning{'node_part_chapter_after_top'} = {
             'associated_part' => {},
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -521,9 +521,9 @@ $result_nodes{'node_part_chapter_after_top'} = {
           },
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter-node',
@@ -640,9 +640,9 @@ $result_elements{'node_part_chapter_after_top'} = [
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => 1,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 1
               }
             },
             'unit_command' => {}
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 3e148f5b8e..00852ba95b 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
@@ -155,10 +155,10 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -219,10 +219,10 @@ $result_sectioning{'node_sectop_before_chapter_no_node'} 
= {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
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 ddf5b12396..73c659c360 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
@@ -296,10 +296,10 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -403,10 +403,10 @@ $result_sectioning{'node_sectop_before_lone_node_Top'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -456,9 +456,9 @@ $result_nodes{'node_sectop_before_lone_node_Top'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           }
         },
         'normalized' => 'chap',
diff --git a/tp/t/results/sectioning/nodename_parentheses.pl 
b/tp/t/results/sectioning/nodename_parentheses.pl
index a4002f1965..3f80e39865 100644
--- a/tp/t/results/sectioning/nodename_parentheses.pl
+++ b/tp/t/results/sectioning/nodename_parentheses.pl
@@ -429,10 +429,10 @@ $result_trees{'nodename_parentheses'} = {
         'line_nr' => 11,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -627,10 +627,10 @@ $result_trees{'nodename_parentheses'} = {
         'line_nr' => 16,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -797,10 +797,10 @@ $result_trees{'nodename_parentheses'} = {
         'line_nr' => 23,
         'macro' => ''
       },
-      'number' => 3,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 3
       }
     }
   ],
@@ -1013,10 +1013,10 @@ $result_sectioning{'nodename_parentheses'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1033,11 +1033,11 @@ $result_sectioning{'nodename_parentheses'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1054,11 +1054,11 @@ $result_sectioning{'nodename_parentheses'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 3,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 3
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1110,9 +1110,9 @@ $result_nodes{'nodename_parentheses'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'Node-_0028with-parentheses_0029',
@@ -1126,9 +1126,9 @@ $result_nodes{'nodename_parentheses'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           }
         },
         'normalized' => 'Other-node',
@@ -1142,9 +1142,9 @@ $result_nodes{'nodename_parentheses'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => 3,
             'structure' => {
-              'level' => 1
+              'level' => 1,
+              '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 b744989907..843d420a93 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
@@ -483,10 +483,10 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
           'line_nr' => 13,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -621,10 +621,10 @@ 
$result_sectioning{'nodes_after_top_before_chapter_nodes'} = {
         },
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -654,9 +654,9 @@ $result_nodes{'nodes_after_top_before_chapter_nodes'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           }
         },
         'normalized' => 'third-node',
@@ -784,9 +784,9 @@ $result_elements{'nodes_after_top_before_chapter_nodes'} = [
                     'extra' => {
                       'spaces_before_argument' => ' '
                     },
-                    'number' => 1,
                     'structure' => {
-                      'level' => 1
+                      'level' => 1,
+                      'number' => 1
                     }
                   },
                   'unit_command' => {}
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 df249cf75d..e8b520d869 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
@@ -460,10 +460,10 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} 
= {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -580,10 +580,10 @@ 
$result_sectioning{'nodes_after_top_before_chapter_not_split'} = {
         },
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -613,9 +613,9 @@ $result_nodes{'nodes_after_top_before_chapter_not_split'} = 
{
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            '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 ae61e5ed82..c56f600091 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
@@ -460,10 +460,10 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -580,10 +580,10 @@ 
$result_sectioning{'nodes_after_top_before_chapter_not_split_no_use_node_directi
         },
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -613,9 +613,9 @@ 
$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            '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 71db0a2c4d..095ae89320 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
@@ -461,10 +461,10 @@ $result_trees{'nodes_after_top_before_chapter_sections'} 
= [
           'line_nr' => 13,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -591,10 +591,10 @@ 
$result_sectioning{'nodes_after_top_before_chapter_sections'} = {
         },
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -624,9 +624,9 @@ $result_nodes{'nodes_after_top_before_chapter_sections'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           }
         },
         'normalized' => 'third-node',
@@ -739,9 +739,9 @@ $result_elements{'nodes_after_top_before_chapter_sections'} 
= [
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'unit_command' => {}
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 2feaf3e289..2161223fd8 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
@@ -483,10 +483,10 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
           'line_nr' => 13,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 3
+          'level' => 3,
+          'number' => 1
         }
       }
     ],
@@ -621,10 +621,10 @@ 
$result_sectioning{'nodes_after_top_before_section_nodes'} = {
         },
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => 1
       }
     }
   ],
@@ -654,9 +654,9 @@ $result_nodes{'nodes_after_top_before_section_nodes'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'structure' => {
-            'level' => 3
+            'level' => 3,
+            'number' => 1
           }
         },
         'normalized' => 'third-node',
@@ -784,9 +784,9 @@ $result_elements{'nodes_after_top_before_section_nodes'} = [
                     'extra' => {
                       'spaces_before_argument' => ' '
                     },
-                    'number' => 1,
                     'structure' => {
-                      'level' => 3
+                      'level' => 3,
+                      'number' => 1
                     }
                   },
                   'unit_command' => {}
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 56c26ea27d..53715c572b 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
@@ -461,10 +461,10 @@ $result_trees{'nodes_after_top_before_section_sections'} 
= [
           'line_nr' => 13,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 3
+          'level' => 3,
+          'number' => 1
         }
       }
     ],
@@ -591,10 +591,10 @@ 
$result_sectioning{'nodes_after_top_before_section_sections'} = {
         },
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => 1
       }
     }
   ],
@@ -624,9 +624,9 @@ $result_nodes{'nodes_after_top_before_section_sections'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'structure' => {
-            'level' => 3
+            'level' => 3,
+            'number' => 1
           }
         },
         'normalized' => 'third-node',
@@ -739,9 +739,9 @@ $result_elements{'nodes_after_top_before_section_sections'} 
= [
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 3
+          'level' => 3,
+          'number' => 1
         }
       },
       'unit_command' => {}
diff --git a/tp/t/results/sectioning/nodes_before_after_top.pl 
b/tp/t/results/sectioning/nodes_before_after_top.pl
index 102fff1bd4..72de33be18 100644
--- a/tp/t/results/sectioning/nodes_before_after_top.pl
+++ b/tp/t/results/sectioning/nodes_before_after_top.pl
@@ -361,10 +361,10 @@ $result_trees{'nodes_before_after_top'} = {
         'line_nr' => 17,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -484,10 +484,10 @@ $result_sectioning{'nodes_before_after_top'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -531,9 +531,9 @@ $result_nodes{'nodes_before_after_top'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 59c966494a..edde8e4d2b 100644
--- a/tp/t/results/sectioning/nodes_before_after_top_xref.pl
+++ b/tp/t/results/sectioning/nodes_before_after_top_xref.pl
@@ -597,10 +597,10 @@ $result_trees{'nodes_before_after_top_xref'} = {
         'line_nr' => 17,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -771,10 +771,10 @@ $result_sectioning{'nodes_before_after_top_xref'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -818,9 +818,9 @@ $result_nodes{'nodes_before_after_top_xref'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          '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 e4123950c2..ba74c223b3 100644
--- a/tp/t/results/sectioning/nodes_before_top.pl
+++ b/tp/t/results/sectioning/nodes_before_top.pl
@@ -625,10 +625,10 @@ $result_trees{'nodes_before_top'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -786,10 +786,10 @@ $result_sectioning{'nodes_before_top'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -833,9 +833,9 @@ $result_nodes{'nodes_before_top'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'second-node',
diff --git a/tp/t/results/sectioning/one_subsection.pl 
b/tp/t/results/sectioning/one_subsection.pl
index fb7fc1454a..25eb17b2c7 100644
--- a/tp/t/results/sectioning/one_subsection.pl
+++ b/tp/t/results/sectioning/one_subsection.pl
@@ -39,10 +39,10 @@ $result_trees{'one_subsection'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => 1
       }
     }
   ],
@@ -68,10 +68,10 @@ $result_sectioning{'one_subsection'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => 1
       }
     }
   ],
diff --git a/tp/t/results/sectioning/one_subsection_and_node.pl 
b/tp/t/results/sectioning/one_subsection_and_node.pl
index d87636a6aa..49595a0def 100644
--- a/tp/t/results/sectioning/one_subsection_and_node.pl
+++ b/tp/t/results/sectioning/one_subsection_and_node.pl
@@ -80,10 +80,10 @@ $result_trees{'one_subsection_and_node'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => 1
       }
     }
   ],
@@ -122,10 +122,10 @@ $result_sectioning{'one_subsection_and_node'} = {
         },
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => 1
       }
     }
   ],
@@ -143,9 +143,9 @@ $result_nodes{'one_subsection_and_node'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        '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 0b66541ba0..3a80c61620 100644
--- a/tp/t/results/sectioning/part_before_chapter.pl
+++ b/tp/t/results/sectioning/part_before_chapter.pl
@@ -80,10 +80,10 @@ $result_trees{'part_before_chapter'} = [
           'line_nr' => 3,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -131,10 +131,10 @@ $result_sectioning{'part_before_chapter'} = {
             'associated_part' => {},
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           }
         },
         'spaces_before_argument' => ' '
@@ -180,9 +180,9 @@ $result_elements{'part_before_chapter'} = [
           },
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'unit_command' => {}
diff --git a/tp/t/results/sectioning/part_before_section.pl 
b/tp/t/results/sectioning/part_before_section.pl
index 862d306865..e3b69dbe61 100644
--- a/tp/t/results/sectioning/part_before_section.pl
+++ b/tp/t/results/sectioning/part_before_section.pl
@@ -80,10 +80,10 @@ $result_trees{'part_before_section'} = [
           'line_nr' => 3,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -131,10 +131,10 @@ $result_sectioning{'part_before_section'} = {
             'associated_part' => {},
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           }
         },
         'spaces_before_argument' => ' '
@@ -190,9 +190,9 @@ $result_elements{'part_before_section'} = [
           },
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'unit_command' => {}
diff --git a/tp/t/results/sectioning/part_chapter_after_top.pl 
b/tp/t/results/sectioning/part_chapter_after_top.pl
index 79aa9f830e..c509d0add6 100644
--- a/tp/t/results/sectioning/part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_chapter_after_top.pl
@@ -328,10 +328,10 @@ $result_trees{'part_chapter_after_top'} = [
           'line_nr' => 11,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -456,10 +456,10 @@ $result_sectioning{'part_chapter_after_top'} = {
             'associated_part' => {},
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -521,9 +521,9 @@ $result_nodes{'part_chapter_after_top'} = {
           },
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
@@ -630,9 +630,9 @@ $result_elements{'part_chapter_after_top'} = [
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => 1,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 1
               }
             },
             'unit_command' => {}
diff --git a/tp/t/results/sectioning/part_chapter_appendix.pl 
b/tp/t/results/sectioning/part_chapter_appendix.pl
index 236059602a..a242d1f2aa 100644
--- a/tp/t/results/sectioning/part_chapter_appendix.pl
+++ b/tp/t/results/sectioning/part_chapter_appendix.pl
@@ -93,10 +93,10 @@ $result_trees{'part_chapter_appendix'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -126,10 +126,10 @@ $result_trees{'part_chapter_appendix'} = {
         'line_nr' => 6,
         'macro' => ''
       },
-      'number' => 'A',
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 'A'
       }
     }
   ],
@@ -181,10 +181,10 @@ $result_sectioning{'part_chapter_appendix'} = {
             'associated_part' => {},
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           }
         },
         'spaces_before_argument' => ' '
@@ -202,11 +202,11 @@ $result_sectioning{'part_chapter_appendix'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 'A',
       'section_prev' => {},
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 'A'
       },
       'toplevel_prev' => {}
     }
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 049904c0d8..1f5e088950 100644
--- a/tp/t/results/sectioning/part_node_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_node_chapter_after_top.pl
@@ -541,10 +541,10 @@ $result_trees{'part_node_chapter_after_top'} = [
           'line_nr' => 15,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -710,10 +710,10 @@ $result_sectioning{'part_node_chapter_after_top'} = {
             'associated_part' => {},
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -781,9 +781,9 @@ $result_nodes{'part_node_chapter_after_top'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           }
         },
         'normalized' => 'chapter',
@@ -921,9 +921,9 @@ $result_elements{'part_node_chapter_after_top'} = [
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => 1,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 1
               }
             },
             'unit_command' => {}
diff --git a/tp/t/results/sectioning/part_node_chapter_appendix.pl 
b/tp/t/results/sectioning/part_node_chapter_appendix.pl
index 3ff6e3bb48..f3bbe88f5b 100644
--- a/tp/t/results/sectioning/part_node_chapter_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_appendix.pl
@@ -335,10 +335,10 @@ $result_trees{'part_node_chapter_appendix'} = [
           'line_nr' => 11,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -381,10 +381,10 @@ $result_trees{'part_node_chapter_appendix'} = [
           'line_nr' => 13,
           'macro' => ''
         },
-        'number' => 'A',
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 'A'
         }
       }
     ],
@@ -520,10 +520,10 @@ $result_sectioning{'part_node_chapter_appendix'} = {
             'associated_part' => {},
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -544,11 +544,11 @@ $result_sectioning{'part_node_chapter_appendix'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 'A',
       'section_prev' => {},
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 'A'
       },
       'toplevel_prev' => {},
       'toplevel_up' => {}
@@ -603,9 +603,9 @@ $result_nodes{'part_node_chapter_appendix'} = {
           },
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter-node',
@@ -712,9 +712,9 @@ $result_elements{'part_node_chapter_appendix'} = [
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => 1,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 1
               }
             },
             'unit_command' => {}
@@ -730,9 +730,9 @@ $result_elements{'part_node_chapter_appendix'} = [
                     'extra' => {
                       'spaces_before_argument' => ' '
                     },
-                    'number' => 'A',
                     'structure' => {
-                      'level' => 1
+                      'level' => 1,
+                      'number' => 'A'
                     }
                   },
                   'unit_command' => {}
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 dfab281c90..e78bfb6c07 100644
--- a/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
@@ -392,10 +392,10 @@ $result_trees{'part_node_chapter_node_appendix'} = [
           'line_nr' => 12,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -479,10 +479,10 @@ $result_trees{'part_node_chapter_node_appendix'} = [
           'line_nr' => 15,
           'macro' => ''
         },
-        'number' => 'A',
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 'A'
         }
       }
     ],
@@ -638,10 +638,10 @@ $result_sectioning{'part_node_chapter_node_appendix'} = {
             'associated_part' => {},
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -669,11 +669,11 @@ $result_sectioning{'part_node_chapter_node_appendix'} = {
         },
         'spaces_before_argument' => ' '
       },
-      'number' => 'A',
       'section_prev' => {},
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 'A'
       },
       'toplevel_prev' => {},
       'toplevel_up' => {}
@@ -728,9 +728,9 @@ $result_nodes{'part_node_chapter_node_appendix'} = {
           },
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter-node',
@@ -744,9 +744,9 @@ $result_nodes{'part_node_chapter_node_appendix'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 'A',
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 'A'
           }
         },
         'normalized' => 'appendix-node',
@@ -884,9 +884,9 @@ $result_elements{'part_node_chapter_node_appendix'} = [
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => 1,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 1
               }
             },
             'unit_command' => {}
@@ -903,9 +903,9 @@ $result_elements{'part_node_chapter_node_appendix'} = [
                     'extra' => {
                       'spaces_before_argument' => ' '
                     },
-                    'number' => 'A',
                     'structure' => {
-                      'level' => 1
+                      'level' => 1,
+                      'number' => 'A'
                     }
                   },
                   'unit_command' => {}
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 aabd1d33fe..349f1a5a32 100644
--- a/tp/t/results/sectioning/part_node_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_node_part_appendix.pl
@@ -392,10 +392,10 @@ $result_trees{'part_node_node_part_appendix'} = [
           'line_nr' => 12,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -519,10 +519,10 @@ $result_trees{'part_node_node_part_appendix'} = [
           'line_nr' => 17,
           'macro' => ''
         },
-        'number' => 'A',
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 'A'
         }
       }
     ],
@@ -688,10 +688,10 @@ $result_sectioning{'part_node_node_part_appendix'} = {
             'associated_part' => {},
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -723,10 +723,10 @@ $result_sectioning{'part_node_node_part_appendix'} = {
             'associated_part' => {},
             'spaces_before_argument' => ' '
           },
-          'number' => 'A',
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 'A'
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -795,9 +795,9 @@ $result_nodes{'part_node_node_part_appendix'} = {
           },
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter-node',
@@ -820,9 +820,9 @@ $result_nodes{'part_node_node_part_appendix'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 'A',
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 'A'
           }
         },
         'normalized' => 'appendix-part',
@@ -970,9 +970,9 @@ $result_elements{'part_node_node_part_appendix'} = [
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => 1,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 1
               }
             },
             'unit_command' => {}
@@ -998,9 +998,9 @@ $result_elements{'part_node_node_part_appendix'} = [
                       },
                       'spaces_before_argument' => ' '
                     },
-                    'number' => 'A',
                     'structure' => {
-                      'level' => 1
+                      'level' => 1,
+                      'number' => 'A'
                     }
                   },
                   'unit_command' => {}
diff --git a/tp/t/results/sectioning/part_node_part_appendix.pl 
b/tp/t/results/sectioning/part_node_part_appendix.pl
index 16a4ad7cba..41b639a7a2 100644
--- a/tp/t/results/sectioning/part_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_appendix.pl
@@ -335,10 +335,10 @@ $result_trees{'part_node_part_appendix'} = [
           'line_nr' => 11,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -421,10 +421,10 @@ $result_trees{'part_node_part_appendix'} = [
           'line_nr' => 15,
           'macro' => ''
         },
-        'number' => 'A',
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 'A'
         }
       }
     ],
@@ -570,10 +570,10 @@ $result_sectioning{'part_node_part_appendix'} = {
             'associated_part' => {},
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -598,10 +598,10 @@ $result_sectioning{'part_node_part_appendix'} = {
             'associated_part' => {},
             'spaces_before_argument' => ' '
           },
-          'number' => 'A',
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 'A'
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -670,9 +670,9 @@ $result_nodes{'part_node_part_appendix'} = {
           },
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter-node',
@@ -779,9 +779,9 @@ $result_elements{'part_node_part_appendix'} = [
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => 1,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 1
               }
             },
             'unit_command' => {}
@@ -806,9 +806,9 @@ $result_elements{'part_node_part_appendix'} = [
                       },
                       'spaces_before_argument' => ' '
                     },
-                    'number' => 'A',
                     'structure' => {
-                      'level' => 1
+                      'level' => 1,
+                      'number' => 'A'
                     }
                   },
                   'unit_command' => {}
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 beb889447b..c14c1b6eef 100644
--- a/tp/t/results/sectioning/part_node_part_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_node_appendix.pl
@@ -392,10 +392,10 @@ $result_trees{'part_node_part_node_appendix'} = [
           'line_nr' => 12,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -519,10 +519,10 @@ $result_trees{'part_node_part_node_appendix'} = [
           'line_nr' => 17,
           'macro' => ''
         },
-        'number' => 'A',
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 'A'
         }
       }
     ],
@@ -688,10 +688,10 @@ $result_sectioning{'part_node_part_node_appendix'} = {
             'associated_part' => {},
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -723,10 +723,10 @@ $result_sectioning{'part_node_part_node_appendix'} = {
             'associated_part' => {},
             'spaces_before_argument' => ' '
           },
-          'number' => 'A',
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 'A'
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -795,9 +795,9 @@ $result_nodes{'part_node_part_node_appendix'} = {
           },
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter-node',
@@ -820,9 +820,9 @@ $result_nodes{'part_node_part_node_appendix'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 'A',
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 'A'
           }
         },
         'normalized' => 'appendix-node',
@@ -960,9 +960,9 @@ $result_elements{'part_node_part_node_appendix'} = [
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => 1,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 1
               }
             },
             'unit_command' => {}
@@ -988,9 +988,9 @@ $result_elements{'part_node_part_node_appendix'} = [
                       },
                       'spaces_before_argument' => ' '
                     },
-                    'number' => 'A',
                     'structure' => {
-                      'level' => 1
+                      'level' => 1,
+                      'number' => 'A'
                     }
                   },
                   'unit_command' => {}
diff --git a/tp/t/results/sectioning/placed_things_before_element.pl 
b/tp/t/results/sectioning/placed_things_before_element.pl
index 686c542b28..868bb9b9f1 100644
--- a/tp/t/results/sectioning/placed_things_before_element.pl
+++ b/tp/t/results/sectioning/placed_things_before_element.pl
@@ -377,8 +377,10 @@ $result_trees{'placed_things_before_element'} = {
             'line_nr' => 17,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         },
         {
           'parent' => {},
@@ -739,10 +741,10 @@ $result_trees{'placed_things_before_element'} = {
         'line_nr' => 30,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     }
   ],
@@ -937,10 +939,10 @@ $result_sectioning{'placed_things_before_element'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     }
   ],
@@ -982,7 +984,9 @@ $result_floats{'placed_things_before_element'} = {
           'normalized' => ''
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ]
 };
diff --git a/tp/t/results/sectioning/placed_things_before_node.pl 
b/tp/t/results/sectioning/placed_things_before_node.pl
index f3a99830e9..340c5de9b9 100644
--- a/tp/t/results/sectioning/placed_things_before_node.pl
+++ b/tp/t/results/sectioning/placed_things_before_node.pl
@@ -377,8 +377,10 @@ $result_trees{'placed_things_before_node'} = {
             'line_nr' => 17,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         },
         {
           'parent' => {},
@@ -1059,7 +1061,9 @@ $result_floats{'placed_things_before_node'} = {
           'normalized' => ''
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ]
 };
diff --git a/tp/t/results/sectioning/raiselowersections.pl 
b/tp/t/results/sectioning/raiselowersections.pl
index b765a9fa8f..3c4bb43135 100644
--- a/tp/t/results/sectioning/raiselowersections.pl
+++ b/tp/t/results/sectioning/raiselowersections.pl
@@ -566,10 +566,10 @@ $result_trees{'raiselowersections'} = {
         'line_nr' => 11,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -764,10 +764,10 @@ $result_trees{'raiselowersections'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -962,10 +962,10 @@ $result_trees{'raiselowersections'} = {
         'line_nr' => 20,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -1092,10 +1092,10 @@ $result_trees{'raiselowersections'} = {
         'line_nr' => 27,
         'macro' => ''
       },
-      'number' => '1.1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 4
+        'level' => 4,
+        'number' => '1.1.1.1'
       }
     },
     {
@@ -1207,10 +1207,10 @@ $result_trees{'raiselowersections'} = {
         'line_nr' => 31,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -1513,7 +1513,6 @@ $result_sectioning{'raiselowersections'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'chapter',
@@ -1528,7 +1527,6 @@ $result_sectioning{'raiselowersections'} = {
                 'sections_level' => -1,
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'section',
@@ -1543,7 +1541,6 @@ $result_sectioning{'raiselowersections'} = {
                     'sections_level' => -1,
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_childs' => [
                     {
                       'cmdname' => 'subsection',
@@ -1558,28 +1555,31 @@ $result_sectioning{'raiselowersections'} = {
                         'sections_level' => -1,
                         'spaces_before_argument' => ' '
                       },
-                      'number' => '1.1.1.1',
                       'section_up' => {},
                       'structure' => {
-                        'level' => 4
+                        'level' => 4,
+                        'number' => '1.1.1.1'
                       }
                     }
                   ],
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1596,11 +1596,11 @@ $result_sectioning{'raiselowersections'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -1649,9 +1649,9 @@ $result_nodes{'raiselowersections'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'Chapter',
@@ -1666,9 +1666,9 @@ $result_nodes{'raiselowersections'} = {
             'sections_level' => -1,
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         'normalized' => 'Chapter-in-included-file',
@@ -1683,9 +1683,9 @@ $result_nodes{'raiselowersections'} = {
               'sections_level' => -1,
               'spaces_before_argument' => ' '
             },
-            'number' => '1.1.1',
             'structure' => {
-              'level' => 3
+              'level' => 3,
+              'number' => '1.1.1'
             }
           },
           'normalized' => 'Section',
@@ -1700,9 +1700,9 @@ $result_nodes{'raiselowersections'} = {
                 'sections_level' => -1,
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1.1.1',
               'structure' => {
-                'level' => 4
+                'level' => 4,
+                'number' => '1.1.1.1'
               }
             },
             'normalized' => 'Subsection',
@@ -1767,9 +1767,9 @@ $result_nodes{'raiselowersections'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           }
         },
         'normalized' => 'Second-chapter',
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 f9a49eaff5..939f68110e 100644
--- a/tp/t/results/sectioning/section_before_after_top_node.pl
+++ b/tp/t/results/sectioning/section_before_after_top_node.pl
@@ -212,10 +212,10 @@ $result_trees{'section_before_after_top_node'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -308,11 +308,11 @@ $result_sectioning{'section_before_after_top_node'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_prev' => {},
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       },
       'toplevel_prev' => {},
       'toplevel_up' => {}
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 334df57f00..0f6e50a772 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
@@ -218,10 +218,10 @@ $result_trees{'section_before_after_top_node_last_node'} 
= {
         'line_nr' => 8,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -364,11 +364,11 @@ 
$result_sectioning{'section_before_after_top_node_last_node'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_prev' => {},
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       },
       'toplevel_prev' => {},
       'toplevel_up' => {}
diff --git a/tp/t/results/sectioning/section_before_chapter.pl 
b/tp/t/results/sectioning/section_before_chapter.pl
index bae13ac682..2a6fc69ab9 100644
--- a/tp/t/results/sectioning/section_before_chapter.pl
+++ b/tp/t/results/sectioning/section_before_chapter.pl
@@ -46,10 +46,10 @@ $result_trees{'section_before_chapter'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     },
     {
@@ -79,10 +79,10 @@ $result_trees{'section_before_chapter'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 2
       }
     }
   ],
@@ -117,10 +117,10 @@ $result_sectioning{'section_before_chapter'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     },
     {
@@ -128,11 +128,11 @@ $result_sectioning{'section_before_chapter'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 2,
       'section_prev' => {},
       'section_up' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 2
       },
       'toplevel_prev' => {}
     }
diff --git a/tp/t/results/sectioning/section_before_part.pl 
b/tp/t/results/sectioning/section_before_part.pl
index 14855e0b99..de02fa096c 100644
--- a/tp/t/results/sectioning/section_before_part.pl
+++ b/tp/t/results/sectioning/section_before_part.pl
@@ -46,10 +46,10 @@ $result_trees{'section_before_part'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     },
     {
@@ -146,10 +146,10 @@ $result_sectioning{'section_before_part'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     },
     {
diff --git a/tp/t/results/sectioning/section_before_top.pl 
b/tp/t/results/sectioning/section_before_top.pl
index f528195bb0..6870a074b4 100644
--- a/tp/t/results/sectioning/section_before_top.pl
+++ b/tp/t/results/sectioning/section_before_top.pl
@@ -115,10 +115,10 @@ $result_trees{'section_before_top'} = {
         'line_nr' => 2,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     },
     {
@@ -391,10 +391,10 @@ $result_sectioning{'section_before_top'} = {
         },
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     },
     {
@@ -449,9 +449,9 @@ $result_nodes{'section_before_top'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 2
+          'level' => 2,
+          '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 fde7cd83cc..6e3b4d3007 100644
--- a/tp/t/results/sectioning/section_before_top_no_node.pl
+++ b/tp/t/results/sectioning/section_before_top_no_node.pl
@@ -46,10 +46,10 @@ $result_trees{'section_before_top_no_node'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     },
     {
@@ -116,10 +116,10 @@ $result_sectioning{'section_before_top_no_node'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     },
     {
diff --git a/tp/t/results/sectioning/section_chapter_before_top.pl 
b/tp/t/results/sectioning/section_chapter_before_top.pl
index 615ce5e6a5..c1dcd609ce 100644
--- a/tp/t/results/sectioning/section_chapter_before_top.pl
+++ b/tp/t/results/sectioning/section_chapter_before_top.pl
@@ -46,10 +46,10 @@ $result_trees{'section_chapter_before_top'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     },
     {
@@ -86,10 +86,10 @@ $result_trees{'section_chapter_before_top'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 2
       }
     },
     {
@@ -165,10 +165,10 @@ $result_sectioning{'section_chapter_before_top'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     },
     {
@@ -176,11 +176,11 @@ $result_sectioning{'section_chapter_before_top'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 2,
       'section_prev' => {},
       'section_up' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 2
       },
       'toplevel_prev' => {}
     },
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 f44a470c2c..28aefbb574 100644
--- a/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
+++ b/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
@@ -123,10 +123,10 @@ $result_trees{'section_chapter_before_top_nodes'} = {
         'line_nr' => 4,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     },
     {
@@ -320,10 +320,10 @@ $result_trees{'section_chapter_before_top_nodes'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 2
       }
     },
     {
@@ -646,10 +646,10 @@ $result_sectioning{'section_chapter_before_top_nodes'} = {
         },
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     },
     {
@@ -664,11 +664,11 @@ $result_sectioning{'section_chapter_before_top_nodes'} = {
         },
         'spaces_before_argument' => ' '
       },
-      'number' => 2,
       'section_prev' => {},
       'section_up' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 2
       },
       'toplevel_prev' => {}
     },
@@ -727,9 +727,9 @@ $result_nodes{'section_chapter_before_top_nodes'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 2,
         'structure' => {
-          'level' => 2
+          'level' => 2,
+          'number' => 2
         }
       },
       'normalized' => 'chapter-node',
@@ -743,9 +743,9 @@ $result_nodes{'section_chapter_before_top_nodes'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            '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 5594e0b759..d7c2e142a3 100644
--- a/tp/t/results/sectioning/section_in_unnumbered_info.pl
+++ b/tp/t/results/sectioning/section_in_unnumbered_info.pl
@@ -674,10 +674,10 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 18,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -755,10 +755,10 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 25,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -1285,10 +1285,10 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 38,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -2679,10 +2679,10 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 79,
         'macro' => ''
       },
-      'number' => 3,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 3
       }
     },
     {
@@ -3447,10 +3447,10 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 112,
         'macro' => ''
       },
-      'number' => '3.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '3.1'
       }
     },
     {
@@ -3920,10 +3920,10 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 125,
         'macro' => ''
       },
-      'number' => '3.2',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '3.2'
       }
     },
     {
@@ -4001,10 +4001,10 @@ $result_trees{'section_in_unnumbered_info'} = {
         'line_nr' => 132,
         'macro' => ''
       },
-      'number' => '3.2.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '3.2.1'
       }
     },
     {
@@ -6220,7 +6220,6 @@ $result_sectioning{'section_in_unnumbered_info'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -6234,16 +6233,17 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -6299,7 +6299,6 @@ $result_sectioning{'section_in_unnumbered_info'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_childs' => [
             {
               'cmdname' => 'unnumberedsec',
@@ -6432,7 +6431,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -6449,7 +6449,6 @@ $result_sectioning{'section_in_unnumbered_info'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 3,
           'section_childs' => [
             {
               'cmdname' => 'unnumberedsec',
@@ -6553,11 +6552,11 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '3.1',
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '3.1'
               }
             },
             {
@@ -6609,7 +6608,6 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '3.2',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
@@ -6623,17 +6621,18 @@ $result_sectioning{'section_in_unnumbered_info'} = {
                     },
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '3.2.1',
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '3.2.1'
                   }
                 }
               ],
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '3.2'
               }
             },
             {
@@ -6677,7 +6676,8 @@ $result_sectioning{'section_in_unnumbered_info'} = {
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 3
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -6889,9 +6889,9 @@ $result_nodes{'section_in_unnumbered_info'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
@@ -6905,9 +6905,9 @@ $result_nodes{'section_in_unnumbered_info'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         'normalized' => 'section-in-chapter',
@@ -6985,9 +6985,9 @@ $result_nodes{'section_in_unnumbered_info'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => 2,
             'structure' => {
-              'level' => 1
+              'level' => 1,
+              'number' => 2
             }
           },
           'normalized' => 'chapter-2',
@@ -7169,9 +7169,9 @@ $result_nodes{'section_in_unnumbered_info'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => 3,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 3
               }
             },
             'normalized' => 'chapter-3',
@@ -7286,9 +7286,9 @@ $result_nodes{'section_in_unnumbered_info'} = {
                   'extra' => {
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '3.1',
                   'structure' => {
-                    'level' => 2
+                    'level' => 2,
+                    'number' => '3.1'
                   }
                 },
                 'normalized' => 'section-3_002d1',
@@ -7349,9 +7349,9 @@ $result_nodes{'section_in_unnumbered_info'} = {
                       'extra' => {
                         'spaces_before_argument' => ' '
                       },
-                      'number' => '3.2',
                       'structure' => {
-                        'level' => 2
+                        'level' => 2,
+                        'number' => '3.2'
                       }
                     },
                     'normalized' => 'section-3_002d3',
@@ -7365,9 +7365,9 @@ $result_nodes{'section_in_unnumbered_info'} = {
                         'extra' => {
                           'spaces_before_argument' => ' '
                         },
-                        'number' => '3.2.1',
                         'structure' => {
-                          'level' => 3
+                          'level' => 3,
+                          'number' => '3.2.1'
                         }
                       },
                       'normalized' => 'subsection-3_002d3',
diff --git a/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl 
b/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
index e7ccf310e0..4c31f2785a 100644
--- a/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
+++ b/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
@@ -674,10 +674,10 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 18,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -755,10 +755,10 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 25,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -1285,10 +1285,10 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 38,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -2679,10 +2679,10 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 79,
         'macro' => ''
       },
-      'number' => 3,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 3
       }
     },
     {
@@ -3447,10 +3447,10 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 112,
         'macro' => ''
       },
-      'number' => '3.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '3.1'
       }
     },
     {
@@ -3920,10 +3920,10 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 125,
         'macro' => ''
       },
-      'number' => '3.2',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '3.2'
       }
     },
     {
@@ -4001,10 +4001,10 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
         'line_nr' => 132,
         'macro' => ''
       },
-      'number' => '3.2.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '3.2.1'
       }
     },
     {
@@ -6220,7 +6220,6 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -6234,16 +6233,17 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -6299,7 +6299,6 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_childs' => [
             {
               'cmdname' => 'unnumberedsec',
@@ -6432,7 +6431,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -6449,7 +6449,6 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 3,
           'section_childs' => [
             {
               'cmdname' => 'unnumberedsec',
@@ -6553,11 +6552,11 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '3.1',
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '3.1'
               }
             },
             {
@@ -6609,7 +6608,6 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '3.2',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
@@ -6623,17 +6621,18 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = 
{
                     },
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '3.2.1',
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '3.2.1'
                   }
                 }
               ],
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '3.2'
               }
             },
             {
@@ -6677,7 +6676,8 @@ $result_sectioning{'section_in_unnumbered_plaintext'} = {
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 3
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -6889,9 +6889,9 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',
@@ -6905,9 +6905,9 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         'normalized' => 'section-in-chapter',
@@ -6985,9 +6985,9 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => 2,
             'structure' => {
-              'level' => 1
+              'level' => 1,
+              'number' => 2
             }
           },
           'normalized' => 'chapter-2',
@@ -7169,9 +7169,9 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => 3,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 3
               }
             },
             'normalized' => 'chapter-3',
@@ -7286,9 +7286,9 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                   'extra' => {
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '3.1',
                   'structure' => {
-                    'level' => 2
+                    'level' => 2,
+                    'number' => '3.1'
                   }
                 },
                 'normalized' => 'section-3_002d1',
@@ -7349,9 +7349,9 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                       'extra' => {
                         'spaces_before_argument' => ' '
                       },
-                      'number' => '3.2',
                       'structure' => {
-                        'level' => 2
+                        'level' => 2,
+                        'number' => '3.2'
                       }
                     },
                     'normalized' => 'section-3_002d3',
@@ -7365,9 +7365,9 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                         'extra' => {
                           'spaces_before_argument' => ' '
                         },
-                        'number' => '3.2.1',
                         'structure' => {
-                          'level' => 3
+                          'level' => 3,
+                          'number' => '3.2.1'
                         }
                       },
                       'normalized' => 'subsection-3_002d3',
diff --git a/tp/t/results/sectioning/section_node_before_part.pl 
b/tp/t/results/sectioning/section_node_before_part.pl
index 583538c5ab..f36655850c 100644
--- a/tp/t/results/sectioning/section_node_before_part.pl
+++ b/tp/t/results/sectioning/section_node_before_part.pl
@@ -94,10 +94,10 @@ $result_trees{'section_node_before_part'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     },
     {
@@ -180,10 +180,10 @@ $result_sectioning{'section_node_before_part'} = {
         },
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 1
       }
     },
     {
@@ -212,9 +212,9 @@ $result_nodes{'section_node_before_part'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        '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 4acd9485de..5d9937b1ad 100644
--- a/tp/t/results/sectioning/sectioning_part_appendix.pl
+++ b/tp/t/results/sectioning/sectioning_part_appendix.pl
@@ -96,10 +96,10 @@ $result_trees{'sectioning_part_appendix'} = [
           'line_nr' => 3,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -148,10 +148,10 @@ $result_trees{'sectioning_part_appendix'} = [
           'line_nr' => 5,
           'macro' => ''
         },
-        'number' => '1.1',
         'parent' => {},
         'structure' => {
-          'level' => 2
+          'level' => 2,
+          'number' => '1.1'
         }
       }
     ],
@@ -200,10 +200,10 @@ $result_trees{'sectioning_part_appendix'} = [
           'line_nr' => 7,
           'macro' => ''
         },
-        'number' => '1.1.1',
         'parent' => {},
         'structure' => {
-          'level' => 3
+          'level' => 3,
+          'number' => '1.1.1'
         }
       }
     ],
@@ -252,10 +252,10 @@ $result_trees{'sectioning_part_appendix'} = [
           'line_nr' => 9,
           'macro' => ''
         },
-        'number' => '1.1.1.1',
         'parent' => {},
         'structure' => {
-          'level' => 4
+          'level' => 4,
+          'number' => '1.1.1.1'
         }
       }
     ],
@@ -344,10 +344,10 @@ $result_trees{'sectioning_part_appendix'} = [
           'line_nr' => 13,
           'macro' => ''
         },
-        'number' => 2,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 2
         }
       }
     ],
@@ -396,10 +396,10 @@ $result_trees{'sectioning_part_appendix'} = [
           'line_nr' => 15,
           'macro' => ''
         },
-        'number' => 3,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 3
         }
       }
     ],
@@ -499,10 +499,10 @@ $result_trees{'sectioning_part_appendix'} = [
           'line_nr' => 19,
           'macro' => ''
         },
-        'number' => 'A',
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 'A'
         }
       }
     ],
@@ -544,10 +544,10 @@ $result_trees{'sectioning_part_appendix'} = [
           'line_nr' => 21,
           'macro' => ''
         },
-        'number' => 'A.1',
         'parent' => {},
         'structure' => {
-          'level' => 2
+          'level' => 2,
+          'number' => 'A.1'
         }
       }
     ],
@@ -707,49 +707,49 @@ $result_sectioning{'sectioning_part_appendix'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
                   'extra' => {
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_childs' => [
                     {
                       'cmdname' => 'subsubsection',
                       'extra' => {
                         'spaces_before_argument' => ' '
                       },
-                      'number' => '1.1.1.1',
                       'section_up' => {},
                       'structure' => {
-                        'level' => 4
+                        'level' => 4,
+                        'number' => '1.1.1.1'
                       }
                     }
                   ],
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -769,10 +769,10 @@ $result_sectioning{'sectioning_part_appendix'} = {
             'associated_part' => {},
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -786,11 +786,11 @@ $result_sectioning{'sectioning_part_appendix'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 3,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 3
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -820,24 +820,24 @@ $result_sectioning{'sectioning_part_appendix'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 'A',
       'section_childs' => [
         {
           'cmdname' => 'appendixsec',
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 'A.1',
           'section_up' => {},
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => 'A.1'
           }
         }
       ],
       'section_prev' => {},
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 'A'
       },
       'toplevel_prev' => {},
       'toplevel_up' => {}
@@ -904,9 +904,9 @@ $result_elements{'sectioning_part_appendix'} = [
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => 1,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 1
               }
             },
             'unit_command' => {}
@@ -931,9 +931,9 @@ $result_elements{'sectioning_part_appendix'} = [
                       },
                       'spaces_before_argument' => ' '
                     },
-                    'number' => 2,
                     'structure' => {
-                      'level' => 1
+                      'level' => 1,
+                      'number' => 2
                     }
                   },
                   'unit_command' => {}
@@ -947,9 +947,9 @@ $result_elements{'sectioning_part_appendix'} = [
                           'extra' => {
                             'spaces_before_argument' => ' '
                           },
-                          'number' => '1.1.1.1',
                           'structure' => {
-                            'level' => 4
+                            'level' => 4,
+                            'number' => '1.1.1.1'
                           }
                         },
                         'unit_command' => {}
@@ -963,9 +963,9 @@ $result_elements{'sectioning_part_appendix'} = [
                                 'extra' => {
                                   'spaces_before_argument' => ' '
                                 },
-                                'number' => '1.1.1',
                                 'structure' => {
-                                  'level' => 3
+                                  'level' => 3,
+                                  'number' => '1.1.1'
                                 }
                               },
                               'unit_command' => {}
@@ -979,9 +979,9 @@ $result_elements{'sectioning_part_appendix'} = [
                                       'extra' => {
                                         'spaces_before_argument' => ' '
                                       },
-                                      'number' => '1.1',
                                       'structure' => {
-                                        'level' => 2
+                                        'level' => 2,
+                                        'number' => '1.1'
                                       }
                                     },
                                     'unit_command' => {}
@@ -1024,9 +1024,9 @@ $result_elements{'sectioning_part_appendix'} = [
                           'extra' => {
                             'spaces_before_argument' => ' '
                           },
-                          'number' => 3,
                           'structure' => {
-                            'level' => 1
+                            'level' => 1,
+                            'number' => 3
                           }
                         },
                         'unit_command' => {}
@@ -1059,9 +1059,9 @@ $result_elements{'sectioning_part_appendix'} = [
                                       'extra' => {
                                         'spaces_before_argument' => ' '
                                       },
-                                      'number' => 'A',
                                       'structure' => {
-                                        'level' => 1
+                                        'level' => 1,
+                                        'number' => 'A'
                                       }
                                     },
                                     'unit_command' => {}
@@ -1077,9 +1077,9 @@ $result_elements{'sectioning_part_appendix'} = [
                                             'extra' => {
                                               'spaces_before_argument' => ' '
                                             },
-                                            'number' => 'A.1',
                                             'structure' => {
-                                              'level' => 2
+                                              'level' => 2,
+                                              'number' => 'A.1'
                                             }
                                           },
                                           'unit_command' => {}
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 3ea58e9b73..ea46d0c3a3 100644
--- a/tp/t/results/sectioning/sectioning_part_appendix_no_top.pl
+++ b/tp/t/results/sectioning/sectioning_part_appendix_no_top.pl
@@ -47,10 +47,10 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
           'line_nr' => 1,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -97,10 +97,10 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
           'line_nr' => 3,
           'macro' => ''
         },
-        'number' => '1.1',
         'parent' => {},
         'structure' => {
-          'level' => 2
+          'level' => 2,
+          'number' => '1.1'
         }
       }
     ],
@@ -149,10 +149,10 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
           'line_nr' => 5,
           'macro' => ''
         },
-        'number' => '1.1.1',
         'parent' => {},
         'structure' => {
-          'level' => 3
+          'level' => 3,
+          'number' => '1.1.1'
         }
       }
     ],
@@ -201,10 +201,10 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
           'line_nr' => 7,
           'macro' => ''
         },
-        'number' => '1.1.1.1',
         'parent' => {},
         'structure' => {
-          'level' => 4
+          'level' => 4,
+          'number' => '1.1.1.1'
         }
       }
     ],
@@ -293,10 +293,10 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
           'line_nr' => 11,
           'macro' => ''
         },
-        'number' => 2,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 2
         }
       }
     ],
@@ -345,10 +345,10 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
           'line_nr' => 13,
           'macro' => ''
         },
-        'number' => 3,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 3
         }
       }
     ],
@@ -448,10 +448,10 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
           'line_nr' => 17,
           'macro' => ''
         },
-        'number' => 'A',
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 'A'
         }
       }
     ],
@@ -493,10 +493,10 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
           'line_nr' => 19,
           'macro' => ''
         },
-        'number' => 'A.1',
         'parent' => {},
         'structure' => {
-          'level' => 2
+          'level' => 2,
+          'number' => 'A.1'
         }
       }
     ],
@@ -638,49 +638,49 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_childs' => [
         {
           'cmdname' => 'section',
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'section_childs' => [
             {
               'cmdname' => 'subsection',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsubsection',
                   'extra' => {
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1.1',
                   'section_up' => {},
                   'structure' => {
-                    'level' => 4
+                    'level' => 4,
+                    'number' => '1.1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 3
+                'level' => 3,
+                'number' => '1.1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         }
       ],
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -692,10 +692,10 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
             'associated_part' => {},
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {}
         },
@@ -708,11 +708,11 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 3,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 3
           },
           'toplevel_prev' => {}
         },
@@ -739,24 +739,24 @@ $result_sectioning{'sectioning_part_appendix_no_top'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 'A',
       'section_childs' => [
         {
           'cmdname' => 'appendixsec',
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 'A.1',
           'section_up' => {},
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => 'A.1'
           }
         }
       ],
       'section_prev' => {},
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 'A'
       },
       'toplevel_prev' => {}
     }
@@ -799,9 +799,9 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'unit_command' => {}
@@ -824,9 +824,9 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => 2,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 2
               }
             },
             'unit_command' => {}
@@ -840,9 +840,9 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                     'extra' => {
                       'spaces_before_argument' => ' '
                     },
-                    'number' => '1.1.1.1',
                     'structure' => {
-                      'level' => 4
+                      'level' => 4,
+                      'number' => '1.1.1.1'
                     }
                   },
                   'unit_command' => {}
@@ -856,9 +856,9 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                           'extra' => {
                             'spaces_before_argument' => ' '
                           },
-                          'number' => '1.1.1',
                           'structure' => {
-                            'level' => 3
+                            'level' => 3,
+                            'number' => '1.1.1'
                           }
                         },
                         'unit_command' => {}
@@ -872,9 +872,9 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                                 'extra' => {
                                   'spaces_before_argument' => ' '
                                 },
-                                'number' => '1.1',
                                 'structure' => {
-                                  'level' => 2
+                                  'level' => 2,
+                                  'number' => '1.1'
                                 }
                               },
                               'unit_command' => {}
@@ -917,9 +917,9 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                     'extra' => {
                       'spaces_before_argument' => ' '
                     },
-                    'number' => 3,
                     'structure' => {
-                      'level' => 1
+                      'level' => 1,
+                      'number' => 3
                     }
                   },
                   'unit_command' => {}
@@ -952,9 +952,9 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                                 'extra' => {
                                   'spaces_before_argument' => ' '
                                 },
-                                'number' => 'A',
                                 'structure' => {
-                                  'level' => 1
+                                  'level' => 1,
+                                  'number' => 'A'
                                 }
                               },
                               'unit_command' => {}
@@ -970,9 +970,9 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                                       'extra' => {
                                         'spaces_before_argument' => ' '
                                       },
-                                      'number' => 'A.1',
                                       'structure' => {
-                                        'level' => 2
+                                        'level' => 2,
+                                        'number' => 'A.1'
                                       }
                                     },
                                     'unit_command' => {}
diff --git a/tp/t/results/sectioning/sections.pl 
b/tp/t/results/sectioning/sections.pl
index 9e926df3e7..b436cee9d4 100644
--- a/tp/t/results/sectioning/sections.pl
+++ b/tp/t/results/sectioning/sections.pl
@@ -39,10 +39,10 @@ $result_trees{'sections'} = {
         'line_nr' => 1,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -68,10 +68,10 @@ $result_sectioning{'sections'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
diff --git a/tp/t/results/sectioning/sections_test.pl 
b/tp/t/results/sectioning/sections_test.pl
index 3343ebc1d3..aba3c99047 100644
--- a/tp/t/results/sectioning/sections_test.pl
+++ b/tp/t/results/sectioning/sections_test.pl
@@ -85,10 +85,10 @@ $result_trees{'sections_test'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -125,10 +125,10 @@ $result_trees{'sections_test'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -165,10 +165,10 @@ $result_trees{'sections_test'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -205,10 +205,10 @@ $result_trees{'sections_test'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'number' => '1.1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 4
+        'level' => 4,
+        'number' => '1.1.1.1'
       }
     },
     {
@@ -285,10 +285,10 @@ $result_trees{'sections_test'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -325,10 +325,10 @@ $result_trees{'sections_test'} = {
         'line_nr' => 15,
         'macro' => ''
       },
-      'number' => 3,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 3
       }
     },
     {
@@ -404,10 +404,10 @@ $result_trees{'sections_test'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'number' => 'A',
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 'A'
       }
     },
     {
@@ -437,10 +437,10 @@ $result_trees{'sections_test'} = {
         'line_nr' => 21,
         'macro' => ''
       },
-      'number' => 'A.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 'A.1'
       }
     }
   ],
@@ -563,49 +563,49 @@ $result_sectioning{'sections_test'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
                   'extra' => {
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_childs' => [
                     {
                       'cmdname' => 'subsubsection',
                       'extra' => {
                         'spaces_before_argument' => ' '
                       },
-                      'number' => '1.1.1.1',
                       'section_up' => {},
                       'structure' => {
-                        'level' => 4
+                        'level' => 4,
+                        'number' => '1.1.1.1'
                       }
                     }
                   ],
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -625,10 +625,10 @@ $result_sectioning{'sections_test'} = {
             'associated_part' => {},
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -642,11 +642,11 @@ $result_sectioning{'sections_test'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 3,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 3
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -676,24 +676,24 @@ $result_sectioning{'sections_test'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 'A',
       'section_childs' => [
         {
           'cmdname' => 'appendixsec',
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 'A.1',
           'section_up' => {},
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => 'A.1'
           }
         }
       ],
       'section_prev' => {},
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 'A'
       },
       'toplevel_prev' => {},
       'toplevel_up' => {}
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 aa9e6a5187..80591b5dc3 100644
--- a/tp/t/results/sectioning/sections_test_no_use_nodes.pl
+++ b/tp/t/results/sectioning/sections_test_no_use_nodes.pl
@@ -85,10 +85,10 @@ $result_trees{'sections_test_no_use_nodes'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -125,10 +125,10 @@ $result_trees{'sections_test_no_use_nodes'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -165,10 +165,10 @@ $result_trees{'sections_test_no_use_nodes'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -205,10 +205,10 @@ $result_trees{'sections_test_no_use_nodes'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'number' => '1.1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 4
+        'level' => 4,
+        'number' => '1.1.1.1'
       }
     },
     {
@@ -285,10 +285,10 @@ $result_trees{'sections_test_no_use_nodes'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -325,10 +325,10 @@ $result_trees{'sections_test_no_use_nodes'} = {
         'line_nr' => 15,
         'macro' => ''
       },
-      'number' => 3,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 3
       }
     },
     {
@@ -404,10 +404,10 @@ $result_trees{'sections_test_no_use_nodes'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'number' => 'A',
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 'A'
       }
     },
     {
@@ -437,10 +437,10 @@ $result_trees{'sections_test_no_use_nodes'} = {
         'line_nr' => 21,
         'macro' => ''
       },
-      'number' => 'A.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 'A.1'
       }
     }
   ],
@@ -563,49 +563,49 @@ $result_sectioning{'sections_test_no_use_nodes'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
                   'extra' => {
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_childs' => [
                     {
                       'cmdname' => 'subsubsection',
                       'extra' => {
                         'spaces_before_argument' => ' '
                       },
-                      'number' => '1.1.1.1',
                       'section_up' => {},
                       'structure' => {
-                        'level' => 4
+                        'level' => 4,
+                        'number' => '1.1.1.1'
                       }
                     }
                   ],
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -625,10 +625,10 @@ $result_sectioning{'sections_test_no_use_nodes'} = {
             'associated_part' => {},
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -642,11 +642,11 @@ $result_sectioning{'sections_test_no_use_nodes'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 3,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 3
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -676,24 +676,24 @@ $result_sectioning{'sections_test_no_use_nodes'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 'A',
       'section_childs' => [
         {
           'cmdname' => 'appendixsec',
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 'A.1',
           'section_up' => {},
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => 'A.1'
           }
         }
       ],
       'section_prev' => {},
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 'A'
       },
       'toplevel_prev' => {},
       'toplevel_up' => {}
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 b776053727..800c550635 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
@@ -85,10 +85,10 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -125,10 +125,10 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -165,10 +165,10 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -205,10 +205,10 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'number' => '1.1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 4
+        'level' => 4,
+        'number' => '1.1.1.1'
       }
     },
     {
@@ -285,10 +285,10 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -325,10 +325,10 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
         'line_nr' => 15,
         'macro' => ''
       },
-      'number' => 3,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 3
       }
     },
     {
@@ -404,10 +404,10 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'number' => 'A',
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 'A'
       }
     },
     {
@@ -437,10 +437,10 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
         'line_nr' => 21,
         'macro' => ''
       },
-      'number' => 'A.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 'A.1'
       }
     }
   ],
@@ -563,49 +563,49 @@ 
$result_sectioning{'sections_test_no_use_nodes_use_node_directions'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
                   'extra' => {
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_childs' => [
                     {
                       'cmdname' => 'subsubsection',
                       'extra' => {
                         'spaces_before_argument' => ' '
                       },
-                      'number' => '1.1.1.1',
                       'section_up' => {},
                       'structure' => {
-                        'level' => 4
+                        'level' => 4,
+                        'number' => '1.1.1.1'
                       }
                     }
                   ],
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -625,10 +625,10 @@ 
$result_sectioning{'sections_test_no_use_nodes_use_node_directions'} = {
             'associated_part' => {},
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -642,11 +642,11 @@ 
$result_sectioning{'sections_test_no_use_nodes_use_node_directions'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 3,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 3
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -676,24 +676,24 @@ 
$result_sectioning{'sections_test_no_use_nodes_use_node_directions'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 'A',
       'section_childs' => [
         {
           'cmdname' => 'appendixsec',
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 'A.1',
           'section_up' => {},
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => 'A.1'
           }
         }
       ],
       'section_prev' => {},
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 'A'
       },
       'toplevel_prev' => {},
       'toplevel_up' => {}
diff --git a/tp/t/results/sectioning/semi_auto.pl 
b/tp/t/results/sectioning/semi_auto.pl
index 989adf46e8..1b94d5d23c 100644
--- a/tp/t/results/sectioning/semi_auto.pl
+++ b/tp/t/results/sectioning/semi_auto.pl
@@ -456,10 +456,10 @@ $result_trees{'semi_auto'} = {
         'line_nr' => 10,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -537,10 +537,10 @@ $result_trees{'semi_auto'} = {
         'line_nr' => 17,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -653,10 +653,10 @@ $result_trees{'semi_auto'} = {
         'line_nr' => 20,
         'macro' => ''
       },
-      'number' => '1.2',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.2'
       }
     }
   ],
@@ -820,7 +820,6 @@ $result_sectioning{'semi_auto'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
@@ -834,10 +833,10 @@ $result_sectioning{'semi_auto'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             },
             {
@@ -852,17 +851,18 @@ $result_sectioning{'semi_auto'} = {
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.2',
               'section_prev' => {},
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.2'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -909,9 +909,9 @@ $result_nodes{'semi_auto'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'Chap1',
@@ -925,9 +925,9 @@ $result_nodes{'semi_auto'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => '1.1',
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => '1.1'
           }
         },
         'normalized' => 'Sec-in-chapter',
@@ -941,9 +941,9 @@ $result_nodes{'semi_auto'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => '1.2',
             'structure' => {
-              'level' => 2
+              'level' => 2,
+              'number' => '1.2'
             }
           },
           'normalized' => 'Section-non-auto',
diff --git a/tp/t/results/sectioning/shortcontents.pl 
b/tp/t/results/sectioning/shortcontents.pl
index a6f8b13f90..463586dcac 100644
--- a/tp/t/results/sectioning/shortcontents.pl
+++ b/tp/t/results/sectioning/shortcontents.pl
@@ -85,10 +85,10 @@ $result_trees{'shortcontents'} = {
         'line_nr' => 3,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -125,10 +125,10 @@ $result_trees{'shortcontents'} = {
         'line_nr' => 5,
         'macro' => ''
       },
-      'number' => '1.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => '1.1'
       }
     },
     {
@@ -165,10 +165,10 @@ $result_trees{'shortcontents'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'number' => '1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 3
+        'level' => 3,
+        'number' => '1.1.1'
       }
     },
     {
@@ -205,10 +205,10 @@ $result_trees{'shortcontents'} = {
         'line_nr' => 9,
         'macro' => ''
       },
-      'number' => '1.1.1.1',
       'parent' => {},
       'structure' => {
-        'level' => 4
+        'level' => 4,
+        'number' => '1.1.1.1'
       }
     },
     {
@@ -285,10 +285,10 @@ $result_trees{'shortcontents'} = {
         'line_nr' => 13,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     },
     {
@@ -325,10 +325,10 @@ $result_trees{'shortcontents'} = {
         'line_nr' => 15,
         'macro' => ''
       },
-      'number' => 3,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 3
       }
     },
     {
@@ -404,10 +404,10 @@ $result_trees{'shortcontents'} = {
         'line_nr' => 19,
         'macro' => ''
       },
-      'number' => 'A',
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 'A'
       }
     },
     {
@@ -461,10 +461,10 @@ $result_trees{'shortcontents'} = {
         'line_nr' => 21,
         'macro' => ''
       },
-      'number' => 'A.1',
       'parent' => {},
       'structure' => {
-        'level' => 2
+        'level' => 2,
+        'number' => 'A.1'
       }
     }
   ],
@@ -593,49 +593,49 @@ $result_sectioning{'shortcontents'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
                   'extra' => {
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '1.1.1',
                   'section_childs' => [
                     {
                       'cmdname' => 'subsubsection',
                       'extra' => {
                         'spaces_before_argument' => ' '
                       },
-                      'number' => '1.1.1.1',
                       'section_up' => {},
                       'structure' => {
-                        'level' => 4
+                        'level' => 4,
+                        'number' => '1.1.1.1'
                       }
                     }
                   ],
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '1.1.1'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -655,10 +655,10 @@ $result_sectioning{'shortcontents'} = {
             'associated_part' => {},
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -672,11 +672,11 @@ $result_sectioning{'shortcontents'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 3,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 3
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -706,24 +706,24 @@ $result_sectioning{'shortcontents'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 'A',
       'section_childs' => [
         {
           'cmdname' => 'appendixsec',
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 'A.1',
           'section_up' => {},
           'structure' => {
-            'level' => 2
+            'level' => 2,
+            'number' => 'A.1'
           }
         }
       ],
       'section_prev' => {},
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 'A'
       },
       'toplevel_prev' => {},
       'toplevel_up' => {}
diff --git a/tp/t/results/sectioning/top_chapter_sections.pl 
b/tp/t/results/sectioning/top_chapter_sections.pl
index 4518c71152..45141332f5 100644
--- a/tp/t/results/sectioning/top_chapter_sections.pl
+++ b/tp/t/results/sectioning/top_chapter_sections.pl
@@ -147,10 +147,10 @@ $result_trees{'top_chapter_sections'} = [
           'line_nr' => 5,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -199,10 +199,10 @@ $result_trees{'top_chapter_sections'} = [
           'line_nr' => 7,
           'macro' => ''
         },
-        'number' => '1.1',
         'parent' => {},
         'structure' => {
-          'level' => 2
+          'level' => 2,
+          'number' => '1.1'
         }
       }
     ],
@@ -251,10 +251,10 @@ $result_trees{'top_chapter_sections'} = [
           'line_nr' => 9,
           'macro' => ''
         },
-        'number' => 2,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 2
         }
       }
     ],
@@ -303,10 +303,10 @@ $result_trees{'top_chapter_sections'} = [
           'line_nr' => 11,
           'macro' => ''
         },
-        'number' => '2.1',
         'parent' => {},
         'structure' => {
-          'level' => 2
+          'level' => 2,
+          'number' => '2.1'
         }
       }
     ],
@@ -355,10 +355,10 @@ $result_trees{'top_chapter_sections'} = [
           'line_nr' => 13,
           'macro' => ''
         },
-        'number' => '2.1.1',
         'parent' => {},
         'structure' => {
-          'level' => 3
+          'level' => 3,
+          'number' => '2.1.1'
         }
       }
     ],
@@ -407,10 +407,10 @@ $result_trees{'top_chapter_sections'} = [
           'line_nr' => 15,
           'macro' => ''
         },
-        'number' => '2.1.2',
         'parent' => {},
         'structure' => {
-          'level' => 3
+          'level' => 3,
+          'number' => '2.1.2'
         }
       }
     ],
@@ -452,10 +452,10 @@ $result_trees{'top_chapter_sections'} = [
           'line_nr' => 17,
           'macro' => ''
         },
-        'number' => 3,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 3
         }
       }
     ],
@@ -605,24 +605,24 @@ $result_sectioning{'top_chapter_sections'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_childs' => [
             {
               'cmdname' => 'section',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '1.1',
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '1.1'
               }
             }
           ],
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -632,24 +632,22 @@ $result_sectioning{'top_chapter_sections'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_childs' => [
             {
               'cmdname' => 'section',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => '2.1',
               'section_childs' => [
                 {
                   'cmdname' => 'subsection',
                   'extra' => {
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '2.1.1',
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '2.1.1'
                   }
                 },
                 {
@@ -657,24 +655,26 @@ $result_sectioning{'top_chapter_sections'} = {
                   'extra' => {
                     'spaces_before_argument' => ' '
                   },
-                  'number' => '2.1.2',
                   'section_prev' => {},
                   'section_up' => {},
                   'structure' => {
-                    'level' => 3
+                    'level' => 3,
+                    'number' => '2.1.2'
                   }
                 }
               ],
               'section_up' => {},
               'structure' => {
-                'level' => 2
+                'level' => 2,
+                'number' => '2.1'
               }
             }
           ],
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -684,11 +684,11 @@ $result_sectioning{'top_chapter_sections'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 3,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 3
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -772,9 +772,9 @@ $result_elements{'top_chapter_sections'} = [
                     'extra' => {
                       'spaces_before_argument' => ' '
                     },
-                    'number' => 1,
                     'structure' => {
-                      'level' => 1
+                      'level' => 1,
+                      'number' => 1
                     }
                   },
                   'unit_command' => {}
@@ -790,9 +790,9 @@ $result_elements{'top_chapter_sections'} = [
                           'extra' => {
                             'spaces_before_argument' => ' '
                           },
-                          'number' => 2,
                           'structure' => {
-                            'level' => 1
+                            'level' => 1,
+                            'number' => 2
                           }
                         },
                         'unit_command' => {}
@@ -806,9 +806,9 @@ $result_elements{'top_chapter_sections'} = [
                                 'extra' => {
                                   'spaces_before_argument' => ' '
                                 },
-                                'number' => '1.1',
                                 'structure' => {
-                                  'level' => 2
+                                  'level' => 2,
+                                  'number' => '1.1'
                                 }
                               },
                               'unit_command' => {}
@@ -833,9 +833,9 @@ $result_elements{'top_chapter_sections'} = [
                                 'extra' => {
                                   'spaces_before_argument' => ' '
                                 },
-                                'number' => 3,
                                 'structure' => {
-                                  'level' => 1
+                                  'level' => 1,
+                                  'number' => 3
                                 }
                               },
                               'unit_command' => {}
@@ -849,9 +849,9 @@ $result_elements{'top_chapter_sections'} = [
                                       'extra' => {
                                         'spaces_before_argument' => ' '
                                       },
-                                      'number' => '2.1.2',
                                       'structure' => {
-                                        'level' => 3
+                                        'level' => 3,
+                                        'number' => '2.1.2'
                                       }
                                     },
                                     'unit_command' => {}
@@ -865,9 +865,9 @@ $result_elements{'top_chapter_sections'} = [
                                             'extra' => {
                                               'spaces_before_argument' => ' '
                                             },
-                                            'number' => '2.1.1',
                                             'structure' => {
-                                              'level' => 3
+                                              'level' => 3,
+                                              'number' => '2.1.1'
                                             }
                                           },
                                           'unit_command' => {}
@@ -881,9 +881,9 @@ $result_elements{'top_chapter_sections'} = [
                                                   'extra' => {
                                                     'spaces_before_argument' 
=> ' '
                                                   },
-                                                  'number' => '2.1',
                                                   'structure' => {
-                                                    'level' => 2
+                                                    'level' => 2,
+                                                    'number' => '2.1'
                                                   }
                                                 },
                                                 'unit_command' => {}
diff --git a/tp/t/results/sectioning/top_part_chapter.pl 
b/tp/t/results/sectioning/top_part_chapter.pl
index 9f54ad786e..8804685ab7 100644
--- a/tp/t/results/sectioning/top_part_chapter.pl
+++ b/tp/t/results/sectioning/top_part_chapter.pl
@@ -129,10 +129,10 @@ $result_trees{'top_part_chapter'} = [
           'line_nr' => 5,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -204,10 +204,10 @@ $result_sectioning{'top_part_chapter'} = {
             'associated_part' => {},
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -275,9 +275,9 @@ $result_elements{'top_part_chapter'} = [
                 },
                 'spaces_before_argument' => ' '
               },
-              'number' => 1,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 1
               }
             },
             'unit_command' => {}
diff --git a/tp/t/results/sectioning/top_without_node_nodes.pl 
b/tp/t/results/sectioning/top_without_node_nodes.pl
index ac0a7475bf..4e5c4e62e5 100644
--- a/tp/t/results/sectioning/top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/top_without_node_nodes.pl
@@ -184,10 +184,10 @@ $result_trees{'top_without_node_nodes'} = [
           'line_nr' => 5,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -269,10 +269,10 @@ $result_sectioning{'top_without_node_nodes'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -301,9 +301,9 @@ $result_nodes{'top_without_node_nodes'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     'normalized' => 'second',
@@ -349,9 +349,9 @@ $result_elements{'top_without_node_nodes'} = [
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'unit_command' => {}
diff --git a/tp/t/results/sectioning/top_without_node_sections.pl 
b/tp/t/results/sectioning/top_without_node_sections.pl
index c0bf8e141e..fc39c03552 100644
--- a/tp/t/results/sectioning/top_without_node_sections.pl
+++ b/tp/t/results/sectioning/top_without_node_sections.pl
@@ -194,10 +194,10 @@ $result_trees{'top_without_node_sections'} = [
           'line_nr' => 5,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -284,10 +284,10 @@ $result_sectioning{'top_without_node_sections'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -316,9 +316,9 @@ $result_nodes{'top_without_node_sections'} = {
       'extra' => {
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     'normalized' => 'second',
@@ -379,9 +379,9 @@ $result_elements{'top_without_node_sections'} = [
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => 1,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 1
               }
             },
             'unit_command' => {}
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 1e3db2672c..c8fba3cd1f 100644
--- a/tp/t/results/sectioning/two_nodes_at_the_end.pl
+++ b/tp/t/results/sectioning/two_nodes_at_the_end.pl
@@ -464,10 +464,10 @@ $result_trees{'two_nodes_at_the_end'} = [
           'line_nr' => 11,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       {
@@ -738,10 +738,10 @@ $result_sectioning{'two_nodes_at_the_end'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -785,9 +785,9 @@ $result_nodes{'two_nodes_at_the_end'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter-1',
@@ -959,9 +959,9 @@ $result_elements{'two_nodes_at_the_end'} = [
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => 1,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 1
               }
             },
             'unit_command' => {}
diff --git a/tp/t/results/sectioning/two_nodes_between_chapters.pl 
b/tp/t/results/sectioning/two_nodes_between_chapters.pl
index 8b797859ab..9ede5c3bfa 100644
--- a/tp/t/results/sectioning/two_nodes_between_chapters.pl
+++ b/tp/t/results/sectioning/two_nodes_between_chapters.pl
@@ -464,10 +464,10 @@ $result_trees{'two_nodes_between_chapters'} = [
           'line_nr' => 11,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       {
@@ -599,10 +599,10 @@ $result_trees{'two_nodes_between_chapters'} = [
           'line_nr' => 16,
           'macro' => ''
         },
-        'number' => 2,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 2
         }
       }
     ],
@@ -770,10 +770,10 @@ $result_sectioning{'two_nodes_between_chapters'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -790,11 +790,11 @@ $result_sectioning{'two_nodes_between_chapters'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -842,9 +842,9 @@ $result_nodes{'two_nodes_between_chapters'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter-1',
@@ -865,9 +865,9 @@ $result_nodes{'two_nodes_between_chapters'} = {
             'extra' => {
               'spaces_before_argument' => ' '
             },
-            'number' => 2,
             'structure' => {
-              'level' => 1
+              'level' => 1,
+              'number' => 2
             }
           },
           'normalized' => 'chapter-2',
@@ -1045,9 +1045,9 @@ $result_elements{'two_nodes_between_chapters'} = [
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => 1,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 1
               }
             },
             'unit_command' => {}
@@ -1064,9 +1064,9 @@ $result_elements{'two_nodes_between_chapters'} = [
                     'extra' => {
                       'spaces_before_argument' => ' '
                     },
-                    'number' => 2,
                     'structure' => {
-                      'level' => 1
+                      'level' => 1,
+                      'number' => 2
                     }
                   },
                   'unit_command' => {}
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 e6dbef93ad..6b4aa7c349 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
@@ -327,10 +327,10 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
           'line_nr' => 10,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -470,11 +470,11 @@ $result_sectioning{'unnumbered_top_without_node_nodes'} = 
{
         },
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_prev' => {},
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       },
       'toplevel_prev' => {},
       'toplevel_up' => {}
@@ -591,9 +591,9 @@ $result_elements{'unnumbered_top_without_node_nodes'} = [
               'extra' => {
                 'spaces_before_argument' => ' '
               },
-              'number' => 1,
               'structure' => {
-                'level' => 1
+                'level' => 1,
+                'number' => 1
               }
             },
             'unit_command' => {}
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 bb913f3662..0d4a260cd9 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
@@ -339,10 +339,10 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
           'line_nr' => 10,
           'macro' => ''
         },
-        'number' => 1,
         'parent' => {},
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       }
     ],
@@ -485,11 +485,11 @@ 
$result_sectioning{'unnumbered_top_without_node_sections'} = {
         },
         'spaces_before_argument' => ' '
       },
-      'number' => 1,
       'section_prev' => {},
       'section_up' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       },
       'toplevel_prev' => {},
       'toplevel_up' => {}
@@ -621,9 +621,9 @@ $result_elements{'unnumbered_top_without_node_sections'} = [
                     'extra' => {
                       'spaces_before_argument' => ' '
                     },
-                    'number' => 1,
                     'structure' => {
-                      'level' => 1
+                      'level' => 1,
+                      'number' => 1
                     }
                   },
                   'unit_command' => {}
diff --git a/tp/t/results/value/value_in_node.pl 
b/tp/t/results/value/value_in_node.pl
index 498a4e1c84..dca7880e26 100644
--- a/tp/t/results/value/value_in_node.pl
+++ b/tp/t/results/value/value_in_node.pl
@@ -584,10 +584,10 @@ $result_trees{'value_in_node'} = {
         'line_nr' => 11,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -903,10 +903,10 @@ $result_sectioning{'value_in_node'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -950,9 +950,9 @@ $result_nodes{'value_in_node'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'Node-1',
diff --git a/tp/t/results/value/value_node_directions.pl 
b/tp/t/results/value/value_node_directions.pl
index e0061ca11f..45b8299fb2 100644
--- a/tp/t/results/value/value_node_directions.pl
+++ b/tp/t/results/value/value_node_directions.pl
@@ -340,10 +340,10 @@ $result_trees{'value_node_directions'} = {
         'line_nr' => 8,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     },
     {
@@ -466,10 +466,10 @@ $result_trees{'value_node_directions'} = {
         'line_nr' => 11,
         'macro' => ''
       },
-      'number' => 2,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 2
       }
     }
   ],
@@ -595,10 +595,10 @@ $result_sectioning{'value_node_directions'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -615,11 +615,11 @@ $result_sectioning{'value_node_directions'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'section_prev' => {},
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -667,9 +667,9 @@ $result_nodes{'value_node_directions'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'bar',
@@ -683,9 +683,9 @@ $result_nodes{'value_node_directions'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 2,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 2
           }
         },
         'normalized' => 'BarFoo',
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl 
b/tp/t/results/xml_tests/commands_and_spaces.pl
index 32b10b88b5..de2b615c22 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -805,8 +805,10 @@ $result_trees{'commands_and_spaces'} = {
             'line_nr' => 30,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         },
         {
           'parent' => {},
@@ -2294,7 +2296,9 @@ $result_floats{'commands_and_spaces'} = {
           'normalized' => 'ff'
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ]
 };
diff --git a/tp/t/results/xml_tests/comments_end_lines.pl 
b/tp/t/results/xml_tests/comments_end_lines.pl
index a7e336ad38..40b4ffcf3e 100644
--- a/tp/t/results/xml_tests/comments_end_lines.pl
+++ b/tp/t/results/xml_tests/comments_end_lines.pl
@@ -873,8 +873,10 @@ $result_trees{'comments_end_lines'} = {
             'line_nr' => 28,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         },
         {
           'parent' => {},
@@ -1285,7 +1287,9 @@ $result_floats{'comments_end_lines'} = {
           'normalized' => 'f'
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ]
 };
diff --git a/tp/t/results/xml_tests/comments_on_block_command_lines.pl 
b/tp/t/results/xml_tests/comments_on_block_command_lines.pl
index 923bb747ad..97d2fc8d88 100644
--- a/tp/t/results/xml_tests/comments_on_block_command_lines.pl
+++ b/tp/t/results/xml_tests/comments_on_block_command_lines.pl
@@ -2128,8 +2128,10 @@ $result_trees{'comments_on_block_command_lines'} = {
             'line_nr' => 69,
             'macro' => ''
           },
-          'number' => 1,
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => 1
+          }
         },
         {
           'parent' => {},
@@ -2768,7 +2770,9 @@ $result_floats{'comments_on_block_command_lines'} = {
           'normalized' => 'f'
         }
       },
-      'number' => 1
+      'structure' => {
+        'float_number' => 1
+      }
     }
   ]
 };
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 d037a2cba5..4361e16b66 100644
--- a/tp/t/results/xml_tests/image_inline_or_not.pl
+++ b/tp/t/results/xml_tests/image_inline_or_not.pl
@@ -1603,8 +1603,10 @@ $result_trees{'image_inline_or_not'} = {
             'line_nr' => 55,
             'macro' => ''
           },
-          'number' => '1.1',
-          'parent' => {}
+          'parent' => {},
+          'structure' => {
+            'float_number' => '1.1'
+          }
         }
       ],
       'extra' => {
@@ -1615,10 +1617,10 @@ $result_trees{'image_inline_or_not'} = {
         'line_nr' => 42,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -1985,10 +1987,10 @@ $result_sectioning{'image_inline_or_not'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -2032,9 +2034,9 @@ $result_nodes{'image_inline_or_not'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'node_005fimage',
@@ -2121,9 +2123,9 @@ $result_floats{'image_inline_or_not'} = {
           'extra' => {
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           }
         },
         'normalized' => 'g',
@@ -2137,7 +2139,9 @@ $result_floats{'image_inline_or_not'} = {
           'normalized' => 'F'
         }
       },
-      'number' => '1.1'
+      'structure' => {
+        'float_number' => '1.1'
+      }
     }
   ]
 };
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 532b8a6c9d..f2bab7e910 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table.pl
@@ -2522,10 +2522,10 @@ $result_trees{'inter_item_commands_in_table'} = {
         'line_nr' => 7,
         'macro' => ''
       },
-      'number' => 1,
       'parent' => {},
       'structure' => {
-        'level' => 1
+        'level' => 1,
+        'number' => 1
       }
     }
   ],
@@ -3057,10 +3057,10 @@ $result_sectioning{'inter_item_commands_in_table'} = {
             },
             'spaces_before_argument' => ' '
           },
-          'number' => 1,
           'section_up' => {},
           'structure' => {
-            'level' => 1
+            'level' => 1,
+            'number' => 1
           },
           'toplevel_prev' => {},
           'toplevel_up' => {}
@@ -3104,9 +3104,9 @@ $result_nodes{'inter_item_commands_in_table'} = {
         'extra' => {
           'spaces_before_argument' => ' '
         },
-        'number' => 1,
         'structure' => {
-          'level' => 1
+          'level' => 1,
+          'number' => 1
         }
       },
       'normalized' => 'chapter',



reply via email to

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