texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_heading_co


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_heading_command): use a specific class for the opening section div, like <section>-level-extent. Always associate the class corresponding to a sectioning @-command or a @node to the header if it is output, else to the anchor with the id. Use node-id for the anchor class if there is a heading.
Date: Tue, 11 Jan 2022 20:06:45 -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 1209410954 * tp/Texinfo/Convert/HTML.pm (_convert_heading_command): 
use a specific class for the opening section div, like <section>-level-extent.  
Always associate the class corresponding to a sectioning @-command or a @node 
to the header if it is output, else to the anchor with the id.  Use node-id for 
the anchor class if there is a heading.
1209410954 is described below

commit 1209410954206cd4f7492122f9143bf551e8a3f1
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Jan 12 02:06:31 2022 +0100

    * tp/Texinfo/Convert/HTML.pm (_convert_heading_command): use
    a specific class for the opening section div, like
    <section>-level-extent.  Always associate the class corresponding to a
    sectioning @-command or a @node to the header if it is output, else to
    the anchor with the id.  Use node-id for the anchor class if there is
    a heading.
---
 ChangeLog                                          |  9 +++
 tp/Texinfo/Convert/HTML.pm                         | 81 +++++++++++-----------
 .../results/converters_tests/at_commands_in_raw.pl |  2 +-
 tp/t/results/converters_tests/complex_nestings.pl  |  2 +-
 .../results/converters_tests/footnote_no_number.pl |  2 +-
 .../footnote_no_number_separate.pl                 |  2 +-
 tp/t/results/converters_tests/image_formatting.pl  |  2 +-
 .../index_entry_in_preformatted.pl                 |  2 +-
 .../printindex_merged_indices_code_style.pl        |  2 +-
 tp/t/results/converters_tests/ref_in_sectioning.pl | 30 ++++----
 tp/t/results/converters_tests/refs_formatting.pl   |  2 +-
 .../some_at_commands_in_ref_nodes.pl               |  4 +-
 .../converters_tests/spaces_in_empty_node_names.pl |  4 +-
 .../converters_tests/spaces_in_node_names.pl       | 16 ++---
 .../converters_tests/test_deftypefnnewline.pl      |  4 +-
 .../converters_tests/things_before_setfilename.pl  |  2 +-
 tp/t/results/converters_tests/top_in_ref.pl        |  8 +--
 .../converters_tests/top_in_ref_keep_top.pl        |  8 +--
 .../coverage/punctuation_in_line_commands.pl       |  2 +-
 tp/t/results/coverage_braces/footnote_no_node.pl   |  2 +-
 .../coverage_braces/inforef_too_much_args.pl       |  2 +-
 tp/t/results/coverage_braces/test_image.pl         |  4 +-
 .../coverage_braces/two_footnotes_in_nodes.pl      |  8 +--
 .../two_footnotes_in_nodes_separate.pl             |  8 +--
 tp/t/results/coverage_braces/verb_in_xref.pl       |  2 +-
 .../def/all_commands_delimiters_printindex.pl      |  2 +-
 tp/t/results/def/all_commands_printindex.pl        |  2 +-
 tp/t/results/def/space_in_def_for_index.pl         |  2 +-
 tp/t/results/float/anchor_in_caption.pl            |  2 +-
 tp/t/results/float/cindex_in_caption.pl            |  2 +-
 .../results/float/comment_space_comand_in_float.pl |  2 +-
 tp/t/results/float/complex_float.pl                |  4 +-
 tp/t/results/float/float_copying.pl                |  4 +-
 tp/t/results/float/footnote_in_caption.pl          |  2 +-
 .../results/float/footnote_in_caption_and_error.pl |  2 +-
 .../float/numbering_captions_listoffloats.pl       | 18 ++---
 tp/t/results/formats_encodings/accent.pl           |  2 +-
 .../formats_encodings/accent_enable_encoding.pl    |  2 +-
 tp/t/results/formats_encodings/accentenc.pl        |  2 +-
 .../formats_encodings/accentenc_enable_encoding.pl |  2 +-
 .../formats_encodings/at_commands_in_refs.pl       | 56 +++++++--------
 .../----_0021---_002e--_002e-_003f-_0040.html      |  2 +-
 .../res_html/-_0040-_007b_007d-_002e-.html         |  2 +-
 .../res_html/-_007b-_007d.html                     |  2 +-
 .../res_html/8_002e27in.html                       |  2 +-
 .../AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html       |  2 +-
 .../res_html/AAA-AAA-BBB.html                      |  2 +-
 .../res_html/CCC-CCC-DDD.html                      |  2 +-
 ...eX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html |  2 +-
 .../res_html/_0040-_007b-_007d-_005c-_0023.html    |  2 +-
 ...027-_002d_002d_002d-_002d_002d-_0060-_0027.html |  2 +-
 .../_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html |  2 +-
 .../_00ab-_00bb-_00ab-_00bb-_2039-_203a.html       |  2 +-
 .../_201c-_201d-_2018-_2019-_201e-_201a.html       |  2 +-
 .../res_html/_21d2-_00b0-a-b--aa.html              |  2 +-
 ...ror_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html |  2 +-
 .../res_html/_2265-_2264-_2192.html                |  2 +-
 .../res_html/a-e-i-a-a-e-c-e-e-e-e.html            |  2 +-
 ...e-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html |  2 +-
 .../res_html/e-e-e-e-e-j-ee.html                   |  2 +-
 ...-code-option-samp-command-file-C_002dx-ESC.html |  2 +-
 .../res_html/f_002d_002dile1-f_002d_002dile.html   |  2 +-
 .../res_html/gH-3rd.html                           |  2 +-
 ..._005faaa-url-_002fman_002ecgi_002f1_002fls.html |  2 +-
 .../at_commands_in_refs_latin1/res_html/i-E-C.html |  2 +-
 .../at_commands_in_refs_latin1/res_html/index.html |  2 +-
 .../res_html/indicateurl.html                      |  2 +-
 .../res_html/sansserif-slanted.html                |  2 +-
 ...eone_0040somewher-no_005fexplain_0040there.html |  2 +-
 .../----_0021---_002e--_002e-_003f-_0040.html      |  2 +-
 .../res_html/-_0040-_007b_007d-_002e-.html         |  2 +-
 .../res_html/-_007b-_007d.html                     |  2 +-
 .../res_html/8_002e27in.html                       |  2 +-
 .../AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html       |  2 +-
 .../res_html/AAA-AAA-BBB.html                      |  2 +-
 .../res_html/CCC-CCC-DDD.html                      |  2 +-
 ...eX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html |  2 +-
 .../res_html/_0040-_007b-_007d-_005c-_0023.html    |  2 +-
 ...027-_002d_002d_002d-_002d_002d-_0060-_0027.html |  2 +-
 .../_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html |  2 +-
 .../_00ab-_00bb-_00ab-_00bb-_2039-_203a.html       |  2 +-
 .../_201c-_201d-_2018-_2019-_201e-_201a.html       |  2 +-
 .../res_html/_21d2-_00b0-a-b--aa.html              |  2 +-
 ...ror_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html |  2 +-
 .../res_html/_2265-_2264-_2192.html                |  2 +-
 .../res_html/a-e-i-a-a-e-c-e-e-e-e.html            |  2 +-
 ...e-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html |  2 +-
 .../res_html/e-e-e-e-e-j-ee.html                   |  2 +-
 ...-code-option-samp-command-file-C_002dx-ESC.html |  2 +-
 .../res_html/f_002d_002dile1-f_002d_002dile.html   |  2 +-
 .../at_commands_in_refs_utf8/res_html/gH-3rd.html  |  2 +-
 ..._005faaa-url-_002fman_002ecgi_002f1_002fls.html |  2 +-
 .../at_commands_in_refs_utf8/res_html/i-E-C.html   |  2 +-
 .../at_commands_in_refs_utf8/res_html/index.html   |  2 +-
 .../res_html/indicateurl.html                      |  2 +-
 .../res_html/sansserif-slanted.html                |  2 +-
 ...eone_0040somewher-no_005fexplain_0040there.html |  2 +-
 .../res_html/a-e-i-o-u-A-E-I-O-U.html              |  2 +-
 .../res_html/a-e-i-o-u-y-A-E-I-O-U.html            |  2 +-
 .../char_latin1_latin1_in_refs/res_html/a-e-u.html |  2 +-
 .../char_latin1_latin1_in_refs/res_html/c.html     |  2 +-
 .../char_latin1_latin1_in_refs/res_html/e.html     |  2 +-
 .../char_latin1_latin1_in_refs/res_html/index.html |  2 +-
 .../res_html/a-e-i-o-u-A-E-I-O-U.html              |  2 +-
 .../res_html/a-e-i-o-u-y-A-E-I-O-U.html            |  2 +-
 .../char_latin1_utf8_in_refs/res_html/a-e-u.html   |  2 +-
 .../char_latin1_utf8_in_refs/res_html/c.html       |  2 +-
 .../char_latin1_utf8_in_refs/res_html/e.html       |  2 +-
 .../char_latin1_utf8_in_refs/res_html/index.html   |  2 +-
 .../res_html/A-a-_002c-E-e.html                    |  2 +-
 .../char_latin2_latin2_in_refs/res_html/index.html |  2 +-
 .../japanese_shift_jis/res_html/Introduction.html  |  2 +-
 .../japanese_shift_jis/res_html/Preface.html       |  2 +-
 .../japanese_shift_jis/res_html/index.html         |  2 +-
 .../res_html/DiYiZhang_0028First-Chapter_0029.html |  2 +-
 .../sample_utf8/res_html/Index-node.html           |  2 +-
 .../res_html/Second-Chapter-AE-AE-ae-ae.html       |  2 +-
 .../sample_utf8/res_html/index.html                |  2 +-
 tp/t/results/formats_encodings/weird_accents.pl    |  2 +-
 .../weird_accents_disable_encoding.pl              |  2 +-
 .../res_html/documentlanguage_set.html             |  2 +-
 .../res_html/documentlanguage_set.html             |  2 +-
 .../float_copying/res_html/Copying-and-floats.html |  2 +-
 .../formatting/float_copying/res_html/index.html   |  2 +-
 tp/t/results/formatting/texi_bib_example.pl        |  6 +-
 tp/t/results/formatting/texi_glossary.pl           |  4 +-
 tp/t/results/heading/heading_in_copying.pl         |  2 +-
 .../character_number_leading_toc_stoc.pl           |  8 +--
 tp/t/results/html_tests/check_htmlxref.pl          |  6 +-
 .../deftypefnnewline_for_copying_after.pl          |  2 +-
 .../deftypefnnewline_for_copying_before.pl         |  2 +-
 tp/t/results/html_tests/documentdescription.pl     |  2 +-
 .../empty_lines_at_beginning_no_setfilename.pl     |  2 +-
 .../res_html/chap-f.html                           |  2 +-
 .../res_html/chap-s.html                           |  2 +-
 .../res_html/index.html                            |  2 +-
 tp/t/results/html_tests/html_in_copying.pl         |  2 +-
 .../results/html_tests/index_and_node_same_name.pl |  4 +-
 tp/t/results/html_tests/index_below.pl             |  6 +-
 .../res_html/circumflex.html                       |  6 +-
 .../redirection_same_labels/res_html/index.html    |  2 +-
 .../redirection_same_labels/res_html/umlaut.html   | 10 +--
 tp/t/results/html_tests/ref_in_preformatted.pl     |  8 +--
 tp/t/results/html_tests/shortcontents_no_top.pl    |  6 +-
 tp/t/results/html_tests/shorttitlepage.pl          |  2 +-
 tp/t/results/html_tests/simple_menu.pl             |  2 +-
 .../html_tests/test_xrefautomaticsectiontitle.pl   |  4 +-
 .../test_xrefautomaticsectiontitle_off_first.pl    |  4 +-
 .../text_before_top_and_contents_after_title.pl    |  4 +-
 ...t_before_top_and_summarycontents_after_title.pl |  4 +-
 tp/t/results/html_tests/titles.pl                  |  2 +-
 .../htmlxref/htmlxref/res_html/test_refs.html      |  4 +-
 ...25_0026_0027_0028_0029_002a_002b_002d_002e.html |  4 +-
 ...3f_005b_005c_005d_005e_005f_0060_007c_007e.html |  4 +-
 .../htmlxref/htmlxref_nodes/res_html/index.html    |  2 +-
 .../htmlxref_nodes/res_html/local-node.html        |  4 +-
 .../htmlxref_nodes/res_html/other-nodes.html       |  2 +-
 .../htmlxref_only_mono/res_html/test_refs.html     |  4 +-
 ...25_0026_0027_0028_0029_002a_002b_002d_002e.html |  4 +-
 ...3f_005b_005c_005d_005e_005f_0060_007c_007e.html |  4 +-
 .../htmlxref_only_mono_nodes/res_html/index.html   |  2 +-
 .../res_html/local-node.html                       |  4 +-
 .../res_html/other-nodes.html                      |  2 +-
 .../htmlxref_only_split/res_html/test_refs.html    |  4 +-
 ...25_0026_0027_0028_0029_002a_002b_002d_002e.html |  4 +-
 ...3f_005b_005c_005d_005e_005f_0060_007c_007e.html |  4 +-
 .../htmlxref_only_split_nodes/res_html/index.html  |  2 +-
 .../res_html/local-node.html                       |  4 +-
 .../res_html/other-nodes.html                      |  2 +-
 tp/t/results/indices/def_syn_indices.pl            |  4 +-
 ...default_cp_index_and_one_letter_syncodeindex.pl |  2 +-
 tp/t/results/indices/double_index_entry.pl         |  8 +--
 tp/t/results/indices/double_seeentry_seealso.pl    |  4 +-
 tp/t/results/indices/double_syncodeindex.pl        |  2 +-
 tp/t/results/indices/empty_cindex_entry.pl         |  2 +-
 tp/t/results/indices/empty_index_entry.pl          |  2 +-
 tp/t/results/indices/empty_string_index_entry.pl   |  2 +-
 .../encoding_index_ascii/res_html/index.html       |  2 +-
 .../res_html/index.html                            |  2 +-
 .../encoding_index_latin1/res_html/index.html      |  2 +-
 .../res_html/index.html                            |  2 +-
 .../encoding_index_utf8/res_html/index.html        |  2 +-
 .../res_html/index.html                            |  2 +-
 tp/t/results/indices/explicit_sort_key.pl          |  2 +-
 tp/t/results/indices/ftable_vtable.pl              |  2 +-
 tp/t/results/indices/image_lines_count.pl          |  2 +-
 tp/t/results/indices/image_text_lines_count.pl     |  2 +-
 tp/t/results/indices/index_entries_locations.pl    |  2 +-
 .../indices/index_entry_before_first_node.pl       |  2 +-
 tp/t/results/indices/index_entry_before_node.pl    | 12 ++--
 tp/t/results/indices/index_entry_in_footnote.pl    |  2 +-
 .../index_entry_in_footnote_different_node_end.pl  |  8 +--
 .../indices/index_entry_in_footnote_separate.pl    |  8 +--
 .../indices/printindex_index_entry_in_copying.pl   |  4 +-
 ...rintindex_index_entry_in_copying_in_footnote.pl |  4 +-
 ...ndex_index_entry_in_copying_no_insertcopying.pl |  4 +-
 .../indices/printindex_with_space_before.pl        |  2 +-
 .../indices/same_index_entry_merged_indices.pl     |  2 +-
 tp/t/results/indices/seealso_duplicate.pl          |  2 +-
 tp/t/results/indices/seeentry.pl                   |  4 +-
 tp/t/results/indices/subentries.pl                 |  4 +-
 tp/t/results/indices/subentry_and_sortas.pl        |  8 +--
 tp/t/results/indices/syncode_index_print_both.pl   |  4 +-
 tp/t/results/indices/syncodeindex_to_plain.pl      |  2 +-
 tp/t/results/indices/transparent_sort_chars.pl     |  2 +-
 tp/t/results/indices/w_lines_count.pl              |  2 +-
 .../itemize/inter_item_commands_in_enumerate.pl    |  4 +-
 .../itemize/inter_item_commands_in_itemize.pl      |  4 +-
 tp/t/results/languages/appendix_translated.pl      |  4 +-
 tp/t/results/languages/command_translated.pl       |  2 +-
 tp/t/results/languages/multiple.pl                 |  2 +-
 tp/t/results/languages/multiple_in_preamble.pl     |  4 +-
 .../languages/multiple_in_preamble_before_node.pl  |  4 +-
 .../res_html/multiple_lang_chapters.html           | 12 ++--
 .../res_html/multiple_lang_chapters.html           | 12 ++--
 tp/t/results/languages/unknown_language.pl         |  2 +-
 tp/t/results/languages/unknown_region.pl           |  2 +-
 .../layout/navigation/res_html/navigation.html     |  8 +--
 .../navigation_chapter/res_html/chapter.html       |  6 +-
 .../layout/navigation_chapter/res_html/index.html  |  2 +-
 .../res_html/chapter.html                          |  6 +-
 .../res_html/index.html                            |  2 +-
 .../res_html/chapter.html                          |  6 +-
 .../res_html/index.html                            |  2 +-
 .../res_html/chapter.html                          |  6 +-
 .../res_html/index.html                            |  2 +-
 .../navigation_no_header/res_html/navigation.html  |  8 +--
 .../res_html/navigation.html                       |  8 +--
 .../layout/navigation_node/res_html/chapter.html   |  2 +-
 .../layout/navigation_node/res_html/index.html     |  2 +-
 .../layout/navigation_node/res_html/section.html   |  2 +-
 .../navigation_node/res_html/subsection.html       |  2 +-
 .../res_html/chapter.html                          |  2 +-
 .../navigation_node_no_header/res_html/index.html  |  2 +-
 .../res_html/section.html                          |  2 +-
 .../res_html/subsection.html                       |  2 +-
 .../res_html/chapter.html                          |  2 +-
 .../res_html/index.html                            |  2 +-
 .../res_html/section.html                          |  2 +-
 .../res_html/subsection.html                       |  2 +-
 .../navigation_node_vertical/res_html/chapter.html |  2 +-
 .../navigation_node_vertical/res_html/index.html   |  2 +-
 .../navigation_node_vertical/res_html/section.html |  2 +-
 .../res_html/subsection.html                       |  2 +-
 .../navigation_section/res_html/chapter.html       |  2 +-
 .../layout/navigation_section/res_html/index.html  |  2 +-
 .../navigation_section/res_html/section.html       |  4 +-
 .../res_html/chapter.html                          |  2 +-
 .../res_html/index.html                            |  2 +-
 .../res_html/section.html                          |  4 +-
 .../res_html/chapter.html                          |  2 +-
 .../res_html/index.html                            |  2 +-
 .../res_html/section.html                          |  4 +-
 .../res_html/chapter.html                          |  2 +-
 .../res_html/index.html                            |  2 +-
 .../res_html/section.html                          |  4 +-
 .../navigation_vertical/res_html/navigation.html   |  8 +--
 .../no_monolithic/res_html/no_monolithic.html      |  4 +-
 .../menu/block_commands_in_menu_description.pl     |  2 +-
 tp/t/results/menu/comment_on_menu_line.pl          |  6 +-
 tp/t/results/menu/detailmenu_on_subnodes.pl        | 12 ++--
 tp/t/results/menu/detailmenu_unknown_node.pl       |  2 +-
 tp/t/results/menu/entry_after_detailmenu.pl        | 12 ++--
 tp/t/results/menu/example_in_menu_description.pl   |  2 +-
 tp/t/results/menu/formats_in_menu.pl               |  2 +-
 tp/t/results/menu/inlineraw_in_menu_description.pl |  2 +-
 tp/t/results/menu/invalid_info_menu_entry.pl       |  2 +-
 tp/t/results/menu/menu_in_example.pl               |  2 +-
 tp/t/results/menu/menu_pointing_to_anchor.pl       |  2 +-
 tp/t/results/menu/menu_title_before_entries.pl     |  8 +--
 tp/t/results/menu/no_colon_in_menu.pl              |  2 +-
 tp/t/results/menu/reference_to_external_manual.pl  |  2 +-
 tp/t/results/menu/sc_in_menu.pl                    |  8 +--
 tp/t/results/menu/submenu_in_example.pl            |  2 +-
 tp/t/results/menu/verb_in_menu_description.pl      |  2 +-
 .../codequoteundirected_codequotebacktick.pl       |  2 +-
 .../misc_commands/comment_space_command_on_line.pl |  2 +-
 .../no_empty_line_between_headings.pl              |  6 +-
 tp/t/results/misc_commands/ref_in_center.pl        |  2 +-
 tp/t/results/misc_commands/test_allowcodebreaks.pl |  2 +-
 tp/t/results/morecoverage/formatting_fr.pl         | 28 ++++----
 tp/t/results/morecoverage/texi_formatting.pl       | 28 ++++----
 .../index_no_node/res_html/Chapter-2.html          |  2 +-
 .../index_no_node/res_html/Chapter.html            |  2 +-
 .../moreindices/index_no_node/res_html/index.html  |  4 +-
 .../index_no_node/res_html/unnumbered.html         |  2 +-
 .../moreindices/index_split/res_html/first.html    | 12 ++--
 .../moreindices/index_split/res_html/index.html    |  2 +-
 .../index_split/res_html/second-chapter.html       |  2 +-
 .../index_split_nodes/res_html/first.html          |  2 +-
 .../index_split_nodes/res_html/index.html          |  2 +-
 .../res_html/node-2-in-section-3.html              |  4 +-
 .../res_html/node-3-in-section-3.html              |  4 +-
 .../res_html/node-in-section-3.html                |  4 +-
 .../index_split_nodes/res_html/second-chapter.html |  2 +-
 .../index_split_nodes/res_html/section-1.html      |  2 +-
 .../index_split_nodes/res_html/section-2.html      |  2 +-
 .../index_split_nodes/res_html/section-3.html      |  2 +-
 .../index_split_nodes/res_html/subsection-1.html   |  2 +-
 .../index_split_nodes/res_html/subsection-2.html   |  2 +-
 .../res_html/first-before-top.html                 | 24 +++----
 .../nodes_before_top/res_html/index.html           |  4 +-
 .../res_html/nodes_before_top_and_sections.html    |  4 +-
 .../nodes_before_top_nodes/res_html/a-node.html    |  4 +-
 .../nodes_before_top_nodes/res_html/another.html   |  4 +-
 .../res_html/first-before-top.html                 |  4 +-
 .../nodes_before_top_nodes/res_html/first.html     |  4 +-
 .../nodes_before_top_nodes/res_html/index.html     |  4 +-
 .../res_html/node-in-menu-before-top.html          |  4 +-
 .../nodes_before_top_nodes/res_html/second.html    |  4 +-
 .../split_chapter_index/res_html/first.html        |  6 +-
 .../split_chapter_index/res_html/index.html        |  2 +-
 .../res_html/equivalent_nodes.html                 | 12 ++--
 .../res_html/more_sections_than_nodes.html         | 26 +++----
 .../node_footnote_end/res_html/node_footnote.html  |  2 +-
 .../res_html/node_footnote.html                    |  2 +-
 .../node_footnote_use_node/res_html/a.html         | 12 ++--
 .../node_footnote_use_node/res_html/chapter.html   |  2 +-
 .../node_footnote_use_node/res_html/index.html     |  4 +-
 .../res_html/nodes_after_top_before_chapter.html   |  2 +-
 .../res_html/index.html                            |  8 +--
 .../res_html/third-node.html                       |  2 +-
 .../res_html/index.html                            |  2 +-
 .../res_html/nodes_after_top_before_section.html   | 10 +--
 .../res_html/index.html                            | 10 +--
 .../res_html/placed_things_before_element.html     |  2 +-
 .../sectioning_frames/res_html/First-node.html     | 18 ++---
 .../sectioning_frames/res_html/Second-node.html    |  2 +-
 .../res_html/Third-node-unnumbered.html            |  2 +-
 .../sectioning_frames/res_html/index.html          |  2 +-
 .../res_html/top_node_up_explicit.html             |  4 +-
 .../res_html/top_node_up_implicit.html             |  4 +-
 .../res_html/two_footnotes_in_nodes.html           |  4 +-
 .../res_html/two_footnotes_in_nodes.html           |  4 +-
 tp/t/results/regions/anchor_in_copying.pl          |  2 +-
 .../regions/anchor_in_copying_in_footnote.pl       |  2 +-
 tp/t/results/regions/anchor_in_titlepage.pl        |  4 +-
 .../regions/anchor_in_titlepage_titlepage.pl       |  4 +-
 tp/t/results/regions/format_in_titlepage.pl        |  2 +-
 .../regions/format_in_titlepage_titlepage.pl       |  2 +-
 tp/t/results/regions/ref_in_copying.pl             |  4 +-
 tp/t/results/regions/today_in_copying.pl           |  2 +-
 tp/t/results/sectioning/anchor_in_footnote.pl      |  4 +-
 .../sectioning/anchor_in_footnote_separate.pl      |  4 +-
 tp/t/results/sectioning/anchor_zero.pl             |  2 +-
 .../sectioning/chapter_before_and_after_part.pl    |  6 +-
 tp/t/results/sectioning/chapter_before_part.pl     |  4 +-
 tp/t/results/sectioning/chapter_between_nodes.pl   |  6 +-
 .../chapter_node_before_and_after_part.pl          |  6 +-
 .../sectioning/character_and_spaces_in_node.pl     | 20 +++---
 .../sectioning/character_and_spaces_in_refs.pl     | 16 ++---
 ...25_0026_0027_0028_0029_002a_002b_002d_002e.html |  4 +-
 ...3f_005b_005c_005d_005e_005f_0060_007c_007e.html |  4 +-
 .../res_html/index.html                            |  2 +-
 .../res_html/local-node.html                       |  4 +-
 .../res_html/other-nodes.html                      |  2 +-
 tp/t/results/sectioning/contents.pl                | 22 +++---
 .../sectioning/contents_and_shortcontents.pl       | 22 +++---
 tp/t/results/sectioning/contents_in_html_text.pl   |  8 +--
 .../sectioning/contents_with_only_top_node.pl      |  2 +-
 .../results/sectioning/double_node_anchor_float.pl |  4 +-
 tp/t/results/sectioning/double_part.pl             |  8 +--
 tp/t/results/sectioning/double_top.pl              |  4 +-
 tp/t/results/sectioning/empty_top_node_up.pl       |  6 +-
 tp/t/results/sectioning/equivalent_labels.pl       |  2 +-
 tp/t/results/sectioning/equivalent_nodes.pl        |  8 +--
 .../results/sectioning/explicit_node_directions.pl | 12 ++--
 tp/t/results/sectioning/external_node_in_menu.pl   |  6 +-
 tp/t/results/sectioning/internal_top_node_up.pl    |  6 +-
 tp/t/results/sectioning/next_in_menu_is_below.pl   |  8 +--
 .../results/sectioning/no_argument_and_contents.pl |  4 +-
 tp/t/results/sectioning/no_menu.pl                 |  8 +--
 .../sectioning/node_part_chapter_after_chapter.pl  |  8 +--
 .../sectioning/node_part_chapter_after_top.pl      |  6 +-
 .../node_sectop_before_chapter_no_node.pl          |  4 +-
 .../sectioning/node_sectop_before_lone_node_Top.pl |  8 +--
 .../node_up_direction_for_top_with_manual.pl       |  2 +-
 tp/t/results/sectioning/node_up_external_node.pl   |  8 +--
 .../nodes_after_top_before_chapter_nodes.pl        | 10 +--
 .../nodes_after_top_before_chapter_not_split.pl    | 10 +--
 ...ore_chapter_not_split_no_use_node_directions.pl | 10 +--
 .../nodes_after_top_before_chapter_sections.pl     | 10 +--
 .../nodes_after_top_before_section_nodes.pl        | 10 +--
 .../nodes_after_top_before_section_sections.pl     | 10 +--
 .../nodes_no_node_top_explicit_directions.pl       |  8 +--
 .../non_automatic_internal_top_node_up.pl          |  6 +-
 .../non_automatic_top_node_up_and_url.pl           |  6 +-
 .../sectioning/non_automatic_top_node_up_url.pl    |  6 +-
 .../one_node_explicit_directions_anchor.pl         |  2 +-
 tp/t/results/sectioning/one_subsection.pl          |  2 +-
 tp/t/results/sectioning/one_subsection_and_node.pl |  2 +-
 tp/t/results/sectioning/part_before_chapter.pl     |  4 +-
 tp/t/results/sectioning/part_before_section.pl     |  4 +-
 tp/t/results/sectioning/part_before_top.pl         |  4 +-
 tp/t/results/sectioning/part_chapter_after_top.pl  |  6 +-
 tp/t/results/sectioning/part_node_after_top.pl     |  8 +--
 tp/t/results/sectioning/part_node_before_top.pl    |  8 +--
 .../sectioning/part_node_chapter_after_top.pl      |  8 +--
 .../sectioning/part_node_chapter_appendix.pl       |  8 +--
 .../sectioning/part_node_chapter_node_appendix.pl  |  8 +--
 .../sectioning/part_node_node_part_appendix.pl     | 10 +--
 tp/t/results/sectioning/part_node_part_appendix.pl | 10 +--
 .../sectioning/part_node_part_node_appendix.pl     | 10 +--
 .../sectioning/placed_things_before_element.pl     |  2 +-
 .../sectioning/placed_things_before_node.pl        |  2 +-
 .../sectioning/protected_node_parentheses.pl       |  6 +-
 tp/t/results/sectioning/ref_to_top.pl              |  2 +-
 .../sectioning/section_before_after_top_node.pl    |  6 +-
 .../section_before_after_top_node_last_node.pl     | 10 +--
 tp/t/results/sectioning/section_before_part.pl     |  4 +-
 tp/t/results/sectioning/section_before_top.pl      |  4 +-
 .../results/sectioning/section_below_unnumbered.pl |  6 +-
 .../sectioning/section_below_unnumbered_no_top.pl  |  4 +-
 .../sectioning/section_chapter_before_top_nodes.pl |  6 +-
 .../sectioning/section_in_unnumbered_info.pl       | 64 ++++++++---------
 .../sectioning/section_in_unnumbered_plaintext.pl  | 64 ++++++++---------
 .../results/sectioning/section_node_before_part.pl |  4 +-
 tp/t/results/sectioning/sections_test.pl           | 22 +++---
 .../sectioning/sections_test_no_use_nodes.pl       | 22 +++---
 ...ctions_test_no_use_nodes_use_node_directions.pl | 22 +++---
 .../setfilename_on_top_and_after_node.pl           |  2 +-
 tp/t/results/sectioning/shortcontents.pl           | 22 +++---
 tp/t/results/sectioning/space_in_node.pl           | 16 ++---
 .../sectioning/top_no_argument_and_content.pl      |  2 +-
 .../results/sectioning/top_no_argument_and_node.pl |  2 +-
 .../sectioning/top_no_argument_and_top_node.pl     |  2 +-
 .../sectioning/top_node_no_menu_direction.pl       |  8 +--
 tp/t/results/sectioning/top_node_part_top.pl       |  4 +-
 tp/t/results/sectioning/top_node_up_url.pl         |  6 +-
 tp/t/results/sectioning/top_without_node_nodes.pl  |  4 +-
 .../sectioning/top_without_node_sections.pl        |  4 +-
 .../res_html/a.html                                |  8 +--
 .../res_html/index.html                            |  4 +-
 .../res_html/n.html                                |  4 +-
 tp/t/results/sectioning/two_nodes_at_the_end.pl    | 12 ++--
 .../sectioning/two_nodes_between_chapters.pl       | 10 +--
 .../sectioning/unnumbered_before_node_top_top.pl   |  4 +-
 .../sectioning/unnumbered_before_top_node.pl       |  4 +-
 .../unnumbered_top_without_node_nodes.pl           |  6 +-
 .../unnumbered_top_without_node_sections.pl        |  6 +-
 tp/t/results/xtable/block_commands_in_table.pl     |  2 +-
 .../results/xtable/inter_item_commands_in_table.pl |  4 +-
 .../contents_and_parts/contents_and_parts.html     | 12 ++--
 .../contents_at_begin/contents_at_begin.html       |  4 +-
 .../contents_at_begin.html                         |  4 +-
 .../contents_at_end/contents_at_end.html           |  4 +-
 .../contents_at_end_inline/contents_at_end.html    |  4 +-
 .../contents_in_middle_chapter.html                |  6 +-
 .../contents_in_middle_chapter.html                |  6 +-
 .../contents_in_middle_section.html                |  8 +--
 .../contents_in_middle_section.html                |  8 +--
 .../double_contents/double_contents.html           |  6 +-
 .../double_contents.html                           |  6 +-
 .../double_contents.html                           |  6 +-
 .../chapter.html                                   |  4 +-
 .../index.html                                     |  2 +-
 .../chapter.html                                   |  2 +-
 .../index.html                                     |  2 +-
 .../section.html                                   |  2 +-
 .../double_contents_chapter/chapter.html           |  4 +-
 .../res_parser/double_contents_chapter/index.html  |  2 +-
 .../double_contents_inline/double_contents.html    |  6 +-
 .../double_contents_inline_chapter/chapter.html    |  4 +-
 .../double_contents_inline_chapter/index.html      |  2 +-
 .../double_contents_inline_nodes/chapter.html      |  2 +-
 .../double_contents_inline_nodes/index.html        |  2 +-
 .../double_contents_inline_nodes/section.html      |  2 +-
 .../double_contents_inline_section/chapter.html    |  2 +-
 .../double_contents_inline_section/index.html      |  2 +-
 .../double_contents_inline_section/section.html    |  2 +-
 .../res_parser/double_contents_nodes/chapter.html  |  2 +-
 .../res_parser/double_contents_nodes/index.html    |  2 +-
 .../res_parser/double_contents_nodes/section.html  |  2 +-
 .../double_contents_section/chapter.html           |  2 +-
 .../res_parser/double_contents_section/index.html  |  2 +-
 .../double_contents_section/section.html           |  2 +-
 .../contents/res_parser/no_content/no_content.html |  4 +-
 .../no_content_do_contents/no_content.html         |  4 +-
 .../no_content_do_contents_inline/no_content.html  |  4 +-
 .../res_parser/no_content_inline/no_content.html   |  4 +-
 .../no_content_setcatpage.html                     |  4 +-
 .../no_content_setcatpage.html                     |  4 +-
 .../no_content_setcatpage.html                     |  4 +-
 .../no_content_setcatpage.html                     |  4 +-
 .../documentlanguage_cmdline/documentlanguage.html |  4 +-
 .../res_parser/simplest_test_css/simplest.html     |  4 +-
 .../res_parser/test_redefine_need/test_need.html   |  2 +-
 .../index_and_node_same_name.html                  |  4 +-
 .../index_entry_in_footnote.html                   |  4 +-
 .../index_no_node_no_top/index_no_node_no_top.html | 10 +--
 .../res_parser/index_nodes_nodes/a-node.html       |  4 +-
 .../res_parser/index_nodes_nodes/another.html      |  4 +-
 .../res_parser/index_nodes_nodes/first.html        |  4 +-
 .../res_parser/index_nodes_nodes/index.html        |  4 +-
 .../res_parser/index_nodes_nodes/second.html       |  4 +-
 .../res_parser/index_special_region/Chapter.html   |  2 +-
 .../index_special_region/Copying-and-indices.html  |  2 +-
 .../res_parser/index_special_region/index.html     |  2 +-
 .../index_special_region_html/Chapter.html         |  2 +-
 .../Copying-and-indices.html                       |  2 +-
 .../index_special_region_html/index.html           |  2 +-
 .../Chapter.html                                   |  2 +-
 .../Copying-and-indices.html                       |  2 +-
 .../index.html                                     |  2 +-
 .../Chapter.html                                   |  2 +-
 .../Copying-and-indices.html                       |  2 +-
 .../index.html                                     |  2 +-
 .../index_special_region_no_region/Chapter.html    |  2 +-
 .../Copying-and-indices.html                       |  2 +-
 .../index_special_region_no_region/index.html      |  2 +-
 .../Chapter.html                                   |  2 +-
 .../Copying-and-indices.html                       |  2 +-
 .../index_special_region_no_region_html/index.html |  2 +-
 tp/tests/indices/res_parser/index_table/index.html |  2 +-
 .../res_parser/index_table/indices-refs.html       |  4 +-
 .../index_table/node-with-ftable-and-vtable.html   |  2 +-
 .../index_table/node-with-printindex.html          |  2 +-
 .../indices_in_begin_tables_lists.html             |  6 +-
 .../chapter.html                                   |  2 +-
 .../index.html                                     |  2 +-
 .../chapter.html                                   |  6 +-
 .../first-before-top.html                          |  8 +--
 .../index.html                                     | 18 ++---
 .../printindex_between_node_section.html           |  6 +-
 .../printindex_between_part_chapter.html           |  8 +--
 .../Copying-and-indices.html                       |  2 +-
 .../index_special_region_html/index.html           |  4 +-
 .../Copying-and-indices.html                       |  2 +-
 .../index.html                                     |  4 +-
 .../Copying-and-indices.html                       |  2 +-
 .../index_special_region_no_region_html/index.html |  4 +-
 .../chapter.html                                   |  6 +-
 .../first-before-top.html                          |  8 +--
 .../index.html                                     | 18 ++---
 .../chapter.html                                   |  6 +-
 .../first-before-top.html                          |  8 +--
 .../index.html                                     | 18 ++---
 .../layout/res_parser/formatting/formatting.html   | 14 ++--
 .../layout/res_parser/formatting_chm/chapter.html  |  2 +-
 .../layout/res_parser/formatting_chm/chapter2.html |  2 +-
 .../res_parser/formatting_chm/formatting.html      |  2 +-
 .../formatting_chm/s_002d_002dect_002cion.html     |  2 +-
 .../res_parser/formatting_chm/subsection.html      |  2 +-
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |  2 +-
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |  2 +-
 .../formatting_enable_encoding/formatting.html     | 14 ++--
 .../EPUB/xhtml/formatting.xhtml                    | 14 ++--
 .../EPUB/xhtml/chapter.xhtml                       |  2 +-
 .../EPUB/xhtml/chapter2.xhtml                      |  2 +-
 .../EPUB/xhtml/formatting.xhtml                    |  2 +-
 .../EPUB/xhtml/s_002d_002dect_002cion.xhtml        |  2 +-
 .../EPUB/xhtml/subsection.xhtml                    |  2 +-
 ...ion-_0060_0060simple_002ddouble_002d_002d.xhtml |  2 +-
 ...2d_002dfour_002d_002d_002d_002d_0027_0027.xhtml |  2 +-
 .../res_parser/formatting_exotic/chapter.html      |  2 +-
 .../res_parser/formatting_exotic/chapter2.html     |  2 +-
 .../layout/res_parser/formatting_exotic/index.html |  2 +-
 .../formatting_exotic/s_002d_002dect_002cion.html  |  8 +--
 .../res_parser/formatting_fr_icons/formatting.html | 14 ++--
 .../res_parser/formatting_html/formatting.html     | 14 ++--
 .../formatting_html_no_texi2html/formatting.html   | 14 ++--
 .../res_parser/formatting_html_nodes/chapter.html  |  2 +-
 .../res_parser/formatting_html_nodes/chapter2.html |  2 +-
 .../res_parser/formatting_html_nodes/index.html    |  2 +-
 .../s_002d_002dect_002cion.html                    |  2 +-
 .../formatting_html_nodes/subsection.html          |  2 +-
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |  2 +-
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |  2 +-
 .../formatting_inline_css/formatting.html          | 14 ++--
 .../res_parser/formatting_mathjax/formatting.html  | 14 ++--
 .../res_parser/formatting_nodes/chapter.html       |  2 +-
 .../res_parser/formatting_nodes/chapter2.html      |  2 +-
 .../layout/res_parser/formatting_nodes/index.html  |  2 +-
 .../formatting_nodes/s_002d_002dect_002cion.html   |  2 +-
 .../res_parser/formatting_nodes/subsection.html    |  2 +-
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |  2 +-
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |  2 +-
 .../formatting_numerical_entities/formatting.html  | 14 ++--
 .../formatting_regions/formatting_regions.html     | 14 ++--
 .../formatting_weird_quotes/formatting.html        | 14 ++--
 .../res_parser/formatting_xhtml/formatting.html    | 14 ++--
 .../chapter.html                                   |  2 +-
 .../navigation_abt.html                            |  4 +-
 .../subsection.html                                |  2 +-
 .../no_monolithic_only_toc_out/no_monolithic.html  |  4 +-
 tp/tests/many_input_files/tex_l2h_res/tex.html     |  2 +-
 .../many_input_files/tex_l2h_res/tex_complex.html  |  2 +-
 tp/tests/many_input_files/tex_t4ht_res/tex.html    |  2 +-
 .../many_input_files/tex_t4ht_res/tex_complex.html |  2 +-
 .../nested_cartouche/nested_formats.html           |  2 +-
 .../res_parser/nested_deffn/nested_formats.html    |  2 +-
 .../nested_enumerate/nested_formats.html           |  2 +-
 .../res_parser/nested_example/nested_formats.html  |  2 +-
 .../nested_flushright/nested_formats.html          |  2 +-
 .../res_parser/nested_group/nested_formats.html    |  2 +-
 .../res_parser/nested_itemize/nested_formats.html  |  2 +-
 .../res_parser/nested_menu/nested_formats.html     |  2 +-
 .../nested_multitable/nested_formats.html          |  2 +-
 .../nested_quotation/nested_formats.html           |  2 +-
 .../res_parser/nested_table/nested_formats.html    |  2 +-
 .../sectioning_directions/sectioning.html          | 24 +++----
 .../First-node.html                                | 18 ++---
 .../Second-node.html                               |  2 +-
 .../Third-node-unnumbered.html                     |  2 +-
 .../sectioning_directions_split_chapter/index.html |  2 +-
 .../res_parser/block_EOL_tex/block_EOL.html        |  2 +-
 .../res_parser/formatting_singular/chapter.html    |  2 +-
 .../res_parser/formatting_singular/chapter2.html   |  2 +-
 .../res_parser/formatting_singular/index.htm       |  2 +-
 .../s_002d_002dect_002cion.html                    |  2 +-
 .../res_parser/formatting_singular/subsection.html |  2 +-
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |  2 +-
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |  2 +-
 .../math_not_closed/math_not_closed.html           |  2 +-
 .../res_parser/simplest_httex/simplest.html        |  4 +-
 tp/tests/tex_html/res_parser/tex/tex.html          |  2 +-
 .../res_parser/tex_complex_httex/tex_complex.html  |  2 +-
 .../res_parser/tex_complex_l2h/tex_complex.html    |  2 +-
 .../res_parser/tex_eqalign_httex/tex_eqalign.html  |  2 +-
 .../res_parser/tex_eqalign_l2h/tex_eqalign.html    |  2 +-
 .../res_parser/tex_gdef_httex/tex_gdef.html        |  2 +-
 .../tex_html/res_parser/tex_gdef_l2h/tex_gdef.html |  2 +-
 .../res_parser/tex_gdef_mathjax/tex_gdef.html      |  2 +-
 tp/tests/tex_html/res_parser/tex_httex/tex.html    |  2 +-
 .../res_parser/tex_in_copying/tex_in_copying.html  |  4 +-
 tp/tests/tex_html/res_parser/tex_notex/tex.html    |  2 +-
 626 files changed, 1483 insertions(+), 1475 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d9430acfd0..2cfdaf1544 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2022-01-11  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/HTML.pm (_convert_heading_command): use
+       a specific class for the opening section div, like
+       <section>-level-extent.  Always associate the class corresponding to a
+       sectioning @-command or a @node to the header if it is output, else to
+       the anchor with the id.  Use node-id for the anchor class if there is
+       a heading.
+
 2022-01-11  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/HTML.pm (_convert_heading_command):
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 00033f34dc..108baf9207 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -3310,35 +3310,9 @@ sub _convert_heading_command($$$$$)
                                             $element, $tree_unit);
   }
 
-  # if set, the id is associated to the heading text
-  my $heading_id;
-  if ($opening_section) {
-    my $level = $opening_section->{'structure'}->{'section_level'};
-    $result .= join('', $self->close_registered_sections_level($level));
-    $self->register_opened_section_level($level, "</div>\n");
-
-    # FIXME if this is not the section element, it should not be the
-    # section as class
-    $result .= $self->html_attribute_class('div',
-                                 $level_corrected_opening_section_cmdname);
-                 #"${level_corrected_opening_section_cmdname}-level-extent");
-
-    $result .= " id=\"$element_id\""
-        if (defined($element_id) and $element_id ne '');
-    $result .= ">\n";
-  } elsif (defined($element_id) and $element_id ne '') {
-    if ($element_header ne '') {
-      # case of a @node without sectioning command and with a header.
-      # put the node element anchor before the header
-      $result .= &{$self->{'format_separate_anchor'}}($self, $element_id,
-                                                      $cmdname);
-    } else {
-      $heading_id = $element_id;
-    }
-  }
-
-  $result .= $element_header;
-
+  # $heading not defined may happen if the command is a @node, for example
+  # if there is an error in the node.
+  my $heading = $self->command_text($element);
   my $heading_level;
   # node is used as heading if there is nothing else.
   if ($cmdname eq 'node') {
@@ -3364,12 +3338,45 @@ sub _convert_heading_command($$$$$)
     # sectioning tree, but still have a $heading_level
     $heading_level = Texinfo::Structuring::section_level($element);
   }
+ 
+  my $do_heading = (defined($heading) and $heading ne ''
+                    and defined($heading_level));
+
+  # if set, the id is associated to the heading text
+  my $heading_id;
+  if ($opening_section) {
+    my $level = $opening_section->{'structure'}->{'section_level'};
+    $result .= join('', $self->close_registered_sections_level($level));
+    $self->register_opened_section_level($level, "</div>\n");
+
+    # use a specific class name to mark that this is the start of
+    # the section extent. It is not necessary where the section is.
+    $result .= $self->html_attribute_class('div',
+                 "${level_corrected_opening_section_cmdname}-level-extent");
+    $result .= " id=\"$element_id\""
+        if (defined($element_id) and $element_id ne '');
+    $result .= ">\n";
+  } elsif (defined($element_id) and $element_id ne '') {
+    if ($element_header ne '') {
+      # case of a @node without sectioning command and with a header.
+      # put the node element anchor before the header.
+      # Set the class name to the command name if there is no heading,
+      # else the class will be with the heading element.
+      my $id_class = $cmdname;
+      if ($do_heading) {
+        $id_class = "${cmdname}-id";
+      }
+      $result .= &{$self->{'format_separate_anchor'}}($self, $element_id,
+                                                      $id_class);
+    } else {
+      $heading_id = $element_id;
+    }
+  }
+
+  $result .= $element_header;
 
-  my $heading = $self->command_text($element);
-  # $heading not defined may happen if the command is a @node, for example
-  # if there is an error in the node.
-  if (defined($heading) and $heading ne '' and defined($heading_level)) {
 
+  if ($do_heading) {
     if ($self->get_conf('TOC_LINKS')
         and $Texinfo::Common::root_commands{$cmdname}
         and $Texinfo::Common::sectioning_commands{$cmdname}) {
@@ -3387,13 +3394,7 @@ sub _convert_heading_command($$$$$)
       }
       $result .= "<strong${id_str}>".$heading.'</strong>'."\n";
     } else {
-      # FIXME for sectioning commands there is a class here but
-      # it also was the opening section, possibly when encountering
-      # the associated node element
       my $heading_class = $level_corrected_cmdname;
-      if ($cmdname eq 'node') {
-        $heading_class = 'node-heading';
-      }
       $result .= &{$self->{'format_heading_text'}}($self,
                      $level_corrected_cmdname, $heading_class, $heading,
                      $heading_level +$self->get_conf('CHAPTER_HEADER_LEVEL') 
-1,
@@ -3401,8 +3402,6 @@ sub _convert_heading_command($$$$$)
     }
   } elsif (defined($heading_id)) {
     # case of a lone node and no header, and case of an empty @top
-    # FIXME In case of an empty top there a class here and above
-    # as the empty top was also the $opening_section
     $result .= &{$self->{'format_separate_anchor'}}($self, $heading_id,
                                                     $cmdname);
   }
diff --git a/tp/t/results/converters_tests/at_commands_in_raw.pl 
b/tp/t/results/converters_tests/at_commands_in_raw.pl
index 4838443e77..cb4cbdf749 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -1205,7 +1205,7 @@ $result_converted{'plaintext'}->{'at_commands_in_raw'} = 
'<b>in b(1).</b>
 ';
 
 
-$result_converted{'html_text'}->{'at_commands_in_raw'} = '<h1 
class="node-heading" id="Top">Top</h1>
+$result_converted{'html_text'}->{'at_commands_in_raw'} = '<h1 class="node" 
id="Top">Top</h1>
 
 
 <b>in b<a class="footnote" id="DOCF1" href="#FOOT1"><sup>1</sup></a>.</b>
diff --git a/tp/t/results/converters_tests/complex_nestings.pl 
b/tp/t/results/converters_tests/complex_nestings.pl
index 1c788e1b68..376814d8c9 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -1447,7 +1447,7 @@ $result_converted{'plaintext'}->{'complex_nestings'} = '  
   deffs
 ';
 
 
-$result_converted{'html_text'}->{'complex_nestings'} = '<h1 
class="node-heading" id="Top">Top</h1>
+$result_converted{'html_text'}->{'complex_nestings'} = '<h1 class="node" 
id="Top">Top</h1>
 
 <div class="example">
 <pre class="example-preformatted">deffs
diff --git a/tp/t/results/converters_tests/footnote_no_number.pl 
b/tp/t/results/converters_tests/footnote_no_number.pl
index 7b1dd5f940..4400a875cc 100644
--- a/tp/t/results/converters_tests/footnote_no_number.pl
+++ b/tp/t/results/converters_tests/footnote_no_number.pl
@@ -226,7 +226,7 @@ $result_converted{'plaintext'}->{'footnote_no_number'} = 
'Para(*).
 ';
 
 
-$result_converted{'html_text'}->{'footnote_no_number'} = '<h1 
class="node-heading" id="Top">Top</h1>
+$result_converted{'html_text'}->{'footnote_no_number'} = '<h1 class="node" 
id="Top">Top</h1>
 
 <p>Para<a class="footnote" id="DOCF1" href="#FOOT1"><sup>*</sup></a>.
 </p>
diff --git a/tp/t/results/converters_tests/footnote_no_number_separate.pl 
b/tp/t/results/converters_tests/footnote_no_number_separate.pl
index 2d267be6e1..153531e123 100644
--- a/tp/t/results/converters_tests/footnote_no_number_separate.pl
+++ b/tp/t/results/converters_tests/footnote_no_number_separate.pl
@@ -224,7 +224,7 @@ 
$result_converted{'plaintext'}->{'footnote_no_number_separate'} = 'Para(*) (*not
 ';
 
 
-$result_converted{'html_text'}->{'footnote_no_number_separate'} = '<h1 
class="node-heading" id="Top">Top</h1>
+$result_converted{'html_text'}->{'footnote_no_number_separate'} = '<h1 
class="node" id="Top">Top</h1>
 
 <p>Para<a class="footnote" id="DOCF1" href="#FOOT1"><sup>*</sup></a>.
 </p>
diff --git a/tp/t/results/converters_tests/image_formatting.pl 
b/tp/t/results/converters_tests/image_formatting.pl
index a1801869d8..57f362a83e 100644
--- a/tp/t/results/converters_tests/image_formatting.pl
+++ b/tp/t/results/converters_tests/image_formatting.pl
@@ -2571,7 +2571,7 @@ Image description""\\.
 ';
 
 
-$result_converted{'html_text'}->{'image_formatting'} = '<h1 
class="node-heading" id="Top">Top</h1>
+$result_converted{'html_text'}->{'image_formatting'} = '<h1 class="node" 
id="Top">Top</h1>
 
 <p><code class="code">@image{f--ile}</code> <img class="image" 
src="f--ile.png" alt="f--ile">
 <code class="code">@image{f--ile,l--i}</code> <img class="image" 
src="f--ile.png" alt="f--ile">
diff --git a/tp/t/results/converters_tests/index_entry_in_preformatted.pl 
b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
index fa0e5425b6..0a506624bd 100644
--- a/tp/t/results/converters_tests/index_entry_in_preformatted.pl
+++ b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
@@ -375,7 +375,7 @@ 
$result_converted{'plaintext'}->{'index_entry_in_preformatted'} = '     text
 ';
 
 
-$result_converted{'html_text'}->{'index_entry_in_preformatted'} = '<h1 
class="node-heading" id="Top">Top</h1>
+$result_converted{'html_text'}->{'index_entry_in_preformatted'} = '<h1 
class="node" id="Top">Top</h1>
 
 <div class="example">
 <pre class="example-preformatted"><a class="index-entry-id" 
id="index-first"></a>text
diff --git 
a/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl 
b/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
index ab6c6a64f4..17f615439b 100644
--- a/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
+++ b/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
@@ -776,7 +776,7 @@ 
$result_converted{'plaintext'}->{'printindex_merged_indices_code_style'} = '* Me
 ';
 
 
-$result_converted{'html_text'}->{'printindex_merged_indices_code_style'} = 
'<h1 class="node-heading" id="Top">Top</h1>
+$result_converted{'html_text'}->{'printindex_merged_indices_code_style'} = 
'<h1 class="node" id="Top">Top</h1>
 
 
 
diff --git a/tp/t/results/converters_tests/ref_in_sectioning.pl 
b/tp/t/results/converters_tests/ref_in_sectioning.pl
index 6d2545114e..ee800bf094 100644
--- a/tp/t/results/converters_tests/ref_in_sectioning.pl
+++ b/tp/t/results/converters_tests/ref_in_sectioning.pl
@@ -2510,7 +2510,7 @@ for example *note node:: (*note node::) (*note 
(file)Top::)
 
 
 $result_converted{'html_text'}->{'ref_in_sectioning'} = '
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
  &nbsp; </p>
@@ -2544,7 +2544,7 @@ $result_converted{'html_text'}->{'ref_in_sectioning'} = '
 </div>
 </div>
 <hr>
-<div class="chapter" id="node">
+<div class="chapter-level-extent" id="node">
 <div class="nav-header">
 <p>
  &nbsp; </p>
@@ -2553,7 +2553,7 @@ $result_converted{'html_text'}->{'ref_in_sectioning'} = '
 
 <hr>
 </div>
-<div class="chapter" id="chap">
+<div class="chapter-level-extent" id="chap">
 <div class="nav-header">
 <p>
  &nbsp; </p>
@@ -2574,51 +2574,51 @@ $result_converted{'html_text'}->{'ref_in_sectioning'} = 
'
 <li><a href="#Top_002c-xref-Top-filename-only_002c-no-spaces">See <a 
data-manual="filename" href="filename.html#Top">(filename)Top</a>, xref Top 
filename only, no spaces</a></li>
 <li><a href="#filename_002e-xref-filename-only_002c-no-spaces">See <a 
data-manual="filename" href="filename.html#Top">(filename)</a>. xref filename 
only, no spaces</a></li>
 </ul>
-<div class="section" id="node-node_002c-crossref-arg2">
+<div class="section-level-extent" id="node-node_002c-crossref-arg2">
 <h3 class="section">2.1 <a class="ref" href="#node">cross ref name</a>  node, 
crossref arg2</h3>
 
 </div>
-<div class="section" id="node-code-node_002c-samptitle-arg3">
+<div class="section-level-extent" id="node-code-node_002c-samptitle-arg3">
 <h3 class="section">2.2 <a class="ref" href="#node">&lsquo;<samp 
class="samp">title</samp>&rsquo;</a>  code node, samptitle arg3</h3>
 
 </div>
-<div class="section" id="node-code-node_002c-file-name">
+<div class="section-level-extent" id="node-code-node_002c-file-name">
 <h3 class="section">2.3 <a data-manual="file name" href="file 
name.html#node">(file name)<code class="code">node</code></a> code node, file 
name</h3>
 
 </div>
-<div class="section" id="node-node-and-manual">
+<div class="section-level-extent" id="node-node-and-manual">
 <h3 class="section">2.4 &lsquo;node&rsquo; in <cite class="cite">Manual</cite> 
node and manual</h3>
 
 </div>
-<div class="section" id="Top-Top-and-manual">
+<div class="section-level-extent" id="Top-Top-and-manual">
 <h3 class="section">2.5 <cite class="cite">Manual</cite> Top and manual</h3>
 
 </div>
-<div class="section" id="Manual-no-node-just-manual">
+<div class="section-level-extent" id="Manual-no-node-just-manual">
 <h3 class="section">2.6 <cite class="cite">Manual</cite> no node just 
manual</h3>
 
 </div>
-<div class="section" id="file-name-no-node-just-file-name">
+<div class="section-level-extent" id="file-name-no-node-just-file-name">
 <h3 class="section">2.7 <a data-manual="file name" href="file 
name.html#Top">(file name)</a> no node just file name</h3>
 
 </div>
-<div class="section" id="a-inforef-a-b-c">
+<div class="section-level-extent" id="a-inforef-a-b-c">
 <h3 class="section">2.8 See <a data-manual="c" href="c.html#a">(c)b</a> 
inforef a b c</h3>
 
 </div>
-<div class="section" id="g_t_0028Top_0029-pxref-Top-file-name_002c-spaces">
+<div class="section-level-extent" 
id="g_t_0028Top_0029-pxref-Top-file-name_002c-spaces">
 <h3 class="section">2.9 (see <a data-manual="file name" href="file 
name.html#Top">(file name)Top</a>) pxref Top file name, spaces</h3>
 
 </div>
-<div class="section" 
id="g_t_0028file-name_0029-pxref-file-name-only_002c-spaces">
+<div class="section-level-extent" 
id="g_t_0028file-name_0029-pxref-file-name-only_002c-spaces">
 <h3 class="section">2.10 (see <a data-manual="file name" href="file 
name.html#Top">(file name)</a>) pxref file name only, spaces</h3>
 
 </div>
-<div class="section" id="Top_002c-xref-Top-filename-only_002c-no-spaces">
+<div class="section-level-extent" 
id="Top_002c-xref-Top-filename-only_002c-no-spaces">
 <h3 class="section">2.11 See <a data-manual="filename" 
href="filename.html#Top">(filename)Top</a>, xref Top filename only, no 
spaces</h3>
 
 </div>
-<div class="section" id="filename_002e-xref-filename-only_002c-no-spaces">
+<div class="section-level-extent" 
id="filename_002e-xref-filename-only_002c-no-spaces">
 <h3 class="section">2.12 See <a data-manual="filename" 
href="filename.html#Top">(filename)</a>. xref filename only, no spaces</h3>
 
 </div>
diff --git a/tp/t/results/converters_tests/refs_formatting.pl 
b/tp/t/results/converters_tests/refs_formatting.pl
index 3f47381288..289c1a564a 100644
--- a/tp/t/results/converters_tests/refs_formatting.pl
+++ b/tp/t/results/converters_tests/refs_formatting.pl
@@ -4461,7 +4461,7 @@ title: (file name)(pman)anode. ‘@ref{(pman)anode,,,file 
name,manual}’
 ';
 
 
-$result_converted{'html_text'}->{'refs_formatting'} = '<div class="chapter" 
id="chapter">
+$result_converted{'html_text'}->{'refs_formatting'} = '<div 
class="chapter-level-extent" id="chapter">
 <h2 class="chapter" id="chapter-1">1 chapter</h2>
 
 <p><code class="code">@ref{chapter,cross ref name}</code> <a class="ref" 
href="#chapter">cross ref name</a>
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 07e252b479..4ce8b9f568 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
@@ -1820,7 +1820,7 @@ see *note (manual)a *strong* ref with SC, a i trema ï, a 
dotless i trema
 
 
 $result_converted{'html_text'}->{'some_at_commands_in_ref_nodes'} = '
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
  &nbsp; </p>
@@ -1832,7 +1832,7 @@ 
$result_converted{'html_text'}->{'some_at_commands_in_ref_nodes'} = '
 <li><a href="#A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1" 
accesskey="1">A <small class="sc">SC</small> node &iuml; &iuml; &#274;&#768; 
&#322; &#262;&#807; &iexcl;</a></li>
 </ul>
 <hr>
-<div class="chapter" 
id="A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1">
+<div class="chapter-level-extent" 
id="A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1">
 <div class="nav-header">
 <p>
  &nbsp; </p>
diff --git a/tp/t/results/converters_tests/spaces_in_empty_node_names.pl 
b/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
index a7d7077b02..726fb8a362 100644
--- a/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
@@ -946,11 +946,11 @@ 
$result_converted{'plaintext'}->{'spaces_in_empty_node_names'} = '*note   ::
 ';
 
 
-$result_converted{'html_text'}->{'spaces_in_empty_node_names'} = '<a 
class="node" id="Top"></a><div class="nav-header">
+$result_converted{'html_text'}->{'spaces_in_empty_node_names'} = '<a 
class="node-id" id="Top"></a><div class="nav-header">
 <p>
  &nbsp; </p>
 </div>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 
 
 <hr>
diff --git a/tp/t/results/converters_tests/spaces_in_node_names.pl 
b/tp/t/results/converters_tests/spaces_in_node_names.pl
index f125da456f..0cd0908574 100644
--- a/tp/t/results/converters_tests/spaces_in_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_node_names.pl
@@ -1051,33 +1051,33 @@ 
$result_converted{'plaintext'}->{'spaces_in_node_names'} = '*note a  ::
 ';
 
 
-$result_converted{'html_text'}->{'spaces_in_node_names'} = '<a class="node" 
id="Top"></a><div class="nav-header">
+$result_converted{'html_text'}->{'spaces_in_node_names'} = '<a class="node-id" 
id="Top"></a><div class="nav-header">
 <p>
  &nbsp; </p>
 </div>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 
 
 <hr>
-<a class="node" id="a--"></a><div class="nav-header">
+<a class="node-id" id="a--"></a><div class="nav-header">
 <p>
  &nbsp; </p>
 </div>
-<h4 class="node-heading">a&nbsp;&nbsp;</h4>
+<h4 class="node">a&nbsp;&nbsp;</h4>
 
 <hr>
-<a class="node" id="b-"></a><div class="nav-header">
+<a class="node-id" id="b-"></a><div class="nav-header">
 <p>
  &nbsp; </p>
 </div>
-<h4 class="node-heading">b<tt class="verb">  </tt></h4>
+<h4 class="node">b<tt class="verb">  </tt></h4>
 
 <hr>
-<a class="node" id="c-"></a><div class="nav-header">
+<a class="node-id" id="c-"></a><div class="nav-header">
 <p>
  &nbsp; </p>
 </div>
-<h4 class="node-heading">c&nbsp;&nbsp;<!-- /@w --></h4>
+<h4 class="node">c&nbsp;&nbsp;<!-- /@w --></h4>
 
 <p><a class="ref" href="#a--">a&nbsp;&nbsp;</a>
 </p>
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl 
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index a141c2e7b0..fcda2d3521 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -3407,7 +3407,7 @@ $result_converted{'plaintext'}->{'test_deftypefnnewline'} 
= 'top
 
 $result_converted{'html_text'}->{'test_deftypefnnewline'} = '
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
  &nbsp; </p>
@@ -3418,7 +3418,7 @@ $result_converted{'html_text'}->{'test_deftypefnnewline'} 
= '
 <li><a href="#chapter" accesskey="1">chap</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
  &nbsp; </p>
diff --git a/tp/t/results/converters_tests/things_before_setfilename.pl 
b/tp/t/results/converters_tests/things_before_setfilename.pl
index 63dc257a6f..1602c76989 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -1508,7 +1508,7 @@ $result_converted{'html'}->{'things_before_setfilename'} 
= '<!DOCTYPE html>
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="top-section">top section</h1>
 
 <p>Ref to anchor
diff --git a/tp/t/results/converters_tests/top_in_ref.pl 
b/tp/t/results/converters_tests/top_in_ref.pl
index 53bf318e45..a0c99efec4 100644
--- a/tp/t/results/converters_tests/top_in_ref.pl
+++ b/tp/t/results/converters_tests/top_in_ref.pl
@@ -4458,18 +4458,18 @@ name)Top::
 ';
 
 
-$result_converted{'html_text'}->{'top_in_ref'} = '<a class="node" 
id="Top"></a><div class="nav-header">
+$result_converted{'html_text'}->{'top_in_ref'} = '<a class="node-id" 
id="Top"></a><div class="nav-header">
 <p>
  &nbsp; </p>
 </div>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 
 <hr>
-<a class="node" id="refs-node"></a><div class="nav-header">
+<a class="node-id" id="refs-node"></a><div class="nav-header">
 <p>
  &nbsp; </p>
 </div>
-<h4 class="node-heading">refs node</h4>
+<h4 class="node">refs node</h4>
 
 <p><code class="code">@ref{Top,cross ref name}</code> <a class="ref" 
href="#Top">cross ref name</a>
 <code class="code">@ref{Top,,title}</code> <a class="ref" href="#Top">title</a>
diff --git a/tp/t/results/converters_tests/top_in_ref_keep_top.pl 
b/tp/t/results/converters_tests/top_in_ref_keep_top.pl
index 7c263370ca..3ed2a59b03 100644
--- a/tp/t/results/converters_tests/top_in_ref_keep_top.pl
+++ b/tp/t/results/converters_tests/top_in_ref_keep_top.pl
@@ -4420,18 +4420,18 @@ $result_floats{'top_in_ref_keep_top'} = {};
 
 
 
-$result_converted{'html_text'}->{'top_in_ref_keep_top'} = '<a class="node" 
id="Top"></a><div class="nav-header">
+$result_converted{'html_text'}->{'top_in_ref_keep_top'} = '<a class="node-id" 
id="Top"></a><div class="nav-header">
 <p>
  &nbsp; </p>
 </div>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 
 <hr>
-<a class="node" id="refs-node"></a><div class="nav-header">
+<a class="node-id" id="refs-node"></a><div class="nav-header">
 <p>
  &nbsp; </p>
 </div>
-<h4 class="node-heading">refs node</h4>
+<h4 class="node">refs node</h4>
 
 <p><code class="code">@ref{Top,cross ref name}</code> <a class="ref" 
href="#Top">cross ref name</a>
 <code class="code">@ref{Top,,title}</code> <a class="ref" href="#Top">title</a>
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl 
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index 34ff91e48d..bd680f0a19 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -1190,7 +1190,7 @@ top! After punc
 
 
 $result_converted{'html_text'}->{'punctuation_in_line_commands'} = '
-<div class="top" id="node_0021-After-punc">
+<div class="top-level-extent" id="node_0021-After-punc">
 <h1 class="top" id="top_0021-After-punc">top! After punc</h1>
 
 <dl class="table">
diff --git a/tp/t/results/coverage_braces/footnote_no_node.pl 
b/tp/t/results/coverage_braces/footnote_no_node.pl
index 5d2fb82adb..e2633c89af 100644
--- a/tp/t/results/coverage_braces/footnote_no_node.pl
+++ b/tp/t/results/coverage_braces/footnote_no_node.pl
@@ -155,7 +155,7 @@ F(1).
 ';
 
 
-$result_converted{'html_text'}->{'footnote_no_node'} = '<div class="top" 
id="top">
+$result_converted{'html_text'}->{'footnote_no_node'} = '<div 
class="top-level-extent" id="top">
 <h1 class="top">top</h1>
 
 <p>F<a class="footnote" id="DOCF1" href="#FOOT1"><sup>1</sup></a>.
diff --git a/tp/t/results/coverage_braces/inforef_too_much_args.pl 
b/tp/t/results/coverage_braces/inforef_too_much_args.pl
index 0c3b027a20..c2291ff8d8 100644
--- a/tp/t/results/coverage_braces/inforef_too_much_args.pl
+++ b/tp/t/results/coverage_braces/inforef_too_much_args.pl
@@ -192,7 +192,7 @@ $result_converted{'plaintext'}->{'inforef_too_much_args'} = 
'*note cross ref nam
 ';
 
 
-$result_converted{'html_text'}->{'inforef_too_much_args'} = '<h4 
class="node-heading" id="chapter">chapter</h4>
+$result_converted{'html_text'}->{'inforef_too_much_args'} = '<h4 class="node" 
id="chapter">chapter</h4>
 
 <p>See <a data-manual="file name, spurious arg" href="file name, spurious 
arg.html#chapter">(file name, spurious arg)cross ref name</a>
 </p>';
diff --git a/tp/t/results/coverage_braces/test_image.pl 
b/tp/t/results/coverage_braces/test_image.pl
index 8a4db9937a..6da5d833e6 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -3923,7 +3923,7 @@ div.example {margin-left: 3.2em}
 <body lang="en">
 
 
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 <img class="image" src="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; 
.ext@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; " alt="f@i--le..  
a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
 
@@ -4164,7 +4164,7 @@ $result_converted_errors{'plaintext'}->{'test_image'} = [
 
 $result_converted{'html_text'}->{'test_image'} = '
 
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 <img class="image" src="f@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; 
.ext@i--le..  a@&lt;&quot;%@  &lt; &amp; @ % &quot; " alt="f@i--le..  
a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
 
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 22cc4a18c1..08fc863e5c 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
@@ -827,7 +827,7 @@ $result_converted{'html'}->{'two_footnotes_in_nodes'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; </p>
@@ -843,7 +843,7 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">chapter</a> &nbsp; </p>
 <li><a href="#chapter" accesskey="1">chapter</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">2 footnotes in 2 nodes</a>, 
Up: <a href="#Top" accesskey="u" rel="up">2 footnotes in 2 nodes</a> &nbsp; </p>
@@ -987,7 +987,7 @@ C(1)
 ';
 
 
-$result_converted{'html_text'}->{'two_footnotes_in_nodes'} = '<div class="top" 
id="Top">
+$result_converted{'html_text'}->{'two_footnotes_in_nodes'} = '<div 
class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
  &nbsp; </p>
@@ -1003,7 +1003,7 @@ 
$result_converted{'html_text'}->{'two_footnotes_in_nodes'} = '<div class="top" i
 <li><a href="#chapter" accesskey="1">chapter</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
  &nbsp; </p>
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 656b6eca91..92375ee86b 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
@@ -863,7 +863,7 @@ 
$result_converted{'html'}->{'two_footnotes_in_nodes_separate'} = '<!DOCTYPE html
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; </p>
@@ -879,7 +879,7 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">chapter</a> &nbsp; </p>
 <li><a href="#chapter" accesskey="1">chapter</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">2 footnotes in 2 nodes</a>, 
Up: <a href="#Top" accesskey="u" rel="up">2 footnotes in 2 nodes</a> &nbsp; </p>
@@ -1025,7 +1025,7 @@ C(1) (*note chapter-Footnote-1::)
 ';
 
 
-$result_converted{'html_text'}->{'two_footnotes_in_nodes_separate'} = '<div 
class="top" id="Top">
+$result_converted{'html_text'}->{'two_footnotes_in_nodes_separate'} = '<div 
class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
  &nbsp; </p>
@@ -1041,7 +1041,7 @@ 
$result_converted{'html_text'}->{'two_footnotes_in_nodes_separate'} = '<div clas
 <li><a href="#chapter" accesskey="1">chapter</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
  &nbsp; </p>
diff --git a/tp/t/results/coverage_braces/verb_in_xref.pl 
b/tp/t/results/coverage_braces/verb_in_xref.pl
index 1e7fd10bb5..10bb8730ad 100644
--- a/tp/t/results/coverage_braces/verb_in_xref.pl
+++ b/tp/t/results/coverage_braces/verb_in_xref.pl
@@ -231,7 +231,7 @@ ggg : Top.
 ';
 
 
-$result_converted{'html_text'}->{'verb_in_xref'} = '<h1 class="node-heading" 
id="Top">Top</h1>
+$result_converted{'html_text'}->{'verb_in_xref'} = '<h1 class="node" 
id="Top">Top</h1>
 
 <p>See <a class="xref" href="#Top"><tt class="verb">with
 verb
diff --git a/tp/t/results/def/all_commands_delimiters_printindex.pl 
b/tp/t/results/def/all_commands_delimiters_printindex.pl
index 48df413f04..415bba6ebe 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -16070,7 +16070,7 @@ span:hover a.copiable-anchor {visibility: visible}
 </head>
 
 <body lang="en">
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 <dl class="first-deffn">
 <dt class="deffn" id="index-forward_002d_002dchar"><span 
class="category-def">Command: </span><span><strong class="strong"><var 
class="var">forward--char</var></strong> <em class="emph"><var 
class="var">nchars</var> argument2 argument3         (arg in brace, [something 
<var class="var">in v--ar</var>, <b class="b">in, b</b> , comma a<var 
class="var">pref</var> p]) last</em><a class="copiable-anchor" 
href=\'#index-forward_002d_002dchar\'> &para;</a></span></dt>
 </dl>
diff --git a/tp/t/results/def/all_commands_printindex.pl 
b/tp/t/results/def/all_commands_printindex.pl
index ce8d40eab6..04e1444f30 100644
--- a/tp/t/results/def/all_commands_printindex.pl
+++ b/tp/t/results/def/all_commands_printindex.pl
@@ -5903,7 +5903,7 @@ span:hover a.copiable-anchor {visibility: visible}
 </head>
 
 <body lang="en">
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 <dl class="first-defvr">
 <dt class="defvr" id="index-d_002d_002defvr_005fname"><span 
class="category-def">c--ategory: </span><span><strong 
class="strong">d--efvr_name</strong><a class="copiable-anchor" 
href=\'#index-d_002d_002defvr_005fname\'> &para;</a></span></dt>
 <dd><p>d&ndash;efvr
diff --git a/tp/t/results/def/space_in_def_for_index.pl 
b/tp/t/results/def/space_in_def_for_index.pl
index 4a7127c49c..a6ff6db194 100644
--- a/tp/t/results/def/space_in_def_for_index.pl
+++ b/tp/t/results/def/space_in_def_for_index.pl
@@ -552,7 +552,7 @@ span:hover a.copiable-anchor {visibility: visible}
 </head>
 
 <body lang="en">
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-name"><span class="category-def">Category: 
</span><span><strong class="strong">name</strong> <em class="emph">argument 
argument2...</em><a class="copiable-anchor" href=\'#index-name\'> 
&para;</a></span></dt>
diff --git a/tp/t/results/float/anchor_in_caption.pl 
b/tp/t/results/float/anchor_in_caption.pl
index eb33f397f3..4c86bd6318 100644
--- a/tp/t/results/float/anchor_in_caption.pl
+++ b/tp/t/results/float/anchor_in_caption.pl
@@ -434,7 +434,7 @@ $result_converted{'html'}->{'anchor_in_caption'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 <dl class="listoffloats">
 <dt><a href="#label">fl 1</a></dt><dd><p>in caption</p></dd>
diff --git a/tp/t/results/float/cindex_in_caption.pl 
b/tp/t/results/float/cindex_in_caption.pl
index afd19327ee..22d7a8a6c2 100644
--- a/tp/t/results/float/cindex_in_caption.pl
+++ b/tp/t/results/float/cindex_in_caption.pl
@@ -529,7 +529,7 @@ a.summary-letter-printindex {text-decoration: none}
 </head>
 
 <body lang="en">
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 <dl class="listoffloats">
 <dt><a href="#label">fl 1</a></dt><dd><p>in caption
diff --git a/tp/t/results/float/comment_space_comand_in_float.pl 
b/tp/t/results/float/comment_space_comand_in_float.pl
index 4476ca2b19..06c5464fbe 100644
--- a/tp/t/results/float/comment_space_comand_in_float.pl
+++ b/tp/t/results/float/comment_space_comand_in_float.pl
@@ -408,7 +408,7 @@ 
$result_converted{'html'}->{'comment_space_comand_in_float'} = '<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 <div class="float" id="label--">
 <p>Float
diff --git a/tp/t/results/float/complex_float.pl 
b/tp/t/results/float/complex_float.pl
index 0d47b8ede8..7bbd16b1fc 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -4879,7 +4879,7 @@ ul.mark-minus {list-style-type: "\\2212"}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">A chapter</a> &nbsp; </p>
@@ -4999,7 +4999,7 @@ A footnote.
 <li><a href="#chapter" accesskey="1">A chapter</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">Test floats</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Test floats</a> &nbsp; </p>
diff --git a/tp/t/results/float/float_copying.pl 
b/tp/t/results/float/float_copying.pl
index f8f48192c7..a2aeccd373 100644
--- a/tp/t/results/float/float_copying.pl
+++ b/tp/t/results/float/float_copying.pl
@@ -1628,7 +1628,7 @@ a.summary-letter-printindex {text-decoration: none}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#Copying-and-floats" accesskey="n" rel="next">Copying and 
floats</a> &nbsp; [<a href="#Copying-and-floats" title="Index" 
rel="index">Index</a>]</p>
@@ -1651,7 +1651,7 @@ the author abandon his copyright.
 <li><a href="#Copying-and-floats" accesskey="1">Copying and floats</a></li>
 </ul>
 <hr>
-<div class="appendix" id="Copying-and-floats">
+<div class="appendix-level-extent" id="Copying-and-floats">
 <div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">Top</a> &nbsp; [<a href="#Copying-and-floats" 
title="Index" rel="index">Index</a>]</p>
diff --git a/tp/t/results/float/footnote_in_caption.pl 
b/tp/t/results/float/footnote_in_caption.pl
index 6f98a66b83..6cb0d57f4e 100644
--- a/tp/t/results/float/footnote_in_caption.pl
+++ b/tp/t/results/float/footnote_in_caption.pl
@@ -444,7 +444,7 @@ $result_converted{'html'}->{'footnote_in_caption'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 <dl class="listoffloats">
 <dt><a href="#label">fl 1</a></dt><dd><p>in caption<a class="footnote" 
id="t_hlistoffloats_DOCF1_1" 
href="#t_hlistoffloats_FOOT1_1"><sup>1</sup></a></p></dd>
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 f48ce9fa21..bbdb0756da 100644
--- a/tp/t/results/float/footnote_in_caption_and_error.pl
+++ b/tp/t/results/float/footnote_in_caption_and_error.pl
@@ -431,7 +431,7 @@ 
$result_converted{'html'}->{'footnote_in_caption_and_error'} = '<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 <dl class="listoffloats">
 <dt><a href="#label">fl 1</a></dt><dd><p>in caption<a class="footnote" 
id="t_hlistoffloats_DOCF1_1" 
href="#t_hlistoffloats_FOOT1_1"><sup>1</sup></a></p></dd>
diff --git a/tp/t/results/float/numbering_captions_listoffloats.pl 
b/tp/t/results/float/numbering_captions_listoffloats.pl
index e31a739aab..9bb28b3dcb 100644
--- a/tp/t/results/float/numbering_captions_listoffloats.pl
+++ b/tp/t/results/float/numbering_captions_listoffloats.pl
@@ -8051,7 +8051,7 @@ 
$result_converted{'html'}->{'numbering_captions_listoffloats'} = '<!DOCTYPE html
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">A chapter</a> &nbsp; </p>
@@ -8112,7 +8112,7 @@ Next: <a href="#chapter" accesskey="n" rel="next">A 
chapter</a> &nbsp; </p>
 <li><a href="#list-of-floats" accesskey="5">list of floats</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
 Next: <a href="#Unnumbered" accesskey="n" rel="next">Unnumbered</a>, Previous: 
<a href="#Top" accesskey="p" rel="prev">Test floats</a>, Up: <a href="#Top" 
accesskey="u" rel="up">Test floats</a> &nbsp; </p>
@@ -8149,7 +8149,7 @@ Next: <a href="#Unnumbered" accesskey="n" 
rel="next">Unnumbered</a>, Previous: <
 <li><a href="#section" accesskey="1">A section</a></li>
 </ul>
 <hr>
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <div class="nav-header">
 <p>
 Up: <a href="#chapter" accesskey="u" rel="up">A chapter</a> &nbsp; </p>
@@ -8165,7 +8165,7 @@ Up: <a href="#chapter" accesskey="u" rel="up">A 
chapter</a> &nbsp; </p>
 <hr>
 </div>
 </div>
-<div class="unnumbered" id="Unnumbered">
+<div class="unnumbered-level-extent" id="Unnumbered">
 <div class="nav-header">
 <p>
 Next: <a href="#Chapter-with-unnumbsubsec" accesskey="n" rel="next">Chapter 
with unnumbsubsec</a>, Previous: <a href="#chapter" accesskey="p" rel="prev">A 
chapter</a>, Up: <a href="#Top" accesskey="u" rel="up">Test floats</a> &nbsp; 
</p>
@@ -8187,7 +8187,7 @@ Next: <a href="#Chapter-with-unnumbsubsec" accesskey="n" 
rel="next">Chapter with
 <li><a href="#Section-within-unnumbered" accesskey="1">Section within 
unnumbered</a></li>
 </ul>
 <hr>
-<div class="section" id="Section-within-unnumbered">
+<div class="section-level-extent" id="Section-within-unnumbered">
 <div class="nav-header">
 <p>
 Up: <a href="#Unnumbered" accesskey="u" rel="up">Unnumbered</a> &nbsp; </p>
@@ -8203,7 +8203,7 @@ Up: <a href="#Unnumbered" accesskey="u" 
rel="up">Unnumbered</a> &nbsp; </p>
 <hr>
 </div>
 </div>
-<div class="chapter" id="Chapter-with-unnumbsubsec">
+<div class="chapter-level-extent" id="Chapter-with-unnumbsubsec">
 <div class="nav-header">
 <p>
 Next: <a href="#Appendix-for-float" accesskey="n" rel="next">Appendix for 
float</a>, Previous: <a href="#Unnumbered" accesskey="p" 
rel="prev">Unnumbered</a>, Up: <a href="#Top" accesskey="u" rel="up">Test 
floats</a> &nbsp; </p>
@@ -8219,7 +8219,7 @@ Next: <a href="#Appendix-for-float" accesskey="n" 
rel="next">Appendix for float<
 <li><a href="#unnumbered-sec" accesskey="1">unnumbered sec</a></li>
 </ul>
 <hr>
-<div class="unnumberedsec" id="unnumbered-sec">
+<div class="unnumberedsec-level-extent" id="unnumbered-sec">
 <div class="nav-header">
 <p>
 Up: <a href="#Chapter-with-unnumbsubsec" accesskey="u" rel="up">Chapter with 
unnumbsubsec</a> &nbsp; </p>
@@ -8240,7 +8240,7 @@ Up: <a href="#Chapter-with-unnumbsubsec" accesskey="u" 
rel="up">Chapter with unn
 <hr>
 </div>
 </div>
-<div class="appendix" id="Appendix-for-float">
+<div class="appendix-level-extent" id="Appendix-for-float">
 <div class="nav-header">
 <p>
 Next: <a href="#list-of-floats" accesskey="n" rel="next">list of floats</a>, 
Previous: <a href="#Chapter-with-unnumbsubsec" accesskey="p" rel="prev">Chapter 
with unnumbsubsec</a>, Up: <a href="#Top" accesskey="u" rel="up">Test 
floats</a> &nbsp; </p>
@@ -8255,7 +8255,7 @@ Next: <a href="#list-of-floats" accesskey="n" 
rel="next">list of floats</a>, Pre
 <div class="caption"><p><strong class="strong">Text A.1: </strong>C appendix 
sec float</p></div></div>
 <hr>
 </div>
-<div class="unnumbered" id="list-of-floats">
+<div class="unnumbered-level-extent" id="list-of-floats">
 <div class="nav-header">
 <p>
 Previous: <a href="#Appendix-for-float" accesskey="p" rel="prev">Appendix for 
float</a>, Up: <a href="#Top" accesskey="u" rel="up">Test floats</a> &nbsp; </p>
diff --git a/tp/t/results/formats_encodings/accent.pl 
b/tp/t/results/formats_encodings/accent.pl
index 3bc38f0bfd..552b23a69b 100644
--- a/tp/t/results/formats_encodings/accent.pl
+++ b/tp/t/results/formats_encodings/accent.pl
@@ -3254,7 +3254,7 @@ should be e‘: è è
 ';
 
 
-$result_converted{'html_text'}->{'accent'} = '<div class="top" id="Top-node">
+$result_converted{'html_text'}->{'accent'} = '<div class="top-level-extent" 
id="Top-node">
 <h1 class="top" id="top">top</h1>
 
 <p>should be e&lsquo;: &egrave; &egrave;
diff --git a/tp/t/results/formats_encodings/accent_enable_encoding.pl 
b/tp/t/results/formats_encodings/accent_enable_encoding.pl
index 6a46acebab..935c6cfbac 100644
--- a/tp/t/results/formats_encodings/accent_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accent_enable_encoding.pl
@@ -3254,7 +3254,7 @@ should be e‘: è è
 ';
 
 
-$result_converted{'html_text'}->{'accent_enable_encoding'} = '<div class="top" 
id="Top-node">
+$result_converted{'html_text'}->{'accent_enable_encoding'} = '<div 
class="top-level-extent" id="Top-node">
 <h1 class="top" id="top">top</h1>
 
 <p>should be e‘: è è
diff --git a/tp/t/results/formats_encodings/accentenc.pl 
b/tp/t/results/formats_encodings/accentenc.pl
index e123ba417b..0f5a5933af 100644
--- a/tp/t/results/formats_encodings/accentenc.pl
+++ b/tp/t/results/formats_encodings/accentenc.pl
@@ -3300,7 +3300,7 @@ should be e\': è è
 
 
 $result_converted{'html_text'}->{'accentenc'} = '
-<div class="top" id="Top-node">
+<div class="top-level-extent" id="Top-node">
 <h1 class="top" id="top">top</h1>
 
 <p>should be e&lsquo;: &egrave; &egrave;
diff --git a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl 
b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
index 02a2841b1f..770d091e7e 100644
--- a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
@@ -3214,7 +3214,7 @@ $result_floats{'accentenc_enable_encoding'} = {};
 
 
 $result_converted{'html_text'}->{'accentenc_enable_encoding'} = '
-<div class="top" id="Top-node">
+<div class="top-level-extent" id="Top-node">
 <h1 class="top" id="top">top</h1>
 
 <p>should be e&lsquo;: è è
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 f23ba42382..07d4996308 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -22884,7 +22884,7 @@ span.sansserif {font-family: sans-serif; font-weight: 
normal}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#-_007b-_007d" accesskey="n" rel="next"> { }</a> &nbsp; </p>
@@ -22922,7 +22922,7 @@ Next: <a href="#-_007b-_007d" accesskey="n" rel="next"> 
{ }</a> &nbsp; </p>
 <li><a 
href="#http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls"><a
 class="url" href="http://somewhere_aaa";>http://somewhere_aaa</a> <a 
class="url" href="url">text</a> <a class="uref" 
href="/man.cgi/1/ls">ls</a></a></li>
 </ul>
 <hr>
-<div class="chapter" id="-_007b-_007d">
+<div class="chapter-level-extent" id="-_007b-_007d">
 <div class="nav-header">
 <p>
 Next: <a href="#----_0021---_002e--_002e-_003f-_0040" accesskey="n" 
rel="next">&nbsp; &nbsp; ! <br> .  . ? @</a>, Previous: <a href="#Top" 
accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
@@ -22931,7 +22931,7 @@ Next: <a href="#----_0021---_002e--_002e-_003f-_0040" 
accesskey="n" rel="next">&
 
 <hr>
 </div>
-<div class="chapter" id="----_0021---_002e--_002e-_003f-_0040">
+<div class="chapter-level-extent" id="----_0021---_002e--_002e-_003f-_0040">
 <div class="nav-header">
 <p>
 Next: <a href="#g_t_0040-_007b-_007d-_005c-_0023" accesskey="n" rel="next">@ { 
} \\ #</a>, Previous: <a href="#-_007b-_007d" accesskey="p" rel="prev"> { 
}</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
@@ -22940,7 +22940,7 @@ Next: <a href="#g_t_0040-_007b-_007d-_005c-_0023" 
accesskey="n" rel="next">@ { }
 
 <hr>
 </div>
-<div class="chapter" id="g_t_0040-_007b-_007d-_005c-_0023">
+<div class="chapter-level-extent" id="g_t_0040-_007b-_007d-_005c-_0023">
 <div class="nav-header">
 <p>
 Next: <a href="#LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e" 
accesskey="n" rel="next">LaTeX TeX &bull; , &copy; &hellip; <small 
class="enddots">...</small></a>, Previous: <a 
href="#----_0021---_002e--_002e-_003f-_0040" accesskey="p" rel="prev">&nbsp; 
&nbsp; ! <br> .  . ? @</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> 
&nbsp; </p>
@@ -22949,7 +22949,7 @@ Next: <a 
href="#LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e" accesskey="n"
 
 <hr>
 </div>
-<div class="chapter" id="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e">
+<div class="chapter-level-extent" 
id="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e">
 <div class="nav-header">
 <p>
 Next: <a href="#g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212" 
accesskey="n" rel="next">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>, 
Previous: <a href="#g_t_0040-_007b-_007d-_005c-_0023" accesskey="p" 
rel="prev">@ { } \\ #</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> 
&nbsp; </p>
@@ -22958,7 +22958,7 @@ Next: <a 
href="#g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212" accesskey
 
 <hr>
 </div>
-<div class="chapter" 
id="g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212">
+<div class="chapter-level-extent" 
id="g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212">
 <div class="nav-header">
 <p>
 Next: <a href="#g_t_2265-_2264-_2192" accesskey="n" rel="next">&ge; &le; 
&rarr;</a>, Previous: <a 
href="#LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e" accesskey="p" 
rel="prev">LaTeX TeX &bull; , &copy; &hellip; <small 
class="enddots">...</small></a>, Up: <a href="#Top" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
@@ -22967,7 +22967,7 @@ Next: <a href="#g_t_2265-_2264-_2192" accesskey="n" 
rel="next">&ge; &le; &rarr;<
 
 <hr>
 </div>
-<div class="chapter" id="g_t_2265-_2264-_2192">
+<div class="chapter-level-extent" id="g_t_2265-_2264-_2192">
 <div class="nav-header">
 <p>
 Next: <a href="#g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae" accesskey="n" 
rel="next">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>, Previous: <a 
href="#g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212" accesskey="p" 
rel="prev">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>, Up: <a href="#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
@@ -22976,7 +22976,7 @@ Next: <a 
href="#g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae" accesskey="n" rel=
 
 <hr>
 </div>
-<div class="chapter" id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae">
+<div class="chapter-level-extent" 
id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae">
 <div class="nav-header">
 <p>
 Next: <a href="#g_t_21d2-_00b0-a-b--_00e5" accesskey="n" rel="next">&rArr; 
&deg; a&nbsp;b a sunny day &aring;</a>, Previous: <a 
href="#g_t_2265-_2264-_2192" accesskey="p" rel="prev">&ge; &le; &rarr;</a>, Up: 
<a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
@@ -22985,7 +22985,7 @@ Next: <a href="#g_t_21d2-_00b0-a-b--_00e5" 
accesskey="n" rel="next">&rArr; &deg;
 
 <hr>
 </div>
-<div class="chapter" id="g_t_21d2-_00b0-a-b--_00e5">
+<div class="chapter-level-extent" id="g_t_21d2-_00b0-a-b--_00e5">
 <div class="nav-header">
 <p>
 Next: <a 
href="#g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe"
 accesskey="n" rel="next">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; 
&Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Previous: <a 
href="#g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae" accesskey="p" 
rel="prev">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
@@ -22994,7 +22994,7 @@ Next: <a 
href="#g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_
 
 <hr>
 </div>
-<div class="chapter" 
id="g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe">
+<div class="chapter-level-extent" 
id="g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe">
 <div class="nav-header">
 <p>
 Next: <a 
href="#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119" 
accesskey="n" rel="next">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; 
&ccedil; &#275; e&#778; e&#779; &#281;</a>, Previous: <a 
href="#g_t_21d2-_00b0-a-b--_00e5" accesskey="p" rel="prev">&rArr; &deg; 
a&nbsp;b a sunny day &aring;</a>, Up: <a href="#Top" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
@@ -23003,7 +23003,7 @@ Next: <a 
href="#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b
 
 <hr>
 </div>
-<div class="chapter" 
id="g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">
+<div class="chapter-level-extent" 
id="g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">
 <div class="nav-header">
 <p>
 Next: <a href="#g_t_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e" accesskey="n" 
rel="next">&#279; &#277; e&#818; &#7865; &#283; j e&#865;e</a>, Previous: <a 
href="#g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe"
 accesskey="p" rel="prev">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; 
&Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
@@ -23012,7 +23012,7 @@ Next: <a 
href="#g_t_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e" accesskey="n" rel="
 
 <hr>
 </div>
-<div class="chapter" id="g_t_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e">
+<div class="chapter-level-extent" 
id="g_t_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e">
 <div class="nav-header">
 <p>
 Next: <a href="#g_t_0131-_1e14-_1e08" accesskey="n" rel="next">i &#274;&#768; 
&#262;&#807;</a>, Previous: <a 
href="#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119" 
accesskey="p" rel="prev">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; 
&ccedil; &#275; e&#778; e&#779; &#281;</a>, Up: <a href="#Top" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
@@ -23021,7 +23021,7 @@ Next: <a href="#g_t_0131-_1e14-_1e08" accesskey="n" 
rel="next">i &#274;&#768; &#
 
 <hr>
 </div>
-<div class="chapter" id="g_t_0131-_1e14-_1e08">
+<div class="chapter-level-extent" id="g_t_0131-_1e14-_1e08">
 <div class="nav-header">
 <p>
 Next: <a href="#g_t_201c-_201d-_2018-_2019-_201e-_201a" accesskey="n" 
rel="next">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Previous: <a 
href="#g_t_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e" accesskey="p" 
rel="prev">&#279; &#277; e&#818; &#7865; &#283; j e&#865;e</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
@@ -23030,7 +23030,7 @@ Next: <a href="#g_t_201c-_201d-_2018-_2019-_201e-_201a" 
accesskey="n" rel="next"
 
 <hr>
 </div>
-<div class="chapter" id="g_t_201c-_201d-_2018-_2019-_201e-_201a">
+<div class="chapter-level-extent" id="g_t_201c-_201d-_2018-_2019-_201e-_201a">
 <div class="nav-header">
 <p>
 Next: <a href="#g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a" accesskey="n" 
rel="next">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>, Previous: <a 
href="#g_t_0131-_1e14-_1e08" accesskey="p" rel="prev">i &#274;&#768; 
&#262;&#807;</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
@@ -23039,7 +23039,7 @@ Next: <a href="#g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a" 
accesskey="n" rel="next"
 
 <hr>
 </div>
-<div class="chapter" id="g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a">
+<div class="chapter-level-extent" id="g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a">
 <div class="nav-header">
 <p>
 Next: <a 
href="#g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027" 
accesskey="n" rel="next">&ldquo; &rdquo; &mdash; &ndash; &lsquo; &rsquo;</a>, 
Previous: <a href="#g_t_201c-_201d-_2018-_2019-_201e-_201a" accesskey="p" 
rel="prev">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
@@ -23048,7 +23048,7 @@ Next: <a 
href="#g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027"
 
 <hr>
 </div>
-<div class="chapter" 
id="g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027">
+<div class="chapter-level-extent" 
id="g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027">
 <div class="nav-header">
 <p>
 Next: <a href="#AAA-AAA-BBB" accesskey="n" rel="next"><acronym class="acronym" 
title="fff">AAA</acronym> (fff) <acronym class="acronym" 
title="fff">AAA</acronym> <acronym class="acronym">BBB</acronym></a>, Previous: 
<a href="#g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a" accesskey="p" 
rel="prev">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
@@ -23057,7 +23057,7 @@ Next: <a href="#AAA-AAA-BBB" accesskey="n" 
rel="next"><acronym class="acronym" t
 
 <hr>
 </div>
-<div class="chapter" id="AAA-AAA-BBB">
+<div class="chapter-level-extent" id="AAA-AAA-BBB">
 <div class="nav-header">
 <p>
 Next: <a href="#CCC-CCC-DDD" accesskey="n" rel="next"><abbr class="abbr" 
title="rrr">CCC</abbr> (rrr) <abbr class="abbr" title="rrr">CCC</abbr> <abbr 
class="abbr">DDD</abbr></a>, Previous: <a 
href="#g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027" 
accesskey="p" rel="prev">&ldquo; &rdquo; &mdash; &ndash; &lsquo; &rsquo;</a>, 
Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
@@ -23066,7 +23066,7 @@ Next: <a href="#CCC-CCC-DDD" accesskey="n" 
rel="next"><abbr class="abbr" title="
 
 <hr>
 </div>
-<div class="chapter" id="CCC-CCC-DDD">
+<div class="chapter-level-extent" id="CCC-CCC-DDD">
 <div class="nav-header">
 <p>
 Next: <a href="#someone_0040somewher-no_005fexplain_0040there" accesskey="n" 
rel="next"><a class="email" href="mailto:someone@somewher";>the someone</a> <a 
class="email" href="mailto:no_explain@there";>no_explain@there</a></a>, 
Previous: <a href="#AAA-AAA-BBB" accesskey="p" rel="prev"><acronym 
class="acronym" title="fff">AAA</acronym> (fff) <acronym class="acronym" 
title="fff">AAA</acronym> <acronym class="acronym">BBB</acronym></a>, Up: <a 
href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
@@ -23075,7 +23075,7 @@ Next: <a 
href="#someone_0040somewher-no_005fexplain_0040there" accesskey="n" rel
 
 <hr>
 </div>
-<div class="chapter" id="someone_0040somewher-no_005fexplain_0040there">
+<div class="chapter-level-extent" 
id="someone_0040somewher-no_005fexplain_0040there">
 <div class="nav-header">
 <p>
 Next: <a href="#f_002d_002dile1-f_002d_002dile" accesskey="n" rel="next"><img 
class="image" src="f--ile1.jpg" alt="f--ile1">  <img class="image" 
src="f--ile.png" alt="alt"></a>, Previous: <a href="#CCC-CCC-DDD" accesskey="p" 
rel="prev"><abbr class="abbr" title="rrr">CCC</abbr> (rrr) <abbr class="abbr" 
title="rrr">CCC</abbr> <abbr class="abbr">DDD</abbr></a>, Up: <a href="#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
@@ -23084,7 +23084,7 @@ Next: <a href="#f_002d_002dile1-f_002d_002dile" 
accesskey="n" rel="next"><img cl
 
 <hr>
 </div>
-<div class="chapter" id="f_002d_002dile1-f_002d_002dile">
+<div class="chapter-level-extent" id="f_002d_002dile1-f_002d_002dile">
 <div class="nav-header">
 <p>
 Next: <a href="#-_0040-_007b_007d-_002e-" accesskey="n" rel="next"><tt 
class="verb"> @ {} . </tt></a>, Previous: <a 
href="#someone_0040somewher-no_005fexplain_0040there" accesskey="p" 
rel="prev"><a class="email" href="mailto:someone@somewher";>the someone</a> <a 
class="email" href="mailto:no_explain@there";>no_explain@there</a></a>, Up: <a 
href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
@@ -23093,7 +23093,7 @@ Next: <a href="#-_0040-_007b_007d-_002e-" accesskey="n" 
rel="next"><tt class="ve
 
 <hr>
 </div>
-<div class="chapter" id="-_0040-_007b_007d-_002e-">
+<div class="chapter-level-extent" id="-_0040-_007b_007d-_002e-">
 <div class="nav-header">
 <p>
 Next: <a href="#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i" accesskey="n" 
rel="next"><cite class="cite">cite asis</cite> in&nbsp;@w&nbsp;<b 
class="b">b</b><!-- /@w --> <span class="r">in r</span> <small 
class="sc">SC</small> <strong class="strong">str</strong> <code 
class="t">t</code> <var class="var">var</var> <em class="dfn">dfn</em> <i 
class="i">i</i></a>, Previous: <a href="#f_002d_002dile1-f_002d_002dile" 
accesskey="p" rel="prev"><img class="image" src="f--ile1.jpg" alt="f--ile1" 
[...]
@@ -23102,7 +23102,7 @@ Next: <a 
href="#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i" accesskey="n" rel
 
 <hr>
 </div>
-<div class="chapter" id="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i">
+<div class="chapter-level-extent" 
id="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i">
 <div class="nav-header">
 <p>
 Next: <a href="#env-code-option-samp-command-file-C_002dx-ESC" accesskey="n" 
rel="next"><code class="env">env</code> <code class="code">code</code> <samp 
class="option">option</samp> &lsquo;<samp class="samp">samp</samp>&rsquo; <code 
class="command">command</code> <samp class="file">file</samp> <kbd 
class="kbd">C-x <kbd class="key">ESC</kbd></kbd></a>, Previous: <a 
href="#-_0040-_007b_007d-_002e-" accesskey="p" rel="prev"><tt class="verb"> @ 
{} . </tt></a>, Up: <a href="#Top" accesskey=" [...]
@@ -23111,7 +23111,7 @@ Next: <a 
href="#env-code-option-samp-command-file-C_002dx-ESC" accesskey="n" rel
 
 <hr>
 </div>
-<div class="chapter" id="env-code-option-samp-command-file-C_002dx-ESC">
+<div class="chapter-level-extent" 
id="env-code-option-samp-command-file-C_002dx-ESC">
 <div class="nav-header">
 <p>
 Next: <a href="#g_t8_002e27in" accesskey="n" rel="next">8.27<span 
class="dmn">in</span></a>, Previous: <a 
href="#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i" accesskey="p" 
rel="prev"><cite class="cite">cite asis</cite> in&nbsp;@w&nbsp;<b 
class="b">b</b><!-- /@w --> <span class="r">in r</span> <small 
class="sc">SC</small> <strong class="strong">str</strong> <code 
class="t">t</code> <var class="var">var</var> <em class="dfn">dfn</em> <i 
class="i">i</i></a>, Up: <a href="#Top" accesskey=" [...]
@@ -23120,7 +23120,7 @@ Next: <a href="#g_t8_002e27in" accesskey="n" 
rel="next">8.27<span class="dmn">in
 
 <hr>
 </div>
-<div class="chapter" id="g_t8_002e27in">
+<div class="chapter-level-extent" id="g_t8_002e27in">
 <div class="nav-header">
 <p>
 Next: <a href="#sansserif-slanted" accesskey="n" rel="next"><span 
class="sansserif">sansserif</span> <i class="slanted">slanted</i></a>, 
Previous: <a href="#env-code-option-samp-command-file-C_002dx-ESC" 
accesskey="p" rel="prev"><code class="env">env</code> <code 
class="code">code</code> <samp class="option">option</samp> &lsquo;<samp 
class="samp">samp</samp>&rsquo; <code class="command">command</code> <samp 
class="file">file</samp> <kbd class="kbd">C-x <kbd 
class="key">ESC</kbd></kbd></ [...]
@@ -23129,7 +23129,7 @@ Next: <a href="#sansserif-slanted" accesskey="n" 
rel="next"><span class="sansser
 
 <hr>
 </div>
-<div class="chapter" id="sansserif-slanted">
+<div class="chapter-level-extent" id="sansserif-slanted">
 <div class="nav-header">
 <p>
 Next: <a href="#indicateurl" accesskey="n" rel="next">&lsquo;<code 
class="indicateurl">indicateurl</code>&rsquo;</a>, Previous: <a 
href="#g_t8_002e27in" accesskey="p" rel="prev">8.27<span 
class="dmn">in</span></a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> 
&nbsp; </p>
@@ -23138,7 +23138,7 @@ Next: <a href="#indicateurl" accesskey="n" 
rel="next">&lsquo;<code class="indica
 
 <hr>
 </div>
-<div class="chapter" id="indicateurl">
+<div class="chapter-level-extent" id="indicateurl">
 <div class="nav-header">
 <p>
 Next: <a href="#gH-3rd" accesskey="n" rel="next"><sub class="sub">g</sub>H 
3<sup class="sup">rd</sup></a>, Previous: <a href="#sansserif-slanted" 
accesskey="p" rel="prev"><span class="sansserif">sansserif</span> <i 
class="slanted">slanted</i></a>, Up: <a href="#Top" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
@@ -23147,7 +23147,7 @@ Next: <a href="#gH-3rd" accesskey="n" rel="next"><sub 
class="sub">g</sub>H 3<sup
 
 <hr>
 </div>
-<div class="chapter" id="gH-3rd">
+<div class="chapter-level-extent" id="gH-3rd">
 <div class="nav-header">
 <p>
 Next: <a 
href="#http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls" 
accesskey="n" rel="next"><a class="url" 
href="http://somewhere_aaa";>http://somewhere_aaa</a> <a class="url" 
href="url">text</a> <a class="uref" href="/man.cgi/1/ls">ls</a></a>, Previous: 
<a href="#indicateurl" accesskey="p" rel="prev">&lsquo;<code 
class="indicateurl">indicateurl</code>&rsquo;</a>, Up: <a href="#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
@@ -23156,7 +23156,7 @@ Next: <a 
href="#http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_
 
 <hr>
 </div>
-<div class="chapter" 
id="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls">
+<div class="chapter-level-extent" 
id="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls">
 <div class="nav-header">
 <p>
 Previous: <a href="#gH-3rd" accesskey="p" rel="prev"><sub class="sub">g</sub>H 
3<sup class="sup">rd</sup></a>, Up: <a href="#Top" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/----_0021---_002e--_002e-_003f-_0040.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/----_0021---_002e--_002e-_003f-_0040.html
index 00b428d75d..4df4aed68e 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/----_0021---_002e--_002e-_003f-_0040.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/----_0021---_002e--_002e-_003f-_0040.html
@@ -27,7 +27,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="----_0021---_002e--_002e-_003f-_0040">
+<div class="chapter-level-extent" id="----_0021---_002e--_002e-_003f-_0040">
 <div class="nav-header">
 <p>
 Next: <a href="_0040-_007b-_007d-_005c-_0023.html" accesskey="n" rel="next">@ 
{ } \ #</a>, Previous: <a href="-_007b-_007d.html" accesskey="p" rel="prev"> { 
}</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/-_0040-_007b_007d-_002e-.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/-_0040-_007b_007d-_002e-.html
index 3d93abe5e1..ac7127ced5 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/-_0040-_007b_007d-_002e-.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/-_0040-_007b_007d-_002e-.html
@@ -25,7 +25,7 @@ span.r {font-family: initial; font-weight: normal}
 </head>
 
 <body lang="en">
-<div class="chapter" id="-_0040-_007b_007d-_002e-">
+<div class="chapter-level-extent" id="-_0040-_007b_007d-_002e-">
 <div class="nav-header">
 <p>
 Next: <a href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html" 
accesskey="n" rel="next"><cite class="cite">cite asis</cite> in&nbsp;@w&nbsp;<b 
class="b">b</b><!-- /@w --> <span class="r">in r</span> <small 
class="sc">SC</small> <strong class="strong">str</strong> <code 
class="t">t</code> <var class="var">var</var> <em class="dfn">dfn</em> <i 
class="i">i</i></a>, Previous: <a href="f_002d_002dile1-f_002d_002dile.html" 
accesskey="p" rel="prev"><img class="image" src="f--ile1.jpg" alt=" [...]
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/-_007b-_007d.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/-_007b-_007d.html
index a475c26686..8b86b62ade 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/-_007b-_007d.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/-_007b-_007d.html
@@ -25,7 +25,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="-_007b-_007d">
+<div class="chapter-level-extent" id="-_007b-_007d">
 <div class="nav-header">
 <p>
 Next: <a href="----_0021---_002e--_002e-_003f-_0040.html" accesskey="n" 
rel="next">&nbsp; &nbsp; ! <br> .  . ? @</a>, Previous: <a href="index.html" 
accesskey="p" rel="prev">Top</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/8_002e27in.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/8_002e27in.html
index 51e14444ca..d2f94bb300 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/8_002e27in.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/8_002e27in.html
@@ -28,7 +28,7 @@ span.sansserif {font-family: sans-serif; font-weight: normal}
 </head>
 
 <body lang="en">
-<div class="chapter" id="g_t8_002e27in">
+<div class="chapter-level-extent" id="g_t8_002e27in">
 <div class="nav-header">
 <p>
 Next: <a href="sansserif-slanted.html" accesskey="n" rel="next"><span 
class="sansserif">sansserif</span> <i class="slanted">slanted</i></a>, 
Previous: <a href="env-code-option-samp-command-file-C_002dx-ESC.html" 
accesskey="p" rel="prev"><code class="env">env</code> <code 
class="code">code</code> <samp class="option">option</samp> &lsquo;<samp 
class="samp">samp</samp>&rsquo; <code class="command">command</code> <samp 
class="file">file</samp> <kbd class="kbd">C-x <kbd class="key">ESC</kbd> [...]
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
index 153f1e8018..afeeb02bc8 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" 
id="g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe">
+<div class="chapter-level-extent" 
id="g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe">
 <div class="nav-header">
 <p>
 Next: <a href="a-e-i-a-a-e-c-e-e-e-e.html" accesskey="n" rel="next">&auml; 
&#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e&#778; e&#779; 
&#281;</a>, Previous: <a href="_21d2-_00b0-a-b--aa.html" accesskey="p" 
rel="prev">&rArr; &deg; a&nbsp;b a sunny day &aring;</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/AAA-AAA-BBB.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/AAA-AAA-BBB.html
index 626d603b90..22c6fb1475 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/AAA-AAA-BBB.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/AAA-AAA-BBB.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="AAA-AAA-BBB">
+<div class="chapter-level-extent" id="AAA-AAA-BBB">
 <div class="nav-header">
 <p>
 Next: <a href="CCC-CCC-DDD.html" accesskey="n" rel="next"><abbr class="abbr" 
title="rrr">CCC</abbr> (rrr) <abbr class="abbr" title="rrr">CCC</abbr> <abbr 
class="abbr">DDD</abbr></a>, Previous: <a 
href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html" 
accesskey="p" rel="prev">&ldquo; &rdquo; &mdash; &ndash; &lsquo; &rsquo;</a>, 
Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/CCC-CCC-DDD.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/CCC-CCC-DDD.html
index 1bd5604f63..c7ec190744 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/CCC-CCC-DDD.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/CCC-CCC-DDD.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="CCC-CCC-DDD">
+<div class="chapter-level-extent" id="CCC-CCC-DDD">
 <div class="nav-header">
 <p>
 Next: <a href="someone_0040somewher-no_005fexplain_0040there.html" 
accesskey="n" rel="next"><a class="email" href="mailto:someone@somewher";>the 
someone</a> <a class="email" 
href="mailto:no_explain@there";>no_explain@there</a></a>, Previous: <a 
href="AAA-AAA-BBB.html" accesskey="p" rel="prev"><acronym class="acronym" 
title="fff">AAA</acronym> (fff) <acronym class="acronym" 
title="fff">AAA</acronym> <acronym class="acronym">BBB</acronym></a>, Up: <a 
href="index.html" accesskey="u" rel="up"> [...]
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
index 0f3da8455b..26d2583bb4 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e">
+<div class="chapter-level-extent" 
id="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e">
 <div class="nav-header">
 <p>
 Next: <a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" 
accesskey="n" rel="next">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>, 
Previous: <a href="_0040-_007b-_007d-_005c-_0023.html" accesskey="p" 
rel="prev">@ { } \ #</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_0040-_007b-_007d-_005c-_0023.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_0040-_007b-_007d-_005c-_0023.html
index d141a2a9e3..0fc3a23e4a 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_0040-_007b-_007d-_005c-_0023.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_0040-_007b-_007d-_005c-_0023.html
@@ -25,7 +25,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="g_t_0040-_007b-_007d-_005c-_0023">
+<div class="chapter-level-extent" id="g_t_0040-_007b-_007d-_005c-_0023">
 <div class="nav-header">
 <p>
 Next: <a href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html" 
accesskey="n" rel="next">LaTeX TeX &bull; , &copy; &hellip; <small 
class="enddots">...</small></a>, Previous: <a 
href="----_0021---_002e--_002e-_003f-_0040.html" accesskey="p" 
rel="prev">&nbsp; &nbsp; ! <br> .  . ? @</a>, Up: <a href="index.html" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html
index 6978f2110f..6f4699e56f 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" 
id="g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027">
+<div class="chapter-level-extent" 
id="g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027">
 <div class="nav-header">
 <p>
 Next: <a href="AAA-AAA-BBB.html" accesskey="n" rel="next"><acronym 
class="acronym" title="fff">AAA</acronym> (fff) <acronym class="acronym" 
title="fff">AAA</acronym> <acronym class="acronym">BBB</acronym></a>, Previous: 
<a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html" accesskey="p" 
rel="prev">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
index ae0ca87a88..53d147508a 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae">
+<div class="chapter-level-extent" 
id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae">
 <div class="nav-header">
 <p>
 Next: <a href="_21d2-_00b0-a-b--aa.html" accesskey="n" rel="next">&rArr; &deg; 
a&nbsp;b a sunny day &aring;</a>, Previous: <a href="_2265-_2264-_2192.html" 
accesskey="p" rel="prev">&ge; &le; &rarr;</a>, Up: <a href="index.html" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_00ab-_00bb-_00ab-_00bb-_2039-_203a.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_00ab-_00bb-_00ab-_00bb-_2039-_203a.html
index e319414b1f..b689d3f8ee 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_00ab-_00bb-_00ab-_00bb-_2039-_203a.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_00ab-_00bb-_00ab-_00bb-_2039-_203a.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a">
+<div class="chapter-level-extent" id="g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a">
 <div class="nav-header">
 <p>
 Next: <a 
href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html" 
accesskey="n" rel="next">&ldquo; &rdquo; &mdash; &ndash; &lsquo; &rsquo;</a>, 
Previous: <a href="_201c-_201d-_2018-_2019-_201e-_201a.html" accesskey="p" 
rel="prev">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
index fc026d1b15..c7949ca05c 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="g_t_201c-_201d-_2018-_2019-_201e-_201a">
+<div class="chapter-level-extent" id="g_t_201c-_201d-_2018-_2019-_201e-_201a">
 <div class="nav-header">
 <p>
 Next: <a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html" accesskey="n" 
rel="next">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>, Previous: <a 
href="i-E-C.html" accesskey="p" rel="prev">i &#274;&#768; &#262;&#807;</a>, Up: 
<a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_21d2-_00b0-a-b--aa.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_21d2-_00b0-a-b--aa.html
index 8f6d850331..1e3e79c703 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_21d2-_00b0-a-b--aa.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_21d2-_00b0-a-b--aa.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="g_t_21d2-_00b0-a-b--_00e5">
+<div class="chapter-level-extent" id="g_t_21d2-_00b0-a-b--_00e5">
 <div class="nav-header">
 <p>
 Next: <a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" accesskey="n" 
rel="next">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; 
&#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Previous: <a 
href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" accesskey="p" 
rel="prev">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html
index a616cc9652..14f8a1282a 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" 
id="g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212">
+<div class="chapter-level-extent" 
id="g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212">
 <div class="nav-header">
 <p>
 Next: <a href="_2265-_2264-_2192.html" accesskey="n" rel="next">&ge; &le; 
&rarr;</a>, Previous: <a 
href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html" accesskey="p" 
rel="prev">LaTeX TeX &bull; , &copy; &hellip; <small 
class="enddots">...</small></a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_2265-_2264-_2192.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_2265-_2264-_2192.html
index 58843700ad..21f4fd964e 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_2265-_2264-_2192.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/_2265-_2264-_2192.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="g_t_2265-_2264-_2192">
+<div class="chapter-level-extent" id="g_t_2265-_2264-_2192">
 <div class="nav-header">
 <p>
 Next: <a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" accesskey="n" 
rel="next">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>, Previous: <a 
href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" accesskey="p" 
rel="prev">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/a-e-i-a-a-e-c-e-e-e-e.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/a-e-i-a-a-e-c-e-e-e-e.html
index 82fc42eb3b..dd46cd89f5 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/a-e-i-a-a-e-c-e-e-e-e.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/a-e-i-a-a-e-c-e-e-e-e.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" 
id="g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">
+<div class="chapter-level-extent" 
id="g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">
 <div class="nav-header">
 <p>
 Next: <a href="e-e-e-e-e-j-ee.html" accesskey="n" rel="next">&#279; &#277; 
e&#818; &#7865; &#283; j e&#865;e</a>, Previous: <a 
href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" accesskey="p" 
rel="prev">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; 
&#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Up: <a href="index.html" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
index 433fee7ed3..8ffc8d4d4b 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
@@ -27,7 +27,7 @@ span.r {font-family: initial; font-weight: normal}
 </head>
 
 <body lang="en">
-<div class="chapter" id="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i">
+<div class="chapter-level-extent" 
id="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i">
 <div class="nav-header">
 <p>
 Next: <a href="env-code-option-samp-command-file-C_002dx-ESC.html" 
accesskey="n" rel="next"><code class="env">env</code> <code 
class="code">code</code> <samp class="option">option</samp> &lsquo;<samp 
class="samp">samp</samp>&rsquo; <code class="command">command</code> <samp 
class="file">file</samp> <kbd class="kbd">C-x <kbd 
class="key">ESC</kbd></kbd></a>, Previous: <a 
href="-_0040-_007b_007d-_002e-.html" accesskey="p" rel="prev"><tt class="verb"> 
@ {} . </tt></a>, Up: <a href="index.htm [...]
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/e-e-e-e-e-j-ee.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/e-e-e-e-e-j-ee.html
index 910191b6df..809734a36e 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/e-e-e-e-e-j-ee.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/e-e-e-e-e-j-ee.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="g_t_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e">
+<div class="chapter-level-extent" 
id="g_t_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e">
 <div class="nav-header">
 <p>
 Next: <a href="i-E-C.html" accesskey="n" rel="next">i &#274;&#768; 
&#262;&#807;</a>, Previous: <a href="a-e-i-a-a-e-c-e-e-e-e.html" accesskey="p" 
rel="prev">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; 
e&#778; e&#779; &#281;</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
index 6e4757a18b..89e4a5b85b 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
@@ -27,7 +27,7 @@ span.r {font-family: initial; font-weight: normal}
 </head>
 
 <body lang="en">
-<div class="chapter" id="env-code-option-samp-command-file-C_002dx-ESC">
+<div class="chapter-level-extent" 
id="env-code-option-samp-command-file-C_002dx-ESC">
 <div class="nav-header">
 <p>
 Next: <a href="8_002e27in.html" accesskey="n" rel="next">8.27<span 
class="dmn">in</span></a>, Previous: <a 
href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html" accesskey="p" 
rel="prev"><cite class="cite">cite asis</cite> in&nbsp;@w&nbsp;<b 
class="b">b</b><!-- /@w --> <span class="r">in r</span> <small 
class="sc">SC</small> <strong class="strong">str</strong> <code 
class="t">t</code> <var class="var">var</var> <em class="dfn">dfn</em> <i 
class="i">i</i></a>, Up: <a href="index.html"  [...]
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/f_002d_002dile1-f_002d_002dile.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/f_002d_002dile1-f_002d_002dile.html
index d52484ce73..78631a90d9 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/f_002d_002dile1-f_002d_002dile.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/f_002d_002dile1-f_002d_002dile.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="f_002d_002dile1-f_002d_002dile">
+<div class="chapter-level-extent" id="f_002d_002dile1-f_002d_002dile">
 <div class="nav-header">
 <p>
 Next: <a href="-_0040-_007b_007d-_002e-.html" accesskey="n" rel="next"><tt 
class="verb"> @ {} . </tt></a>, Previous: <a 
href="someone_0040somewher-no_005fexplain_0040there.html" accesskey="p" 
rel="prev"><a class="email" href="mailto:someone@somewher";>the someone</a> <a 
class="email" href="mailto:no_explain@there";>no_explain@there</a></a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/gH-3rd.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/gH-3rd.html
index e4d5cb9c6c..4110ed55a4 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/gH-3rd.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/gH-3rd.html
@@ -28,7 +28,7 @@ span.sansserif {font-family: sans-serif; font-weight: normal}
 </head>
 
 <body lang="en">
-<div class="chapter" id="gH-3rd">
+<div class="chapter-level-extent" id="gH-3rd">
 <div class="nav-header">
 <p>
 Next: <a 
href="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html"
 accesskey="n" rel="next"><a class="url" 
href="http://somewhere_aaa";>http://somewhere_aaa</a> <a class="url" 
href="url">text</a> <a class="uref" href="/man.cgi/1/ls">ls</a></a>, Previous: 
<a href="indicateurl.html" accesskey="p" rel="prev">&lsquo;<code 
class="indicateurl">indicateurl</code>&rsquo;</a>, Up: <a href="index.html" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
index 5132147a7f..24c5d8e432 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
@@ -27,7 +27,7 @@ span.sansserif {font-family: sans-serif; font-weight: normal}
 </head>
 
 <body lang="en">
-<div class="chapter" 
id="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls">
+<div class="chapter-level-extent" 
id="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls">
 <div class="nav-header">
 <p>
 Previous: <a href="gH-3rd.html" accesskey="p" rel="prev"><sub 
class="sub">g</sub>H 3<sup class="sup">rd</sup></a>, Up: <a href="index.html" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/i-E-C.html 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/i-E-C.html
index b5330ba251..543aa80840 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/i-E-C.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/i-E-C.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="g_t_0131-_1e14-_1e08">
+<div class="chapter-level-extent" id="g_t_0131-_1e14-_1e08">
 <div class="nav-header">
 <p>
 Next: <a href="_201c-_201d-_2018-_2019-_201e-_201a.html" accesskey="n" 
rel="next">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Previous: <a 
href="e-e-e-e-e-j-ee.html" accesskey="p" rel="prev">&#279; &#277; e&#818; 
&#7865; &#283; j e&#865;e</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/index.html 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/index.html
index 95a97046bf..174adfb301 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/index.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/index.html
@@ -27,7 +27,7 @@ span.sansserif {font-family: sans-serif; font-weight: normal}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="-_007b-_007d.html" accesskey="n" rel="next"> { }</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/indicateurl.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/indicateurl.html
index f7ce97d044..f6400b42e3 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/indicateurl.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/indicateurl.html
@@ -28,7 +28,7 @@ span.sansserif {font-family: sans-serif; font-weight: normal}
 </head>
 
 <body lang="en">
-<div class="chapter" id="indicateurl">
+<div class="chapter-level-extent" id="indicateurl">
 <div class="nav-header">
 <p>
 Next: <a href="gH-3rd.html" accesskey="n" rel="next"><sub class="sub">g</sub>H 
3<sup class="sup">rd</sup></a>, Previous: <a href="sansserif-slanted.html" 
accesskey="p" rel="prev"><span class="sansserif">sansserif</span> <i 
class="slanted">slanted</i></a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/sansserif-slanted.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/sansserif-slanted.html
index 8f0b1d724e..21655162da 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/sansserif-slanted.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/sansserif-slanted.html
@@ -28,7 +28,7 @@ span.sansserif {font-family: sans-serif; font-weight: normal}
 </head>
 
 <body lang="en">
-<div class="chapter" id="sansserif-slanted">
+<div class="chapter-level-extent" id="sansserif-slanted">
 <div class="nav-header">
 <p>
 Next: <a href="indicateurl.html" accesskey="n" rel="next">&lsquo;<code 
class="indicateurl">indicateurl</code>&rsquo;</a>, Previous: <a 
href="8_002e27in.html" accesskey="p" rel="prev">8.27<span 
class="dmn">in</span></a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/someone_0040somewher-no_005fexplain_0040there.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/someone_0040somewher-no_005fexplain_0040there.html
index 9220c4c5be..661270741e 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/someone_0040somewher-no_005fexplain_0040there.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/someone_0040somewher-no_005fexplain_0040there.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="someone_0040somewher-no_005fexplain_0040there">
+<div class="chapter-level-extent" 
id="someone_0040somewher-no_005fexplain_0040there">
 <div class="nav-header">
 <p>
 Next: <a href="f_002d_002dile1-f_002d_002dile.html" accesskey="n" 
rel="next"><img class="image" src="f--ile1.jpg" alt="f--ile1">  <img 
class="image" src="f--ile.png" alt="alt"></a>, Previous: <a 
href="CCC-CCC-DDD.html" accesskey="p" rel="prev"><abbr class="abbr" 
title="rrr">CCC</abbr> (rrr) <abbr class="abbr" title="rrr">CCC</abbr> <abbr 
class="abbr">DDD</abbr></a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/----_0021---_002e--_002e-_003f-_0040.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/----_0021---_002e--_002e-_003f-_0040.html
index 885b2c2b1d..23ec6814e6 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/----_0021---_002e--_002e-_003f-_0040.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/----_0021---_002e--_002e-_003f-_0040.html
@@ -27,7 +27,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="----_0021---_002e--_002e-_003f-_0040">
+<div class="chapter-level-extent" id="----_0021---_002e--_002e-_003f-_0040">
 <div class="nav-header">
 <p>
 Next: <a href="_0040-_007b-_007d-_005c-_0023.html" accesskey="n" rel="next">@ 
{ } \ #</a>, Previous: <a href="-_007b-_007d.html" accesskey="p" rel="prev"> { 
}</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/-_0040-_007b_007d-_002e-.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/-_0040-_007b_007d-_002e-.html
index 32ee193f62..6f2397d75f 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/-_0040-_007b_007d-_002e-.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/-_0040-_007b_007d-_002e-.html
@@ -25,7 +25,7 @@ span.r {font-family: initial; font-weight: normal}
 </head>
 
 <body lang="en">
-<div class="chapter" id="-_0040-_007b_007d-_002e-">
+<div class="chapter-level-extent" id="-_0040-_007b_007d-_002e-">
 <div class="nav-header">
 <p>
 Next: <a href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html" 
accesskey="n" rel="next"><cite class="cite">cite asis</cite> in&nbsp;@w&nbsp;<b 
class="b">b</b><!-- /@w --> <span class="r">in r</span> <small 
class="sc">SC</small> <strong class="strong">str</strong> <code 
class="t">t</code> <var class="var">var</var> <em class="dfn">dfn</em> <i 
class="i">i</i></a>, Previous: <a href="f_002d_002dile1-f_002d_002dile.html" 
accesskey="p" rel="prev"><img class="image" src="f--ile1.jpg" alt=" [...]
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/-_007b-_007d.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/-_007b-_007d.html
index 776ff0458d..ed922d4402 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/-_007b-_007d.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/-_007b-_007d.html
@@ -25,7 +25,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="-_007b-_007d">
+<div class="chapter-level-extent" id="-_007b-_007d">
 <div class="nav-header">
 <p>
 Next: <a href="----_0021---_002e--_002e-_003f-_0040.html" accesskey="n" 
rel="next">&nbsp; &nbsp; ! <br> .  . ? @</a>, Previous: <a href="index.html" 
accesskey="p" rel="prev">Top</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/8_002e27in.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/8_002e27in.html
index b5a86b0d53..4052e87c0a 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/8_002e27in.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/8_002e27in.html
@@ -28,7 +28,7 @@ span.sansserif {font-family: sans-serif; font-weight: normal}
 </head>
 
 <body lang="en">
-<div class="chapter" id="g_t8_002e27in">
+<div class="chapter-level-extent" id="g_t8_002e27in">
 <div class="nav-header">
 <p>
 Next: <a href="sansserif-slanted.html" accesskey="n" rel="next"><span 
class="sansserif">sansserif</span> <i class="slanted">slanted</i></a>, 
Previous: <a href="env-code-option-samp-command-file-C_002dx-ESC.html" 
accesskey="p" rel="prev"><code class="env">env</code> <code 
class="code">code</code> <samp class="option">option</samp> &lsquo;<samp 
class="samp">samp</samp>&rsquo; <code class="command">command</code> <samp 
class="file">file</samp> <kbd class="kbd">C-x <kbd class="key">ESC</kbd> [...]
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
index fa28536eb9..b584827cd2 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" 
id="g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe">
+<div class="chapter-level-extent" 
id="g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe">
 <div class="nav-header">
 <p>
 Next: <a href="a-e-i-a-a-e-c-e-e-e-e.html" accesskey="n" rel="next">&auml; 
&#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e&#778; e&#779; 
&#281;</a>, Previous: <a href="_21d2-_00b0-a-b--aa.html" accesskey="p" 
rel="prev">&rArr; &deg; a&nbsp;b a sunny day &aring;</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/AAA-AAA-BBB.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/AAA-AAA-BBB.html
index d1d639eef3..96114bc7dd 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/AAA-AAA-BBB.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/AAA-AAA-BBB.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="AAA-AAA-BBB">
+<div class="chapter-level-extent" id="AAA-AAA-BBB">
 <div class="nav-header">
 <p>
 Next: <a href="CCC-CCC-DDD.html" accesskey="n" rel="next"><abbr class="abbr" 
title="rrr">CCC</abbr> (rrr) <abbr class="abbr" title="rrr">CCC</abbr> <abbr 
class="abbr">DDD</abbr></a>, Previous: <a 
href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html" 
accesskey="p" rel="prev">&ldquo; &rdquo; &mdash; &ndash; &lsquo; &rsquo;</a>, 
Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/CCC-CCC-DDD.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/CCC-CCC-DDD.html
index 5792d36dec..4171ea7cc7 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/CCC-CCC-DDD.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/CCC-CCC-DDD.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="CCC-CCC-DDD">
+<div class="chapter-level-extent" id="CCC-CCC-DDD">
 <div class="nav-header">
 <p>
 Next: <a href="someone_0040somewher-no_005fexplain_0040there.html" 
accesskey="n" rel="next"><a class="email" href="mailto:someone@somewher";>the 
someone</a> <a class="email" 
href="mailto:no_explain@there";>no_explain@there</a></a>, Previous: <a 
href="AAA-AAA-BBB.html" accesskey="p" rel="prev"><acronym class="acronym" 
title="fff">AAA</acronym> (fff) <acronym class="acronym" 
title="fff">AAA</acronym> <acronym class="acronym">BBB</acronym></a>, Up: <a 
href="index.html" accesskey="u" rel="up"> [...]
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
index 1632bb09e1..a2d2ca6901 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e">
+<div class="chapter-level-extent" 
id="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e">
 <div class="nav-header">
 <p>
 Next: <a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" 
accesskey="n" rel="next">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>, 
Previous: <a href="_0040-_007b-_007d-_005c-_0023.html" accesskey="p" 
rel="prev">@ { } \ #</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_0040-_007b-_007d-_005c-_0023.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_0040-_007b-_007d-_005c-_0023.html
index f5daf1b923..6e393ef790 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_0040-_007b-_007d-_005c-_0023.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_0040-_007b-_007d-_005c-_0023.html
@@ -25,7 +25,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="g_t_0040-_007b-_007d-_005c-_0023">
+<div class="chapter-level-extent" id="g_t_0040-_007b-_007d-_005c-_0023">
 <div class="nav-header">
 <p>
 Next: <a href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html" 
accesskey="n" rel="next">LaTeX TeX &bull; , &copy; &hellip; <small 
class="enddots">...</small></a>, Previous: <a 
href="----_0021---_002e--_002e-_003f-_0040.html" accesskey="p" 
rel="prev">&nbsp; &nbsp; ! <br> .  . ? @</a>, Up: <a href="index.html" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html
index 0dc7a87b66..a057de8f89 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" 
id="g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027">
+<div class="chapter-level-extent" 
id="g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027">
 <div class="nav-header">
 <p>
 Next: <a href="AAA-AAA-BBB.html" accesskey="n" rel="next"><acronym 
class="acronym" title="fff">AAA</acronym> (fff) <acronym class="acronym" 
title="fff">AAA</acronym> <acronym class="acronym">BBB</acronym></a>, Previous: 
<a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html" accesskey="p" 
rel="prev">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
index ffe317d152..cb78606712 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae">
+<div class="chapter-level-extent" 
id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae">
 <div class="nav-header">
 <p>
 Next: <a href="_21d2-_00b0-a-b--aa.html" accesskey="n" rel="next">&rArr; &deg; 
a&nbsp;b a sunny day &aring;</a>, Previous: <a href="_2265-_2264-_2192.html" 
accesskey="p" rel="prev">&ge; &le; &rarr;</a>, Up: <a href="index.html" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_00ab-_00bb-_00ab-_00bb-_2039-_203a.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_00ab-_00bb-_00ab-_00bb-_2039-_203a.html
index a940287aed..1c05ab2007 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_00ab-_00bb-_00ab-_00bb-_2039-_203a.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_00ab-_00bb-_00ab-_00bb-_2039-_203a.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a">
+<div class="chapter-level-extent" id="g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a">
 <div class="nav-header">
 <p>
 Next: <a 
href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html" 
accesskey="n" rel="next">&ldquo; &rdquo; &mdash; &ndash; &lsquo; &rsquo;</a>, 
Previous: <a href="_201c-_201d-_2018-_2019-_201e-_201a.html" accesskey="p" 
rel="prev">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
index d523915d00..1e3f3045a1 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="g_t_201c-_201d-_2018-_2019-_201e-_201a">
+<div class="chapter-level-extent" id="g_t_201c-_201d-_2018-_2019-_201e-_201a">
 <div class="nav-header">
 <p>
 Next: <a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html" accesskey="n" 
rel="next">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>, Previous: <a 
href="i-E-C.html" accesskey="p" rel="prev">i &#274;&#768; &#262;&#807;</a>, Up: 
<a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_21d2-_00b0-a-b--aa.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_21d2-_00b0-a-b--aa.html
index 7e019b279e..a882890424 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_21d2-_00b0-a-b--aa.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_21d2-_00b0-a-b--aa.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="g_t_21d2-_00b0-a-b--_00e5">
+<div class="chapter-level-extent" id="g_t_21d2-_00b0-a-b--_00e5">
 <div class="nav-header">
 <p>
 Next: <a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" accesskey="n" 
rel="next">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; 
&#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Previous: <a 
href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" accesskey="p" 
rel="prev">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html
index b4e46d4453..a1d4018f29 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" 
id="g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212">
+<div class="chapter-level-extent" 
id="g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212">
 <div class="nav-header">
 <p>
 Next: <a href="_2265-_2264-_2192.html" accesskey="n" rel="next">&ge; &le; 
&rarr;</a>, Previous: <a 
href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html" accesskey="p" 
rel="prev">LaTeX TeX &bull; , &copy; &hellip; <small 
class="enddots">...</small></a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_2265-_2264-_2192.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_2265-_2264-_2192.html
index 2acbc5ceeb..2e692b00c4 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_2265-_2264-_2192.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/_2265-_2264-_2192.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="g_t_2265-_2264-_2192">
+<div class="chapter-level-extent" id="g_t_2265-_2264-_2192">
 <div class="nav-header">
 <p>
 Next: <a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" accesskey="n" 
rel="next">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>, Previous: <a 
href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" accesskey="p" 
rel="prev">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/a-e-i-a-a-e-c-e-e-e-e.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/a-e-i-a-a-e-c-e-e-e-e.html
index 6ff2615b47..6f94af2c6e 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/a-e-i-a-a-e-c-e-e-e-e.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/a-e-i-a-a-e-c-e-e-e-e.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" 
id="g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">
+<div class="chapter-level-extent" 
id="g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">
 <div class="nav-header">
 <p>
 Next: <a href="e-e-e-e-e-j-ee.html" accesskey="n" rel="next">&#279; &#277; 
e&#818; &#7865; &#283; j e&#865;e</a>, Previous: <a 
href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" accesskey="p" 
rel="prev">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; 
&#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Up: <a href="index.html" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
index 59aad0126b..97c3d6d22e 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
@@ -27,7 +27,7 @@ span.r {font-family: initial; font-weight: normal}
 </head>
 
 <body lang="en">
-<div class="chapter" id="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i">
+<div class="chapter-level-extent" 
id="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i">
 <div class="nav-header">
 <p>
 Next: <a href="env-code-option-samp-command-file-C_002dx-ESC.html" 
accesskey="n" rel="next"><code class="env">env</code> <code 
class="code">code</code> <samp class="option">option</samp> &lsquo;<samp 
class="samp">samp</samp>&rsquo; <code class="command">command</code> <samp 
class="file">file</samp> <kbd class="kbd">C-x <kbd 
class="key">ESC</kbd></kbd></a>, Previous: <a 
href="-_0040-_007b_007d-_002e-.html" accesskey="p" rel="prev"><tt class="verb"> 
@ {} . </tt></a>, Up: <a href="index.htm [...]
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/e-e-e-e-e-j-ee.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/e-e-e-e-e-j-ee.html
index 5317a1be92..c04559d17b 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/e-e-e-e-e-j-ee.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/e-e-e-e-e-j-ee.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="g_t_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e">
+<div class="chapter-level-extent" 
id="g_t_0117-_0115-e_0332-_1eb9-_011b-j-e_0361e">
 <div class="nav-header">
 <p>
 Next: <a href="i-E-C.html" accesskey="n" rel="next">i &#274;&#768; 
&#262;&#807;</a>, Previous: <a href="a-e-i-a-a-e-c-e-e-e-e.html" accesskey="p" 
rel="prev">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; 
e&#778; e&#779; &#281;</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
index 07f3726cd2..f8bb528954 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
@@ -27,7 +27,7 @@ span.r {font-family: initial; font-weight: normal}
 </head>
 
 <body lang="en">
-<div class="chapter" id="env-code-option-samp-command-file-C_002dx-ESC">
+<div class="chapter-level-extent" 
id="env-code-option-samp-command-file-C_002dx-ESC">
 <div class="nav-header">
 <p>
 Next: <a href="8_002e27in.html" accesskey="n" rel="next">8.27<span 
class="dmn">in</span></a>, Previous: <a 
href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html" accesskey="p" 
rel="prev"><cite class="cite">cite asis</cite> in&nbsp;@w&nbsp;<b 
class="b">b</b><!-- /@w --> <span class="r">in r</span> <small 
class="sc">SC</small> <strong class="strong">str</strong> <code 
class="t">t</code> <var class="var">var</var> <em class="dfn">dfn</em> <i 
class="i">i</i></a>, Up: <a href="index.html"  [...]
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/f_002d_002dile1-f_002d_002dile.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/f_002d_002dile1-f_002d_002dile.html
index 165f303d3f..8d5b326d72 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/f_002d_002dile1-f_002d_002dile.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/f_002d_002dile1-f_002d_002dile.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="f_002d_002dile1-f_002d_002dile">
+<div class="chapter-level-extent" id="f_002d_002dile1-f_002d_002dile">
 <div class="nav-header">
 <p>
 Next: <a href="-_0040-_007b_007d-_002e-.html" accesskey="n" rel="next"><tt 
class="verb"> @ {} . </tt></a>, Previous: <a 
href="someone_0040somewher-no_005fexplain_0040there.html" accesskey="p" 
rel="prev"><a class="email" href="mailto:someone@somewher";>the someone</a> <a 
class="email" href="mailto:no_explain@there";>no_explain@there</a></a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/gH-3rd.html 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/gH-3rd.html
index ff23336876..6c45de87b3 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/gH-3rd.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/gH-3rd.html
@@ -28,7 +28,7 @@ span.sansserif {font-family: sans-serif; font-weight: normal}
 </head>
 
 <body lang="en">
-<div class="chapter" id="gH-3rd">
+<div class="chapter-level-extent" id="gH-3rd">
 <div class="nav-header">
 <p>
 Next: <a 
href="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html"
 accesskey="n" rel="next"><a class="url" 
href="http://somewhere_aaa";>http://somewhere_aaa</a> <a class="url" 
href="url">text</a> <a class="uref" href="/man.cgi/1/ls">ls</a></a>, Previous: 
<a href="indicateurl.html" accesskey="p" rel="prev">&lsquo;<code 
class="indicateurl">indicateurl</code>&rsquo;</a>, Up: <a href="index.html" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
index da2b726e6c..8f02d1e685 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
@@ -27,7 +27,7 @@ span.sansserif {font-family: sans-serif; font-weight: normal}
 </head>
 
 <body lang="en">
-<div class="chapter" 
id="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls">
+<div class="chapter-level-extent" 
id="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls">
 <div class="nav-header">
 <p>
 Previous: <a href="gH-3rd.html" accesskey="p" rel="prev"><sub 
class="sub">g</sub>H 3<sup class="sup">rd</sup></a>, Up: <a href="index.html" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/i-E-C.html 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/i-E-C.html
index 180f272ebf..4febd93a0a 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/i-E-C.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/i-E-C.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="g_t_0131-_1e14-_1e08">
+<div class="chapter-level-extent" id="g_t_0131-_1e14-_1e08">
 <div class="nav-header">
 <p>
 Next: <a href="_201c-_201d-_2018-_2019-_201e-_201a.html" accesskey="n" 
rel="next">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Previous: <a 
href="e-e-e-e-e-j-ee.html" accesskey="p" rel="prev">&#279; &#277; e&#818; 
&#7865; &#283; j e&#865;e</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/index.html 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/index.html
index 78e6efcab4..78fb0e56f8 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/index.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/index.html
@@ -27,7 +27,7 @@ span.sansserif {font-family: sans-serif; font-weight: normal}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="-_007b-_007d.html" accesskey="n" rel="next"> { }</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/indicateurl.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/indicateurl.html
index b16b469e87..7d4c4d8a06 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/indicateurl.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/indicateurl.html
@@ -28,7 +28,7 @@ span.sansserif {font-family: sans-serif; font-weight: normal}
 </head>
 
 <body lang="en">
-<div class="chapter" id="indicateurl">
+<div class="chapter-level-extent" id="indicateurl">
 <div class="nav-header">
 <p>
 Next: <a href="gH-3rd.html" accesskey="n" rel="next"><sub class="sub">g</sub>H 
3<sup class="sup">rd</sup></a>, Previous: <a href="sansserif-slanted.html" 
accesskey="p" rel="prev"><span class="sansserif">sansserif</span> <i 
class="slanted">slanted</i></a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/sansserif-slanted.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/sansserif-slanted.html
index 4ff137d999..de9e72b28e 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/sansserif-slanted.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/sansserif-slanted.html
@@ -28,7 +28,7 @@ span.sansserif {font-family: sans-serif; font-weight: normal}
 </head>
 
 <body lang="en">
-<div class="chapter" id="sansserif-slanted">
+<div class="chapter-level-extent" id="sansserif-slanted">
 <div class="nav-header">
 <p>
 Next: <a href="indicateurl.html" accesskey="n" rel="next">&lsquo;<code 
class="indicateurl">indicateurl</code>&rsquo;</a>, Previous: <a 
href="8_002e27in.html" accesskey="p" rel="prev">8.27<span 
class="dmn">in</span></a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/someone_0040somewher-no_005fexplain_0040there.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/someone_0040somewher-no_005fexplain_0040there.html
index db6f1f09bc..0228e6b673 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/someone_0040somewher-no_005fexplain_0040there.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/someone_0040somewher-no_005fexplain_0040there.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="someone_0040somewher-no_005fexplain_0040there">
+<div class="chapter-level-extent" 
id="someone_0040somewher-no_005fexplain_0040there">
 <div class="nav-header">
 <p>
 Next: <a href="f_002d_002dile1-f_002d_002dile.html" accesskey="n" 
rel="next"><img class="image" src="f--ile1.jpg" alt="f--ile1">  <img 
class="image" src="f--ile.png" alt="alt"></a>, Previous: <a 
href="CCC-CCC-DDD.html" accesskey="p" rel="prev"><abbr class="abbr" 
title="rrr">CCC</abbr> (rrr) <abbr class="abbr" title="rrr">CCC</abbr> <abbr 
class="abbr">DDD</abbr></a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
 
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
index 12263a6238..ba9ce162a1 100644
--- 
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
+++ 
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
@@ -25,7 +25,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" 
id="g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db">
+<div class="chapter-level-extent" 
id="g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db">
 <div class="nav-header">
 <p>
 Next: <a href="c.html" accesskey="n" rel="next">�</a>, Previous: <a 
href="a-e-u.html" accesskey="p" rel="prev">� � �</a>, Up: <a href="index.html" 
accesskey="u" rel="up">top</a> &nbsp; [<a href="index.html" title="Index" 
rel="index">Index</a>]</p>
diff --git 
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
 
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
index 90d5ba2f00..d8b42eab11 100644
--- 
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
+++ 
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
@@ -25,7 +25,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" 
id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc">
+<div class="chapter-level-extent" 
id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc">
 <div class="nav-header">
 <p>
 Next: <a href="e.html" accesskey="n" rel="next">�</a>, Previous: <a 
href="index.html" accesskey="p" rel="prev">top</a>, Up: <a href="index.html" 
accesskey="u" rel="up">top</a> &nbsp; [<a href="index.html" title="Index" 
rel="index">Index</a>]</p>
diff --git 
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/a-e-u.html 
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/a-e-u.html
index 4bc40c4659..a504cd8b61 100644
--- 
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/a-e-u.html
+++ 
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/a-e-u.html
@@ -25,7 +25,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="g_t_00e0-_00e8-_00f9">
+<div class="chapter-level-extent" id="g_t_00e0-_00e8-_00f9">
 <div class="nav-header">
 <p>
 Next: <a href="a-e-i-o-u-A-E-I-O-U.html" accesskey="n" rel="next">� � � � � � 
� � � �</a>, Previous: <a href="e.html" accesskey="p" rel="prev">�</a>, Up: <a 
href="index.html" accesskey="u" rel="up">top</a> &nbsp; [<a href="index.html" 
title="Index" rel="index">Index</a>]</p>
diff --git 
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/c.html 
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/c.html
index 5537813305..948391f440 100644
--- a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/c.html
+++ b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/c.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="g_t_00e7">
+<div class="chapter-level-extent" id="g_t_00e7">
 <div class="nav-header">
 <p>
 Previous: <a href="a-e-i-o-u-A-E-I-O-U.html" accesskey="p" rel="prev">� � � � 
� � � � � �</a>, Up: <a href="index.html" accesskey="u" rel="up">top</a> &nbsp; 
[<a href="index.html" title="Index" rel="index">Index</a>]</p>
diff --git 
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/e.html 
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/e.html
index dee4e642af..c1d53d6291 100644
--- a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/e.html
+++ b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/e.html
@@ -25,7 +25,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="g_t_00e9">
+<div class="chapter-level-extent" id="g_t_00e9">
 <div class="nav-header">
 <p>
 Next: <a href="a-e-u.html" accesskey="n" rel="next">� � �</a>, Previous: <a 
href="a-e-i-o-u-y-A-E-I-O-U.html" accesskey="p" rel="prev">� � � � � � � � � � 
�</a>, Up: <a href="index.html" accesskey="u" rel="up">top</a> &nbsp; [<a 
href="index.html" title="Index" rel="index">Index</a>]</p>
diff --git 
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/index.html 
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/index.html
index 97fb58f27e..21c687e9a0 100644
--- 
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/index.html
+++ 
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/index.html
@@ -26,7 +26,7 @@ a.summary-letter-printindex {text-decoration: none}
 <body lang="en">
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="a-e-i-o-u-y-A-E-I-O-U.html" accesskey="n" rel="next">� � � � � 
� � � � � �</a> &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
diff --git 
a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
 
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
index b5008a4f4c..50c281ace0 100644
--- 
a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
+++ 
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
@@ -25,7 +25,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" 
id="g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db">
+<div class="chapter-level-extent" 
id="g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db">
 <div class="nav-header">
 <p>
 Next: <a href="c.html" accesskey="n" rel="next">ç</a>, Previous: <a 
href="a-e-u.html" accesskey="p" rel="prev">à è ù</a>, Up: <a href="index.html" 
accesskey="u" rel="up">top</a> &nbsp; [<a href="index.html" title="Index" 
rel="index">Index</a>]</p>
diff --git 
a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
 
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
index c6e8ec1688..a23ac40e33 100644
--- 
a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
+++ 
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
@@ -25,7 +25,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" 
id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc">
+<div class="chapter-level-extent" 
id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc">
 <div class="nav-header">
 <p>
 Next: <a href="e.html" accesskey="n" rel="next">é</a>, Previous: <a 
href="index.html" accesskey="p" rel="prev">top</a>, Up: <a href="index.html" 
accesskey="u" rel="up">top</a> &nbsp; [<a href="index.html" title="Index" 
rel="index">Index</a>]</p>
diff --git 
a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/a-e-u.html 
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/a-e-u.html
index 8869aebc3c..254106613b 100644
--- 
a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/a-e-u.html
+++ 
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/a-e-u.html
@@ -25,7 +25,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="g_t_00e0-_00e8-_00f9">
+<div class="chapter-level-extent" id="g_t_00e0-_00e8-_00f9">
 <div class="nav-header">
 <p>
 Next: <a href="a-e-i-o-u-A-E-I-O-U.html" accesskey="n" rel="next">â ê î ô û Â 
Ê Î Ô Û</a>, Previous: <a href="e.html" accesskey="p" rel="prev">é</a>, Up: <a 
href="index.html" accesskey="u" rel="up">top</a> &nbsp; [<a href="index.html" 
title="Index" rel="index">Index</a>]</p>
diff --git 
a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/c.html 
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/c.html
index 37df30079a..a1677044dc 100644
--- a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/c.html
+++ b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/c.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="g_t_00e7">
+<div class="chapter-level-extent" id="g_t_00e7">
 <div class="nav-header">
 <p>
 Previous: <a href="a-e-i-o-u-A-E-I-O-U.html" accesskey="p" rel="prev">â ê î ô 
û Â Ê Î Ô Û</a>, Up: <a href="index.html" accesskey="u" rel="up">top</a> &nbsp; 
[<a href="index.html" title="Index" rel="index">Index</a>]</p>
diff --git 
a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/e.html 
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/e.html
index 11a5e81bf7..9d4f3948f7 100644
--- a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/e.html
+++ b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/e.html
@@ -25,7 +25,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="g_t_00e9">
+<div class="chapter-level-extent" id="g_t_00e9">
 <div class="nav-header">
 <p>
 Next: <a href="a-e-u.html" accesskey="n" rel="next">à è ù</a>, Previous: <a 
href="a-e-i-o-u-y-A-E-I-O-U.html" accesskey="p" rel="prev">ä ë ï ö ü ÿ Ä Ë Ï Ö 
Ü</a>, Up: <a href="index.html" accesskey="u" rel="up">top</a> &nbsp; [<a 
href="index.html" title="Index" rel="index">Index</a>]</p>
diff --git 
a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/index.html 
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/index.html
index 4476984ee2..dab3c03da9 100644
--- 
a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/index.html
+++ 
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/index.html
@@ -26,7 +26,7 @@ a.summary-letter-printindex {text-decoration: none}
 <body lang="en">
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="a-e-i-o-u-y-A-E-I-O-U.html" accesskey="n" rel="next">ä ë ï ö ü 
ÿ Ä Ë Ï Ö Ü</a> &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
diff --git 
a/tp/t/results/formats_encodings/char_latin2_latin2_in_refs/res_html/A-a-_002c-E-e.html
 
b/tp/t/results/formats_encodings/char_latin2_latin2_in_refs/res_html/A-a-_002c-E-e.html
index 0224e55b1b..3736f55d08 100644
--- 
a/tp/t/results/formats_encodings/char_latin2_latin2_in_refs/res_html/A-a-_002c-E-e.html
+++ 
b/tp/t/results/formats_encodings/char_latin2_latin2_in_refs/res_html/A-a-_002c-E-e.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="g_t_0104-_0105-_02db-_0118-_0119">
+<div class="chapter-level-extent" id="g_t_0104-_0105-_02db-_0118-_0119">
 <div class="nav-header">
 <p>
 Previous: <a href="index.html" accesskey="p" rel="prev">top</a>, Up: <a 
href="index.html" accesskey="u" rel="up">top</a> &nbsp; [<a href="index.html" 
title="Index" rel="index">Index</a>]</p>
diff --git 
a/tp/t/results/formats_encodings/char_latin2_latin2_in_refs/res_html/index.html 
b/tp/t/results/formats_encodings/char_latin2_latin2_in_refs/res_html/index.html
index 00b91f6205..0e5dbf827f 100644
--- 
a/tp/t/results/formats_encodings/char_latin2_latin2_in_refs/res_html/index.html
+++ 
b/tp/t/results/formats_encodings/char_latin2_latin2_in_refs/res_html/index.html
@@ -26,7 +26,7 @@ a.summary-letter-printindex {text-decoration: none}
 <body lang="en">
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="A-a-_002c-E-e.html" accesskey="n" rel="next">� � � � �</a> 
&nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
diff --git 
a/tp/t/results/formats_encodings/japanese_shift_jis/res_html/Introduction.html 
b/tp/t/results/formats_encodings/japanese_shift_jis/res_html/Introduction.html
index 3721a180e1..d5c0a78fb0 100644
--- 
a/tp/t/results/formats_encodings/japanese_shift_jis/res_html/Introduction.html
+++ 
b/tp/t/results/formats_encodings/japanese_shift_jis/res_html/Introduction.html
@@ -31,7 +31,7 @@ legally counts.
 </head>
 
 <body lang="ja">
-<div class="chapter" id="Introduction">
+<div class="chapter-level-extent" id="Introduction">
 <div class="nav-header">
 <p>
 Previous: <a href="Preface.html" accesskey="p" rel="prev">Preface</a>, Up: <a 
href="index.html" accesskey="u" rel="up">GNU LilyPond &mdash; 
�w�K�}�j���A��</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/japanese_shift_jis/res_html/Preface.html 
b/tp/t/results/formats_encodings/japanese_shift_jis/res_html/Preface.html
index 841d121a09..90aeb1bc53 100644
--- a/tp/t/results/formats_encodings/japanese_shift_jis/res_html/Preface.html
+++ b/tp/t/results/formats_encodings/japanese_shift_jis/res_html/Preface.html
@@ -32,7 +32,7 @@ legally counts.
 </head>
 
 <body lang="ja">
-<div class="chapter" id="Preface">
+<div class="chapter-level-extent" id="Preface">
 <div class="nav-header">
 <p>
 Next: <a href="Introduction.html" accesskey="n" rel="next">Introduction</a>, 
Previous: <a href="index.html" accesskey="p" rel="prev">GNU LilyPond &mdash; 
�w�K�}�j���A��</a>, Up: <a href="index.html" accesskey="u" rel="up">GNU 
LilyPond &mdash; �w�K�}�j���A��</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/japanese_shift_jis/res_html/index.html 
b/tp/t/results/formats_encodings/japanese_shift_jis/res_html/index.html
index f220eb3141..a5a2e69caf 100644
--- a/tp/t/results/formats_encodings/japanese_shift_jis/res_html/index.html
+++ b/tp/t/results/formats_encodings/japanese_shift_jis/res_html/index.html
@@ -34,7 +34,7 @@ h1.settitle {text-align:center}
 <h1 class="settitle">GNU LilyPond &ndash; Manuel d&rsquo;initiation 
japanese</h1>
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="Preface.html" accesskey="n" rel="next">Preface</a> &nbsp; </p>
diff --git 
a/tp/t/results/formats_encodings/sample_utf8/res_html/DiYiZhang_0028First-Chapter_0029.html
 
b/tp/t/results/formats_encodings/sample_utf8/res_html/DiYiZhang_0028First-Chapter_0029.html
index f8d1c62ba4..331654cb42 100644
--- 
a/tp/t/results/formats_encodings/sample_utf8/res_html/DiYiZhang_0028First-Chapter_0029.html
+++ 
b/tp/t/results/formats_encodings/sample_utf8/res_html/DiYiZhang_0028First-Chapter_0029.html
@@ -30,7 +30,7 @@ Texinfo中文示例 -->
 </head>
 
 <body lang="en">
-<div class="chapter" id="g_t_7b2c_4e00_7ae0_ff08First-Chapter_ff09">
+<div class="chapter-level-extent" 
id="g_t_7b2c_4e00_7ae0_ff08First-Chapter_ff09">
 <div class="nav-header">
 <p>
 Next: <a href="Second-Chapter-AE-AE-ae-ae.html" accesskey="n" 
rel="next">Chapter 2 AE ĄĘ ae ąę</a>, Previous: <a href="index.html" 
accesskey="p" rel="prev">Texinfo中文示例</a>, Up: <a href="index.html" 
accesskey="u" rel="up">Texinfo中文示例</a> &nbsp; [<a 
href="index.html#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>][<a href="Index-node.html" title="Index" 
rel="index">Index</a>]</p>
diff --git 
a/tp/t/results/formats_encodings/sample_utf8/res_html/Index-node.html 
b/tp/t/results/formats_encodings/sample_utf8/res_html/Index-node.html
index 5924f912f7..566ab49fc4 100644
--- a/tp/t/results/formats_encodings/sample_utf8/res_html/Index-node.html
+++ b/tp/t/results/formats_encodings/sample_utf8/res_html/Index-node.html
@@ -30,7 +30,7 @@ a.summary-letter-printindex {text-decoration: none}
 </head>
 
 <body lang="en">
-<div class="unnumbered" id="Index-node">
+<div class="unnumbered-level-extent" id="Index-node">
 <div class="nav-header">
 <p>
 Previous: <a href="Second-Chapter-AE-AE-ae-ae.html" accesskey="p" 
rel="prev">Chapter 2 AE ĄĘ ae ąę</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Texinfo中文示例</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table 
of contents" rel="contents">Contents</a>][<a href="#Index-node" title="Index" 
rel="index">Index</a>]</p>
diff --git 
a/tp/t/results/formats_encodings/sample_utf8/res_html/Second-Chapter-AE-AE-ae-ae.html
 
b/tp/t/results/formats_encodings/sample_utf8/res_html/Second-Chapter-AE-AE-ae-ae.html
index 6aa68b78f8..3dfd7d8f79 100644
--- 
a/tp/t/results/formats_encodings/sample_utf8/res_html/Second-Chapter-AE-AE-ae-ae.html
+++ 
b/tp/t/results/formats_encodings/sample_utf8/res_html/Second-Chapter-AE-AE-ae-ae.html
@@ -30,7 +30,7 @@ Texinfo中文示例 -->
 </head>
 
 <body lang="en">
-<div class="chapter" id="Second-Chapter-AE-_0104_0118-ae-_0105_0119">
+<div class="chapter-level-extent" 
id="Second-Chapter-AE-_0104_0118-ae-_0105_0119">
 <div class="nav-header">
 <p>
 Next: <a href="Index-node.html" accesskey="n" rel="next">Index</a>, Previous: 
<a href="DiYiZhang_0028First-Chapter_0029.html" accesskey="p" 
rel="prev">第一章(First Chapter)</a>, Up: <a href="index.html" accesskey="u" 
rel="up">Texinfo中文示例</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table 
of contents" rel="contents">Contents</a>][<a href="Index-node.html" 
title="Index" rel="index">Index</a>]</p>
diff --git a/tp/t/results/formats_encodings/sample_utf8/res_html/index.html 
b/tp/t/results/formats_encodings/sample_utf8/res_html/index.html
index 9ec2a99532..89babe4056 100644
--- a/tp/t/results/formats_encodings/sample_utf8/res_html/index.html
+++ b/tp/t/results/formats_encodings/sample_utf8/res_html/index.html
@@ -35,7 +35,7 @@ ul.toc-numbered-mark {list-style: none}
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="DiYiZhang_0028First-Chapter_0029.html" accesskey="n" 
rel="next">第一章(First Chapter)</a> &nbsp; [<a href="#SEC_Contents" title="Table 
of contents" rel="contents">Contents</a>][<a href="Index-node.html" 
title="Index" rel="index">Index</a>]</p>
diff --git a/tp/t/results/formats_encodings/weird_accents.pl 
b/tp/t/results/formats_encodings/weird_accents.pl
index 796c459ccf..e8f792a292 100644
--- a/tp/t/results/formats_encodings/weird_accents.pl
+++ b/tp/t/results/formats_encodings/weird_accents.pl
@@ -648,7 +648,7 @@ i~=
 
 
 $result_converted{'html_text'}->{'weird_accents'} = '
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="top">top</h1>
 
 <p>&#297;&#772;
diff --git a/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl 
b/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
index afda386b1c..edcf1a9808 100644
--- a/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
+++ b/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
@@ -648,7 +648,7 @@ i~=
 
 
 $result_converted{'html_text'}->{'weird_accents_disable_encoding'} = '
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="top">top</h1>
 
 <p>&#297;&#772;
diff --git 
a/tp/t/results/formatting/documentlanguage_set_option/res_html/documentlanguage_set.html
 
b/tp/t/results/formatting/documentlanguage_set_option/res_html/documentlanguage_set.html
index d2cf9b59f9..56115784e3 100644
--- 
a/tp/t/results/formatting/documentlanguage_set_option/res_html/documentlanguage_set.html
+++ 
b/tp/t/results/formatting/documentlanguage_set_option/res_html/documentlanguage_set.html
@@ -26,7 +26,7 @@ span.program-in-footer {font-size: smaller}
 <h1 class="settitle">Test @documentlanguage set</h1>
 <hr>
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="g_t_0040documentlanguage-set">@documentlanguage set</h1>
 
 <p>Text.
diff --git 
a/tp/t/results/formatting/documentlanguage_set_unknown/res_html/documentlanguage_set.html
 
b/tp/t/results/formatting/documentlanguage_set_unknown/res_html/documentlanguage_set.html
index 2379c55953..ca38729336 100644
--- 
a/tp/t/results/formatting/documentlanguage_set_unknown/res_html/documentlanguage_set.html
+++ 
b/tp/t/results/formatting/documentlanguage_set_unknown/res_html/documentlanguage_set.html
@@ -26,7 +26,7 @@ span.program-in-footer {font-size: smaller}
 <h1 class="settitle">Test @documentlanguage set</h1>
 <hr>
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="g_t_0040documentlanguage-set">@documentlanguage set</h1>
 
 <p>Text.
diff --git 
a/tp/t/results/formatting/float_copying/res_html/Copying-and-floats.html 
b/tp/t/results/formatting/float_copying/res_html/Copying-and-floats.html
index d95451b27d..1b5e808f41 100644
--- a/tp/t/results/formatting/float_copying/res_html/Copying-and-floats.html
+++ b/tp/t/results/formatting/float_copying/res_html/Copying-and-floats.html
@@ -29,7 +29,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="appendix" id="Copying-and-floats">
+<div class="appendix-level-extent" id="Copying-and-floats">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git a/tp/t/results/formatting/float_copying/res_html/index.html 
b/tp/t/results/formatting/float_copying/res_html/index.html
index 4d518075b2..8ad8ad8f99 100644
--- a/tp/t/results/formatting/float_copying/res_html/index.html
+++ b/tp/t/results/formatting/float_copying/res_html/index.html
@@ -30,7 +30,7 @@ span.program-in-footer {font-size: smaller}
 <body lang="en">
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="Copying-and-floats.html" 
title="Next section in reading order"> &gt; </a>]</td>
diff --git a/tp/t/results/formatting/texi_bib_example.pl 
b/tp/t/results/formatting/texi_bib_example.pl
index de172ff4d5..72310ece38 100644
--- a/tp/t/results/formatting/texi_bib_example.pl
+++ b/tp/t/results/formatting/texi_bib_example.pl
@@ -5670,7 +5670,7 @@ span.program-in-footer {font-size: smaller}
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#Introduction" title="Next section 
in reading order"> &gt; </a>]</td>
@@ -5691,7 +5691,7 @@ span.program-in-footer {font-size: smaller}
 </pre></th></tr></table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="Introduction">
+<div class="chapter-level-extent" id="Introduction">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -5716,7 +5716,7 @@ currently supported in Texinfo.
 </p>
 <hr>
 </div>
-<div class="chapter" id="References">
+<div class="chapter-level-extent" id="References">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Introduction" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Introduction" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git a/tp/t/results/formatting/texi_glossary.pl 
b/tp/t/results/formatting/texi_glossary.pl
index caa2095c77..ba8bca0e3c 100644
--- a/tp/t/results/formatting/texi_glossary.pl
+++ b/tp/t/results/formatting/texi_glossary.pl
@@ -1598,7 +1598,7 @@ span.program-in-footer {font-size: smaller}
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#glossary" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -1620,7 +1620,7 @@ span.program-in-footer {font-size: smaller}
  is quite specific
 </p>
 <hr style="height: 6px;">
-<div class="chapter" id="glossary">
+<div class="chapter-level-extent" id="glossary">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
diff --git a/tp/t/results/heading/heading_in_copying.pl 
b/tp/t/results/heading/heading_in_copying.pl
index 481c53b888..a1c51bc1d3 100644
--- a/tp/t/results/heading/heading_in_copying.pl
+++ b/tp/t/results/heading/heading_in_copying.pl
@@ -437,7 +437,7 @@ second in copying @ subheading
 
 <body lang="en">
 
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 
 <h3 class="heading" id="in-copying-_0040-heading">in copying @ <em 
class="emph">heading</em></h3>
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 a5ba8615f2..e6ac5b6b32 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
@@ -320,7 +320,7 @@ ul.toc-numbered-mark {list-style: none}
 </head>
 
 <body lang="en">
-<div class="top" id="top">
+<div class="top-level-extent" id="top">
 <h1 class="top">top</h1>
 <div class="element-contents" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
@@ -346,15 +346,15 @@ ul.toc-numbered-mark {list-style: none}
 </ul>
 </div>
 </div>
-<div class="chapter" id="g_t0">
+<div class="chapter-level-extent" id="g_t0">
 <h2 class="chapter">1 0</h2>
 </div>
-<div class="unnumbered" id="g_t_005f">
+<div class="unnumbered-level-extent" id="g_t_005f">
 <h2 class="unnumbered">_</h2>
 <ul class="mini-toc">
 <li><a href="#g_t_003f" accesskey="1">?</a></li>
 </ul>
-<div class="section" id="g_t_003f">
+<div class="section-level-extent" id="g_t_003f">
 <h3 class="section">?</h3>
 
 
diff --git a/tp/t/results/html_tests/check_htmlxref.pl 
b/tp/t/results/html_tests/check_htmlxref.pl
index ebece4a443..55eca49ab1 100644
--- a/tp/t/results/html_tests/check_htmlxref.pl
+++ b/tp/t/results/html_tests/check_htmlxref.pl
@@ -832,7 +832,7 @@ $result_converted{'html'}->{'check_htmlxref'} = '<!DOCTYPE 
html>
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="no_existing_no_manual_direction.html#Top" accesskey="n" 
rel="next">(../there/no_existing_no_manual_direction)</a>, Previous: <a 
href="#first" accesskey="p" rel="prev">first</a>, Up: <a href="dir.html#Top" 
accesskey="u" rel="up">(dir)</a> &nbsp; </p>
@@ -844,11 +844,11 @@ Next: <a href="no_existing_no_manual_direction.html#Top" 
accesskey="n" rel="next
 </p>
 
 <hr>
-<a class="node" id="first"></a><div class="nav-header">
+<a class="node-id" id="first"></a><div class="nav-header">
 <p>
 Next: <a href="no_existing_no_manual.html#Top" accesskey="n" 
rel="next">(no_existing_no_manual.info)</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">first</h4>
+<h4 class="node">first</h4>
 </div>
 
 
diff --git a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl 
b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
index 6f9c947116..abf9a25da3 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
@@ -796,7 +796,7 @@ span:hover a.copiable-anchor {visibility: visible}
 <dd><p>BODY-OF-DESCRIPTION
 </p></dd></dl>
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="top">top</h1>
 
 <dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
diff --git a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl 
b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
index e962c0cd0a..d41ded63cf 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
@@ -738,7 +738,7 @@ span:hover a.copiable-anchor {visibility: visible}
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="top">top</h1>
 
 <dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
diff --git a/tp/t/results/html_tests/documentdescription.pl 
b/tp/t/results/html_tests/documentdescription.pl
index 4fd6730617..f64047231d 100644
--- a/tp/t/results/html_tests/documentdescription.pl
+++ b/tp/t/results/html_tests/documentdescription.pl
@@ -431,7 +431,7 @@ $result_converted{'html'}->{'documentdescription'} = 
'<!DOCTYPE html>
 
 <body lang="en">
 
-<div class="top" id="top">
+<div class="top-level-extent" id="top">
 <h1 class="top">top</h1>
 </div>
 
diff --git a/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl 
b/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
index 04bc06d549..72e3373771 100644
--- a/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
+++ b/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
@@ -272,7 +272,7 @@ 
$result_converted{'html'}->{'empty_lines_at_beginning_no_setfilename'} = '<!DOCT
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="top">top</h1>
 
 </div>
diff --git 
a/tp/t/results/html_tests/footnotestyle_separate_late/res_html/chap-f.html 
b/tp/t/results/html_tests/footnotestyle_separate_late/res_html/chap-f.html
index 95c42f2aaa..32ec2d00d9 100644
--- a/tp/t/results/html_tests/footnotestyle_separate_late/res_html/chap-f.html
+++ b/tp/t/results/html_tests/footnotestyle_separate_late/res_html/chap-f.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="chap-f">
+<div class="chapter-level-extent" id="chap-f">
 <div class="nav-header">
 <p>
 Next: <a href="chap-s.html" accesskey="n" rel="next">Chapter s</a>, Previous: 
<a href="index.html" accesskey="p" rel="prev">top</a>, Up: <a href="index.html" 
accesskey="u" rel="up">top</a> &nbsp; </p>
diff --git 
a/tp/t/results/html_tests/footnotestyle_separate_late/res_html/chap-s.html 
b/tp/t/results/html_tests/footnotestyle_separate_late/res_html/chap-s.html
index 34c466c9b1..145814a849 100644
--- a/tp/t/results/html_tests/footnotestyle_separate_late/res_html/chap-s.html
+++ b/tp/t/results/html_tests/footnotestyle_separate_late/res_html/chap-s.html
@@ -23,7 +23,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="chap-s">
+<div class="chapter-level-extent" id="chap-s">
 <div class="nav-header">
 <p>
 Previous: <a href="chap-f.html" accesskey="p" rel="prev">Chapter f</a>, Up: <a 
href="index.html" accesskey="u" rel="up">top</a> &nbsp; </p>
diff --git 
a/tp/t/results/html_tests/footnotestyle_separate_late/res_html/index.html 
b/tp/t/results/html_tests/footnotestyle_separate_late/res_html/index.html
index f9214c49b6..1880f4ff46 100644
--- a/tp/t/results/html_tests/footnotestyle_separate_late/res_html/index.html
+++ b/tp/t/results/html_tests/footnotestyle_separate_late/res_html/index.html
@@ -23,7 +23,7 @@
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="chap-f.html" accesskey="n" rel="next">Chapter f</a> &nbsp; </p>
diff --git a/tp/t/results/html_tests/html_in_copying.pl 
b/tp/t/results/html_tests/html_in_copying.pl
index 43eae64676..e96bb034de 100644
--- a/tp/t/results/html_tests/html_in_copying.pl
+++ b/tp/t/results/html_tests/html_in_copying.pl
@@ -371,7 +371,7 @@ in <b>html</b> in copying ``  -->
 <body lang="en">
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="top">top</h1>
 
 </div>
diff --git a/tp/t/results/html_tests/index_and_node_same_name.pl 
b/tp/t/results/html_tests/index_and_node_same_name.pl
index 36f167557c..b1689b37db 100644
--- a/tp/t/results/html_tests/index_and_node_same_name.pl
+++ b/tp/t/results/html_tests/index_and_node_same_name.pl
@@ -280,9 +280,9 @@ a.summary-letter-printindex {text-decoration: none}
 </head>
 
 <body lang="en">
-<div class="top" id="top">
+<div class="top-level-extent" id="top">
 <h1 class="top">top</h1>
-<h4 class="node-heading" id="index-node">index node</h4>
+<h4 class="node" id="index-node">index node</h4>
 
 <a class="index-entry-id" id="index-node-1"></a>
 <div class="printindex cp-printindex">
diff --git a/tp/t/results/html_tests/index_below.pl 
b/tp/t/results/html_tests/index_below.pl
index 958ec83a06..4bb9421156 100644
--- a/tp/t/results/html_tests/index_below.pl
+++ b/tp/t/results/html_tests/index_below.pl
@@ -522,7 +522,7 @@ a.summary-letter-printindex {text-decoration: none}
 </head>
 
 <body lang="en">
-<div class="top" id="top">
+<div class="top-level-extent" id="top">
 <div class="nav-header">
 <p>
  &nbsp; [<a href="#chap" title="Index" rel="index">Index</a>]</p>
@@ -533,7 +533,7 @@ a.summary-letter-printindex {text-decoration: none}
 <li><a href="#chap" accesskey="1">chap</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chap">
+<div class="chapter-level-extent" id="chap">
 <div class="nav-header">
 <p>
  Up : <a href="#top" accesskey="u" rel="up">top</a> &nbsp; [<a href="#chap" 
title="Index" rel="index">Index</a>]</p>
@@ -544,7 +544,7 @@ a.summary-letter-printindex {text-decoration: none}
 <li><a href="#sec" accesskey="1">sec</a></li>
 </ul>
 <hr>
-<div class="section" id="sec">
+<div class="section-level-extent" id="sec">
 <div class="nav-header">
 <p>
  Up : <a href="#chap" accesskey="u" rel="up">chap</a> &nbsp; [<a href="#chap" 
title="Index" rel="index">Index</a>]</p>
diff --git 
a/tp/t/results/html_tests/redirection_same_labels/res_html/circumflex.html 
b/tp/t/results/html_tests/redirection_same_labels/res_html/circumflex.html
index 39968a681f..99cac74184 100644
--- a/tp/t/results/html_tests/redirection_same_labels/res_html/circumflex.html
+++ b/tp/t/results/html_tests/redirection_same_labels/res_html/circumflex.html
@@ -23,7 +23,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="circumflex">
+<div class="chapter-level-extent" id="circumflex">
 <div class="nav-header">
 <p>
 Previous: <a href="umlaut.html#umlaut" accesskey="p" rel="prev">umlaut</a>, 
Up: <a href="index.html" accesskey="u" rel="up">the top</a> &nbsp; </p>
@@ -32,11 +32,11 @@ Previous: <a href="umlaut.html#umlaut" accesskey="p" 
rel="prev">umlaut</a>, Up:
 
 
 <hr>
-<a class="node" id="g_t_00ee"></a><div class="nav-header">
+<a class="node-id" id="g_t_00ee"></a><div class="nav-header">
 <p>
 Up: <a href="#circumflex" accesskey="u" rel="up">circumflex</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">&icirc;</h4>
+<h4 class="node">&icirc;</h4>
 </div>
 <hr>
 <div class="nav-header">
diff --git 
a/tp/t/results/html_tests/redirection_same_labels/res_html/index.html 
b/tp/t/results/html_tests/redirection_same_labels/res_html/index.html
index a409e0fcd2..00ac554b8f 100644
--- a/tp/t/results/html_tests/redirection_same_labels/res_html/index.html
+++ b/tp/t/results/html_tests/redirection_same_labels/res_html/index.html
@@ -23,7 +23,7 @@
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="umlaut.html#umlaut" accesskey="n" rel="next">umlaut</a> &nbsp; 
</p>
diff --git 
a/tp/t/results/html_tests/redirection_same_labels/res_html/umlaut.html 
b/tp/t/results/html_tests/redirection_same_labels/res_html/umlaut.html
index a9fe6e2780..b7e1f44895 100644
--- a/tp/t/results/html_tests/redirection_same_labels/res_html/umlaut.html
+++ b/tp/t/results/html_tests/redirection_same_labels/res_html/umlaut.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="umlaut">
+<div class="chapter-level-extent" id="umlaut">
 <div class="nav-header">
 <p>
 Next: <a href="circumflex.html#circumflex" accesskey="n" 
rel="next">circumflex</a>, Previous: <a href="index.html" accesskey="p" 
rel="prev">the top</a>, Up: <a href="index.html" accesskey="u" rel="up">the 
top</a> &nbsp; </p>
@@ -33,18 +33,18 @@ Next: <a href="circumflex.html#circumflex" accesskey="n" 
rel="next">circumflex</
 
 
 <hr>
-<a class="node" id="g_t_00ef"></a><div class="nav-header">
+<a class="node-id" id="g_t_00ef"></a><div class="nav-header">
 <p>
 Next: <a href="#g_t_0129" accesskey="n" rel="next">&#297;</a>, Up: <a 
href="#umlaut" accesskey="u" rel="up">umlaut</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">&iuml;</h4>
+<h4 class="node">&iuml;</h4>
 
 <hr>
-<a class="node" id="g_t_0129"></a><div class="nav-header">
+<a class="node-id" id="g_t_0129"></a><div class="nav-header">
 <p>
 Previous: <a href="#g_t_00ef" accesskey="p" rel="prev">&iuml;</a>, Up: <a 
href="#umlaut" accesskey="u" rel="up">umlaut</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">&#297;</h4>
+<h4 class="node">&#297;</h4>
 
 </div>
 <hr>
diff --git a/tp/t/results/html_tests/ref_in_preformatted.pl 
b/tp/t/results/html_tests/ref_in_preformatted.pl
index 433c06e8e5..e72aa6ce91 100644
--- a/tp/t/results/html_tests/ref_in_preformatted.pl
+++ b/tp/t/results/html_tests/ref_in_preformatted.pl
@@ -461,11 +461,11 @@ $result_floats{'ref_in_preformatted'} = {};
 
 
 
-$result_converted{'html_text'}->{'ref_in_preformatted'} = '<a class="node" 
id="Top"></a><div class="nav-header">
+$result_converted{'html_text'}->{'ref_in_preformatted'} = '<a class="node-id" 
id="Top"></a><div class="nav-header">
 <p>
  &nbsp; </p>
 </div>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 
 
 <div class="example">
@@ -474,11 +474,11 @@ node name</a>
 </pre></div>
 
 <hr>
-<a class="node" id="nnn-the-node-name"></a><div class="nav-header">
+<a class="node-id" id="nnn-the-node-name"></a><div class="nav-header">
 <p>
  &nbsp; </p>
 </div>
-<h4 class="node-heading">nnn the node name</h4>
+<h4 class="node">nnn the node name</h4>
 ';
 
 1;
diff --git a/tp/t/results/html_tests/shortcontents_no_top.pl 
b/tp/t/results/html_tests/shortcontents_no_top.pl
index 89fd5ecd0f..76a75ebf26 100644
--- a/tp/t/results/html_tests/shortcontents_no_top.pl
+++ b/tp/t/results/html_tests/shortcontents_no_top.pl
@@ -251,17 +251,17 @@ ul.toc-numbered-mark {list-style: none}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chap">
+<div class="chapter-level-extent" id="chap">
 <h2 class="chapter">1 chap</h2>
 
 </div>
-<div class="chapter" id="chap2">
+<div class="chapter-level-extent" id="chap2">
 <h2 class="chapter">2 chap2</h2>
 
 <ul class="mini-toc">
 <li><a href="#sec" accesskey="1">sec</a></li>
 </ul>
-<div class="section" id="sec">
+<div class="section-level-extent" id="sec">
 <h3 class="section">2.1 sec</h3>
 
 <div class="element-shortcontents" id="SEC_Shortcontents">
diff --git a/tp/t/results/html_tests/shorttitlepage.pl 
b/tp/t/results/html_tests/shorttitlepage.pl
index 82e134352b..4368202f41 100644
--- a/tp/t/results/html_tests/shorttitlepage.pl
+++ b/tp/t/results/html_tests/shorttitlepage.pl
@@ -429,7 +429,7 @@ h1.shorttitlepage {text-align:center}
 <body lang="en">
 <h1 class="shorttitlepage">@title <small class="sc">HTML</small> <code 
class="code">test</code></h1>
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="Top-of-_0040title-HTML-test">Top of @title <small 
class="sc">HTML</small> <code class="code">test</code></h1>
 
 <p>Top.
diff --git a/tp/t/results/html_tests/simple_menu.pl 
b/tp/t/results/html_tests/simple_menu.pl
index c8069cddff..7fca157343 100644
--- a/tp/t/results/html_tests/simple_menu.pl
+++ b/tp/t/results/html_tests/simple_menu.pl
@@ -2248,7 +2248,7 @@ $result_converted{'html'}->{'simple_menu'} = '<!DOCTYPE 
html>
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <a class="top" id="SEC_Top"></a>
 </div>
 
diff --git a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl 
b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
index 280e4aad33..496f4a402b 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
@@ -687,7 +687,7 @@ 
$result_converted{'html'}->{'test_xrefautomaticsectiontitle'} = '<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#chap" accesskey="n" rel="next">chapter</a> &nbsp; </p>
@@ -699,7 +699,7 @@ Next: <a href="#chap" accesskey="n" rel="next">chapter</a> 
&nbsp; </p>
 <li><a href="#chap" accesskey="1">chapter</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chap">
+<div class="chapter-level-extent" id="chap">
 <div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">top</a> &nbsp; </p>
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 6bc020e004..37898a3af2 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
@@ -699,7 +699,7 @@ 
$result_converted{'html'}->{'test_xrefautomaticsectiontitle_off_first'} = '<!DOC
 <body lang="en">
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#chap" accesskey="n" rel="next">chap</a> &nbsp; </p>
@@ -711,7 +711,7 @@ Next: <a href="#chap" accesskey="n" rel="next">chap</a> 
&nbsp; </p>
 <li><a href="#chap" accesskey="1">chapter</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chap">
+<div class="chapter-level-extent" id="chap">
 <div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
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 da5f6be851..1cb88640e8 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
@@ -351,7 +351,7 @@ ul.toc-numbered-mark {list-style: none}
 
 <p>Some text before top
 </p>
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="top">top</h1>
 
 <p>In top.
@@ -359,7 +359,7 @@ ul.toc-numbered-mark {list-style: none}
 <ul class="mini-toc">
 <li><a href="#the-chap" accesskey="1">the chap</a></li>
 </ul>
-<div class="chapter" id="the-chap">
+<div class="chapter-level-extent" id="the-chap">
 <h2 class="chapter">1 the chap</h2>
 
 
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 0b378831c6..8cb13bf3a9 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
@@ -349,7 +349,7 @@ ul.toc-numbered-mark {list-style: none}
 
 <p>Some text before top
 </p>
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="top">top</h1>
 
 <p>In top.
@@ -357,7 +357,7 @@ ul.toc-numbered-mark {list-style: none}
 <ul class="mini-toc">
 <li><a href="#the-chap" accesskey="1">the chap</a></li>
 </ul>
-<div class="chapter" id="the-chap">
+<div class="chapter-level-extent" id="the-chap">
 <h2 class="chapter">1 the chap</h2>
 
 
diff --git a/tp/t/results/html_tests/titles.pl 
b/tp/t/results/html_tests/titles.pl
index e9899c22a6..2125a3ad8e 100644
--- a/tp/t/results/html_tests/titles.pl
+++ b/tp/t/results/html_tests/titles.pl
@@ -429,7 +429,7 @@ h1.settitle {text-align:center}
 <body lang="en">
 <h1 class="settitle">@title <small class="sc">HTML</small> <code 
class="code">test</code></h1>
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="Top-of-_0040title-HTML-test">Top of @title <small 
class="sc">HTML</small> <code class="code">test</code></h1>
 
 <p>Top.
diff --git a/tp/t/results/htmlxref/htmlxref/res_html/test_refs.html 
b/tp/t/results/htmlxref/htmlxref/res_html/test_refs.html
index 1c72ee50b6..a02101fe55 100644
--- a/tp/t/results/htmlxref/htmlxref/res_html/test_refs.html
+++ b/tp/t/results/htmlxref/htmlxref/res_html/test_refs.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#other-nodes" title="Next section 
in reading order"> &gt; </a>]</td>
@@ -96,7 +96,7 @@ split: ../doc/node.html#node
 </pre></div>
 
 <hr style="height: 6px;">
-<div class="chapter" id="other-nodes">
+<div class="chapter-level-extent" id="other-nodes">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
diff --git 
a/tp/t/results/htmlxref/htmlxref_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
 
b/tp/t/results/htmlxref/htmlxref_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
index f059c3d0b3..3f4fd0459c 100644
--- 
a/tp/t/results/htmlxref/htmlxref_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
+++ 
b/tp/t/results/htmlxref/htmlxref_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<a class="node" 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><table
 class="nav-header" cellpadding="1" cellspacing="1" border="0">
+<a class="node-id" 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><table
 class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="other-nodes.html" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="other-nodes.html" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="other-nodes.html" title="Up 
section"> Up </a>]</td>
@@ -39,7 +39,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<h3 class="node-heading">!_&quot;#$%&amp;'()*+-.</h3>
+<h3 class="node">!_&quot;#$%&amp;'()*+-.</h3>
 <div class="example">
 <pre class="example-preformatted">id: 
_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
 </pre></div>
diff --git 
a/tp/t/results/htmlxref/htmlxref_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
 
b/tp/t/results/htmlxref/htmlxref_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
index 937b61f425..8a783e27d9 100644
--- 
a/tp/t/results/htmlxref/htmlxref_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
+++ 
b/tp/t/results/htmlxref/htmlxref_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<a class="node" 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><table
 class="nav-header" cellpadding="1" cellspacing="1" border="0">
+<a class="node-id" 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><table
 class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="other-nodes.html" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a 
href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html"
 title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="other-nodes.html" title="Up 
section"> Up </a>]</td>
@@ -39,7 +39,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<h3 class="node-heading">/;&lt;=&gt;?[\]^_`|~</h3>
+<h3 class="node">/;&lt;=&gt;?[\]^_`|~</h3>
 <div class="example">
 <pre class="example-preformatted">id: 
002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e
 </pre></div>
diff --git a/tp/t/results/htmlxref/htmlxref_nodes/res_html/index.html 
b/tp/t/results/htmlxref/htmlxref_nodes/res_html/index.html
index 1b882afbbf..3e9ababdd4 100644
--- a/tp/t/results/htmlxref/htmlxref_nodes/res_html/index.html
+++ b/tp/t/results/htmlxref/htmlxref_nodes/res_html/index.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="other-nodes.html" title="Next 
section in reading order"> &gt; </a>]</td>
diff --git a/tp/t/results/htmlxref/htmlxref_nodes/res_html/local-node.html 
b/tp/t/results/htmlxref/htmlxref_nodes/res_html/local-node.html
index 8c608a4e8b..d60b4a17ba 100644
--- a/tp/t/results/htmlxref/htmlxref_nodes/res_html/local-node.html
+++ b/tp/t/results/htmlxref/htmlxref_nodes/res_html/local-node.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<a class="node" id="local-node"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="local-node"></a><table class="nav-header" 
cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="other-nodes.html" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a 
href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html"
 title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="other-nodes.html" title="Up 
section"> Up </a>]</td>
@@ -39,7 +39,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<h3 class="node-heading">local   node</h3>
+<h3 class="node">local   node</h3>
 <div class="example">
 <pre class="example-preformatted">id: local-node
 </pre></div>
diff --git a/tp/t/results/htmlxref/htmlxref_nodes/res_html/other-nodes.html 
b/tp/t/results/htmlxref/htmlxref_nodes/res_html/other-nodes.html
index 7ec5973ed0..404b3c0596 100644
--- a/tp/t/results/htmlxref/htmlxref_nodes/res_html/other-nodes.html
+++ b/tp/t/results/htmlxref/htmlxref_nodes/res_html/other-nodes.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="other-nodes">
+<div class="chapter-level-extent" id="other-nodes">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono/res_html/test_refs.html 
b/tp/t/results/htmlxref/htmlxref_only_mono/res_html/test_refs.html
index 1c72ee50b6..a02101fe55 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono/res_html/test_refs.html
+++ b/tp/t/results/htmlxref/htmlxref_only_mono/res_html/test_refs.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#other-nodes" title="Next section 
in reading order"> &gt; </a>]</td>
@@ -96,7 +96,7 @@ split: ../doc/node.html#node
 </pre></div>
 
 <hr style="height: 6px;">
-<div class="chapter" id="other-nodes">
+<div class="chapter-level-extent" id="other-nodes">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
diff --git 
a/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
 
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
index f059c3d0b3..3f4fd0459c 100644
--- 
a/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
+++ 
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<a class="node" 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><table
 class="nav-header" cellpadding="1" cellspacing="1" border="0">
+<a class="node-id" 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><table
 class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="other-nodes.html" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="other-nodes.html" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="other-nodes.html" title="Up 
section"> Up </a>]</td>
@@ -39,7 +39,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<h3 class="node-heading">!_&quot;#$%&amp;'()*+-.</h3>
+<h3 class="node">!_&quot;#$%&amp;'()*+-.</h3>
 <div class="example">
 <pre class="example-preformatted">id: 
_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
 </pre></div>
diff --git 
a/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
 
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
index 937b61f425..8a783e27d9 100644
--- 
a/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
+++ 
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<a class="node" 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><table
 class="nav-header" cellpadding="1" cellspacing="1" border="0">
+<a class="node-id" 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><table
 class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="other-nodes.html" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a 
href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html"
 title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="other-nodes.html" title="Up 
section"> Up </a>]</td>
@@ -39,7 +39,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<h3 class="node-heading">/;&lt;=&gt;?[\]^_`|~</h3>
+<h3 class="node">/;&lt;=&gt;?[\]^_`|~</h3>
 <div class="example">
 <pre class="example-preformatted">id: 
002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e
 </pre></div>
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/index.html 
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/index.html
index 72de033999..047090ac89 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/index.html
+++ b/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/index.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="other-nodes.html" title="Next 
section in reading order"> &gt; </a>]</td>
diff --git 
a/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/local-node.html 
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/local-node.html
index 8c608a4e8b..d60b4a17ba 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/local-node.html
+++ b/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/local-node.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<a class="node" id="local-node"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="local-node"></a><table class="nav-header" 
cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="other-nodes.html" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a 
href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html"
 title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="other-nodes.html" title="Up 
section"> Up </a>]</td>
@@ -39,7 +39,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<h3 class="node-heading">local   node</h3>
+<h3 class="node">local   node</h3>
 <div class="example">
 <pre class="example-preformatted">id: local-node
 </pre></div>
diff --git 
a/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/other-nodes.html 
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/other-nodes.html
index 7ec5973ed0..404b3c0596 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/other-nodes.html
+++ b/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/other-nodes.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="other-nodes">
+<div class="chapter-level-extent" id="other-nodes">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git a/tp/t/results/htmlxref/htmlxref_only_split/res_html/test_refs.html 
b/tp/t/results/htmlxref/htmlxref_only_split/res_html/test_refs.html
index 7875691a22..4626ac653b 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split/res_html/test_refs.html
+++ b/tp/t/results/htmlxref/htmlxref_only_split/res_html/test_refs.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#other-nodes" title="Next section 
in reading order"> &gt; </a>]</td>
@@ -96,7 +96,7 @@ split: ../doc/node.html#node
 </pre></div>
 
 <hr style="height: 6px;">
-<div class="chapter" id="other-nodes">
+<div class="chapter-level-extent" id="other-nodes">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
diff --git 
a/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
 
b/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
index f059c3d0b3..3f4fd0459c 100644
--- 
a/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
+++ 
b/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<a class="node" 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><table
 class="nav-header" cellpadding="1" cellspacing="1" border="0">
+<a class="node-id" 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><table
 class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="other-nodes.html" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="other-nodes.html" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="other-nodes.html" title="Up 
section"> Up </a>]</td>
@@ -39,7 +39,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<h3 class="node-heading">!_&quot;#$%&amp;'()*+-.</h3>
+<h3 class="node">!_&quot;#$%&amp;'()*+-.</h3>
 <div class="example">
 <pre class="example-preformatted">id: 
_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
 </pre></div>
diff --git 
a/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
 
b/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
index 937b61f425..8a783e27d9 100644
--- 
a/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
+++ 
b/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<a class="node" 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><table
 class="nav-header" cellpadding="1" cellspacing="1" border="0">
+<a class="node-id" 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><table
 class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="other-nodes.html" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a 
href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html"
 title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="other-nodes.html" title="Up 
section"> Up </a>]</td>
@@ -39,7 +39,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<h3 class="node-heading">/;&lt;=&gt;?[\]^_`|~</h3>
+<h3 class="node">/;&lt;=&gt;?[\]^_`|~</h3>
 <div class="example">
 <pre class="example-preformatted">id: 
002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e
 </pre></div>
diff --git 
a/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/index.html 
b/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/index.html
index 1b882afbbf..3e9ababdd4 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/index.html
+++ b/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/index.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="other-nodes.html" title="Next 
section in reading order"> &gt; </a>]</td>
diff --git 
a/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/local-node.html 
b/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/local-node.html
index 8c608a4e8b..d60b4a17ba 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/local-node.html
+++ b/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/local-node.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<a class="node" id="local-node"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="local-node"></a><table class="nav-header" 
cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="other-nodes.html" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a 
href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html"
 title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="other-nodes.html" title="Up 
section"> Up </a>]</td>
@@ -39,7 +39,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<h3 class="node-heading">local   node</h3>
+<h3 class="node">local   node</h3>
 <div class="example">
 <pre class="example-preformatted">id: local-node
 </pre></div>
diff --git 
a/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/other-nodes.html 
b/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/other-nodes.html
index 7ec5973ed0..404b3c0596 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/other-nodes.html
+++ b/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/other-nodes.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="other-nodes">
+<div class="chapter-level-extent" id="other-nodes">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git a/tp/t/results/indices/def_syn_indices.pl 
b/tp/t/results/indices/def_syn_indices.pl
index 3b0f38370d..da9cfd7a24 100644
--- a/tp/t/results/indices/def_syn_indices.pl
+++ b/tp/t/results/indices/def_syn_indices.pl
@@ -2048,7 +2048,7 @@ definedx truc after
 
 $result_converted{'html_text'}->{'def_syn_indices'} = '
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
  &nbsp; [<a href="#Chapter-index" title="Index" rel="index">Index</a>]</p>
@@ -2059,7 +2059,7 @@ $result_converted{'html_text'}->{'def_syn_indices'} = '
 <li><a href="#Chapter-index" accesskey="1">Index</a></li>
 </ul>
 <hr>
-<div class="chapter" id="Chapter-index">
+<div class="chapter-level-extent" id="Chapter-index">
 <div class="nav-header">
 <p>
  &nbsp; [<a href="#Chapter-index" title="Index" rel="index">Index</a>]</p>
diff --git 
a/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl 
b/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
index a8da067ec5..64dc3c2090 100644
--- a/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
+++ b/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
@@ -385,7 +385,7 @@ 
$result_converted{'plaintext'}->{'default_cp_index_and_one_letter_syncodeindex'}
 ';
 
 
-$result_converted{'html_text'}->{'default_cp_index_and_one_letter_syncodeindex'}
 = '<h1 class="node-heading" id="Top">Top</h1>
+$result_converted{'html_text'}->{'default_cp_index_and_one_letter_syncodeindex'}
 = '<h1 class="node" id="Top">Top</h1>
 
 
 <a class="index-entry-id" id="index-_002d_002dcindex"></a>
diff --git a/tp/t/results/indices/double_index_entry.pl 
b/tp/t/results/indices/double_index_entry.pl
index a5a973200b..1b0f6585e8 100644
--- a/tp/t/results/indices/double_index_entry.pl
+++ b/tp/t/results/indices/double_index_entry.pl
@@ -666,11 +666,11 @@ $result_converted{'plaintext'}->{'double_index_entry'} = 
'Text
 ';
 
 
-$result_converted{'html_text'}->{'double_index_entry'} = '<a class="node" 
id="Top"></a><div class="nav-header">
+$result_converted{'html_text'}->{'double_index_entry'} = '<a class="node-id" 
id="Top"></a><div class="nav-header">
 <p>
  &nbsp; [<a href="#other-node" title="Index" rel="index">Index</a>]</p>
 </div>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 
 <a class="index-entry-id" id="index-aaa"></a>
 
@@ -680,11 +680,11 @@ $result_converted{'html_text'}->{'double_index_entry'} = 
'<a class="node" id="To
 
 
 <hr>
-<a class="node" id="other-node"></a><div class="nav-header">
+<a class="node-id" id="other-node"></a><div class="nav-header">
 <p>
  &nbsp; [<a href="#other-node" title="Index" rel="index">Index</a>]</p>
 </div>
-<h4 class="node-heading">other node</h4>
+<h4 class="node">other node</h4>
 
 <a class="index-entry-id" id="index-aaa-2"></a>
 
diff --git a/tp/t/results/indices/double_seeentry_seealso.pl 
b/tp/t/results/indices/double_seeentry_seealso.pl
index 1f641ff835..6d765a859d 100644
--- a/tp/t/results/indices/double_seeentry_seealso.pl
+++ b/tp/t/results/indices/double_seeentry_seealso.pl
@@ -934,7 +934,7 @@ $result_converted{'plaintext'}->{'double_seeentry_seealso'} 
= 'top
 
 
 $result_converted{'html_text'}->{'double_seeentry_seealso'} = '
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
  &nbsp; [<a href="#node-index" title="Index" rel="index">Index</a>]</p>
@@ -945,7 +945,7 @@ $result_converted{'html_text'}->{'double_seeentry_seealso'} 
= '
 <li><a href="#node-index" accesskey="1">Chapter Index</a></li>
 </ul>
 <hr>
-<div class="chapter" id="node-index">
+<div class="chapter-level-extent" id="node-index">
 <div class="nav-header">
 <p>
  &nbsp; [<a href="#node-index" title="Index" rel="index">Index</a>]</p>
diff --git a/tp/t/results/indices/double_syncodeindex.pl 
b/tp/t/results/indices/double_syncodeindex.pl
index c2c02138e8..91af5a41ce 100644
--- a/tp/t/results/indices/double_syncodeindex.pl
+++ b/tp/t/results/indices/double_syncodeindex.pl
@@ -468,7 +468,7 @@ $result_converted{'plaintext'}->{'double_syncodeindex'} = 
'* Menu:
 
 
 $result_converted{'html_text'}->{'double_syncodeindex'} = '
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 <a class="index-entry-id" id="index-cindex-entry"></a>
 <a class="index-entry-id" id="index-findex-entry"></a>
diff --git a/tp/t/results/indices/empty_cindex_entry.pl 
b/tp/t/results/indices/empty_cindex_entry.pl
index 71565febef..8c6867bd50 100644
--- a/tp/t/results/indices/empty_cindex_entry.pl
+++ b/tp/t/results/indices/empty_cindex_entry.pl
@@ -156,7 +156,7 @@ End:
 $result_converted{'plaintext'}->{'empty_cindex_entry'} = '';
 
 
-$result_converted{'html_text'}->{'empty_cindex_entry'} = '<h1 
class="node-heading" id="Top">Top</h1>
+$result_converted{'html_text'}->{'empty_cindex_entry'} = '<h1 class="node" 
id="Top">Top</h1>
 ';
 
 1;
diff --git a/tp/t/results/indices/empty_index_entry.pl 
b/tp/t/results/indices/empty_index_entry.pl
index 5c131ff205..aa9c9430cb 100644
--- a/tp/t/results/indices/empty_index_entry.pl
+++ b/tp/t/results/indices/empty_index_entry.pl
@@ -320,7 +320,7 @@ $result_converted{'plaintext'}->{'empty_index_entry'} = ' 
-- :
 ';
 
 
-$result_converted{'html_text'}->{'empty_index_entry'} = '<h1 
class="node-heading" id="Top">Top</h1>
+$result_converted{'html_text'}->{'empty_index_entry'} = '<h1 class="node" 
id="Top">Top</h1>
 
 <dl class="first-deffn">
 <dt class="deffn"><span class="category-def">: </span><strong 
class="strong"></strong></dt>
diff --git a/tp/t/results/indices/empty_string_index_entry.pl 
b/tp/t/results/indices/empty_string_index_entry.pl
index 32e4e072ae..b08e361e1c 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -923,7 +923,7 @@ 
$result_converted_errors{'plaintext'}->{'empty_string_index_entry'} = [
 
 
 
-$result_converted{'html_text'}->{'empty_string_index_entry'} = '<h1 
class="node-heading" id="Top">Top</h1>
+$result_converted{'html_text'}->{'empty_string_index_entry'} = '<h1 
class="node" id="Top">Top</h1>
 
 <a class="index-entry-id" id="index-"></a>
 
diff --git a/tp/t/results/indices/encoding_index_ascii/res_html/index.html 
b/tp/t/results/indices/encoding_index_ascii/res_html/index.html
index 9c543eddbf..85741d2b6c 100644
--- a/tp/t/results/indices/encoding_index_ascii/res_html/index.html
+++ b/tp/t/results/indices/encoding_index_ascii/res_html/index.html
@@ -24,7 +24,7 @@ a.summary-letter-printindex {text-decoration: none}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="top">top</h1>
 
 <a class="index-entry-id" id="index-e-e"></a>
diff --git 
a/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_html/index.html 
b/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_html/index.html
index 9c543eddbf..85741d2b6c 100644
--- 
a/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_html/index.html
+++ 
b/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_html/index.html
@@ -24,7 +24,7 @@ a.summary-letter-printindex {text-decoration: none}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="top">top</h1>
 
 <a class="index-entry-id" id="index-e-e"></a>
diff --git a/tp/t/results/indices/encoding_index_latin1/res_html/index.html 
b/tp/t/results/indices/encoding_index_latin1/res_html/index.html
index 6e71abc605..72809cb71e 100644
--- a/tp/t/results/indices/encoding_index_latin1/res_html/index.html
+++ b/tp/t/results/indices/encoding_index_latin1/res_html/index.html
@@ -24,7 +24,7 @@ a.summary-letter-printindex {text-decoration: none}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="top">top</h1>
 
 <a class="index-entry-id" id="index-e-e"></a>
diff --git 
a/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_html/index.html
 
b/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_html/index.html
index 896c673842..cf469d3e27 100644
--- 
a/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_html/index.html
+++ 
b/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_html/index.html
@@ -24,7 +24,7 @@ a.summary-letter-printindex {text-decoration: none}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="top">top</h1>
 
 <a class="index-entry-id" id="index-e-e"></a>
diff --git a/tp/t/results/indices/encoding_index_utf8/res_html/index.html 
b/tp/t/results/indices/encoding_index_utf8/res_html/index.html
index 4eaae8a069..10c65d207a 100644
--- a/tp/t/results/indices/encoding_index_utf8/res_html/index.html
+++ b/tp/t/results/indices/encoding_index_utf8/res_html/index.html
@@ -24,7 +24,7 @@ a.summary-letter-printindex {text-decoration: none}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="top">top</h1>
 
 <a class="index-entry-id" id="index-e-e"></a>
diff --git 
a/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_html/index.html 
b/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_html/index.html
index 2691afc7c0..8daa1ae706 100644
--- 
a/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_html/index.html
+++ 
b/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_html/index.html
@@ -24,7 +24,7 @@ a.summary-letter-printindex {text-decoration: none}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="top">top</h1>
 
 <a class="index-entry-id" id="index-e-e"></a>
diff --git a/tp/t/results/indices/explicit_sort_key.pl 
b/tp/t/results/indices/explicit_sort_key.pl
index 632bcdc8c1..d4536b0582 100644
--- a/tp/t/results/indices/explicit_sort_key.pl
+++ b/tp/t/results/indices/explicit_sort_key.pl
@@ -1014,7 +1014,7 @@ $result_converted{'plaintext'}->{'explicit_sort_key'} = 
'in a reuglar para.  ‘
 ';
 
 
-$result_converted{'html_text'}->{'explicit_sort_key'} = '<div class="top" 
id="Top">
+$result_converted{'html_text'}->{'explicit_sort_key'} = '<div 
class="top-level-extent" id="Top">
 <a class="top" id="SEC_Top"></a>
 
 <a class="index-entry-id" id="index-bbbbbbb-_0028first_0029"></a>
diff --git a/tp/t/results/indices/ftable_vtable.pl 
b/tp/t/results/indices/ftable_vtable.pl
index f3e0d3b50c..48c6d614a0 100644
--- a/tp/t/results/indices/ftable_vtable.pl
+++ b/tp/t/results/indices/ftable_vtable.pl
@@ -945,7 +945,7 @@ _var3_
 ';
 
 
-$result_converted{'html_text'}->{'ftable_vtable'} = '<h1 class="node-heading" 
id="Top">Top</h1>
+$result_converted{'html_text'}->{'ftable_vtable'} = '<h1 class="node" 
id="Top">Top</h1>
 
 <dl class="ftable">
 <dt id=\'index-function1\'><span><em class="emph">function1</em><a 
class="copiable-anchor" href=\'#index-function1\'> &para;</a></span></dt>
diff --git a/tp/t/results/indices/image_lines_count.pl 
b/tp/t/results/indices/image_lines_count.pl
index 2a5f0d9707..7c15a64702 100644
--- a/tp/t/results/indices/image_lines_count.pl
+++ b/tp/t/results/indices/image_lines_count.pl
@@ -303,7 +303,7 @@ ff
 ';
 
 
-$result_converted{'html_text'}->{'image_lines_count'} = '<h1 
class="node-heading" id="Top">Top</h1>
+$result_converted{'html_text'}->{'image_lines_count'} = '<h1 class="node" 
id="Top">Top</h1>
 
 <img class="image" src="count_image.png" alt="count_image">
 
diff --git a/tp/t/results/indices/image_text_lines_count.pl 
b/tp/t/results/indices/image_text_lines_count.pl
index 7a05ebad57..26fd659b24 100644
--- a/tp/t/results/indices/image_text_lines_count.pl
+++ b/tp/t/results/indices/image_text_lines_count.pl
@@ -302,7 +302,7 @@ ff
 ';
 
 
-$result_converted{'html_text'}->{'image_text_lines_count'} = '<h1 
class="node-heading" id="Top">Top</h1>
+$result_converted{'html_text'}->{'image_text_lines_count'} = '<h1 class="node" 
id="Top">Top</h1>
 
 <img class="image" src="count_image_text.jpg" alt="count_image_text">
 
diff --git a/tp/t/results/indices/index_entries_locations.pl 
b/tp/t/results/indices/index_entries_locations.pl
index ab8b253581..b8ac105433 100644
--- a/tp/t/results/indices/index_entries_locations.pl
+++ b/tp/t/results/indices/index_entries_locations.pl
@@ -560,7 +560,7 @@ $result_converted{'plaintext'}->{'index_entries_locations'} 
= 'Initial paragraph
 ';
 
 
-$result_converted{'html_text'}->{'index_entries_locations'} = '<h1 
class="node-heading" id="Top">Top</h1>
+$result_converted{'html_text'}->{'index_entries_locations'} = '<h1 
class="node" id="Top">Top</h1>
 
 <p>Initial paragraph.
 </p>
diff --git a/tp/t/results/indices/index_entry_before_first_node.pl 
b/tp/t/results/indices/index_entry_before_first_node.pl
index 2e97541b44..bd38d29390 100644
--- a/tp/t/results/indices/index_entry_before_first_node.pl
+++ b/tp/t/results/indices/index_entry_before_first_node.pl
@@ -292,7 +292,7 @@ 
$result_converted_errors{'plaintext'}->{'index_entry_before_first_node'} = [
 
 $result_converted{'html_text'}->{'index_entry_before_first_node'} = '<a 
class="index-entry-id" id="index-before-nodes"></a>
 
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 <div class="printindex cp-printindex">
 <table class="cp-letters-header-printindex"><tr><th valign="top">Jump to: 
&nbsp; </th><td><a class="summary-letter-printindex" 
href="#t_h_cp_letter-B"><b>B</b></a>
diff --git a/tp/t/results/indices/index_entry_before_node.pl 
b/tp/t/results/indices/index_entry_before_node.pl
index 00032778a6..2db40230a2 100644
--- a/tp/t/results/indices/index_entry_before_node.pl
+++ b/tp/t/results/indices/index_entry_before_node.pl
@@ -759,30 +759,30 @@ 
$result_converted{'plaintext'}->{'index_entry_before_node'} = 'Para.
 ';
 
 
-$result_converted{'html_text'}->{'index_entry_before_node'} = '<a class="node" 
id="Top"></a><div class="nav-header">
+$result_converted{'html_text'}->{'index_entry_before_node'} = '<a 
class="node-id" id="Top"></a><div class="nav-header">
 <p>
  &nbsp; [<a href="#second" title="Index" rel="index">Index</a>]</p>
 </div>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 
 
 <hr>
-<a class="node" id="first"></a><div class="nav-header">
+<a class="node-id" id="first"></a><div class="nav-header">
 <p>
  &nbsp; [<a href="#second" title="Index" rel="index">Index</a>]</p>
 </div>
-<h4 class="node-heading">first</h4>
+<h4 class="node">first</h4>
 
 <p>Para.
 </p>
 <a class="index-entry-id" id="index-lone-entry"></a>
 
 <hr>
-<a class="node" id="second"></a><div class="nav-header">
+<a class="node-id" id="second"></a><div class="nav-header">
 <p>
  &nbsp; [<a href="#second" title="Index" rel="index">Index</a>]</p>
 </div>
-<h4 class="node-heading">second</h4>
+<h4 class="node">second</h4>
 
 <div class="printindex cp-printindex">
 <table class="cp-letters-header-printindex"><tr><th valign="top">Jump to: 
&nbsp; </th><td><a class="summary-letter-printindex" 
href="#t_h_cp_letter-L"><b>L</b></a>
diff --git a/tp/t/results/indices/index_entry_in_footnote.pl 
b/tp/t/results/indices/index_entry_in_footnote.pl
index d5bb99de6a..93d207fd55 100644
--- a/tp/t/results/indices/index_entry_in_footnote.pl
+++ b/tp/t/results/indices/index_entry_in_footnote.pl
@@ -308,7 +308,7 @@ $result_converted{'plaintext'}->{'index_entry_in_footnote'} 
= 'Top node(1)
 ';
 
 
-$result_converted{'html_text'}->{'index_entry_in_footnote'} = '<h1 
class="node-heading" id="Top">Top</h1>
+$result_converted{'html_text'}->{'index_entry_in_footnote'} = '<h1 
class="node" id="Top">Top</h1>
 
 <p>Top node<a class="footnote" id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
diff --git a/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl 
b/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl
index eb1fa86653..eb42355c72 100644
--- a/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl
@@ -662,21 +662,21 @@ 
$result_converted{'plaintext'}->{'index_entry_in_footnote_different_node_end'} =
 ';
 
 
-$result_converted{'html_text'}->{'index_entry_in_footnote_different_node_end'} 
= '<a class="node" id="Top"></a><div class="nav-header">
+$result_converted{'html_text'}->{'index_entry_in_footnote_different_node_end'} 
= '<a class="node-id" id="Top"></a><div class="nav-header">
 <p>
  &nbsp; [<a href="#First" title="Index" rel="index">Index</a>]</p>
 </div>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 
 
 <p>Top node<a class="footnote" id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
 <hr>
-<a class="node" id="First"></a><div class="nav-header">
+<a class="node-id" id="First"></a><div class="nav-header">
 <p>
  &nbsp; [<a href="#First" title="Index" rel="index">Index</a>]</p>
 </div>
-<h4 class="node-heading">First</h4>
+<h4 class="node">First</h4>
 
 <div class="printindex cp-printindex">
 <table class="cp-letters-header-printindex"><tr><th valign="top">Jump to: 
&nbsp; </th><td><a class="summary-letter-printindex" 
href="#t_h_cp_letter-C"><b>C</b></a>
diff --git a/tp/t/results/indices/index_entry_in_footnote_separate.pl 
b/tp/t/results/indices/index_entry_in_footnote_separate.pl
index 54ea07abad..c41207abfa 100644
--- a/tp/t/results/indices/index_entry_in_footnote_separate.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_separate.pl
@@ -698,21 +698,21 @@ 
$result_converted{'plaintext'}->{'index_entry_in_footnote_separate'} = 'Top node
 ';
 
 
-$result_converted{'html_text'}->{'index_entry_in_footnote_separate'} = '<a 
class="node" id="Top"></a><div class="nav-header">
+$result_converted{'html_text'}->{'index_entry_in_footnote_separate'} = '<a 
class="node-id" id="Top"></a><div class="nav-header">
 <p>
  &nbsp; [<a href="#First" title="Index" rel="index">Index</a>]</p>
 </div>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 
 
 <p>Top node<a class="footnote" id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
 <hr>
-<a class="node" id="First"></a><div class="nav-header">
+<a class="node-id" id="First"></a><div class="nav-header">
 <p>
  &nbsp; [<a href="#First" title="Index" rel="index">Index</a>]</p>
 </div>
-<h4 class="node-heading">First</h4>
+<h4 class="node">First</h4>
 
 <div class="printindex cp-printindex">
 <table class="cp-letters-header-printindex"><tr><th valign="top">Jump to: 
&nbsp; </th><td><a class="summary-letter-printindex" 
href="#t_h_cp_letter-C"><b>C</b></a>
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 6bbc55df83..e2e727aef4 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -1418,7 +1418,7 @@ xftable xitem
 
 
 $result_converted{'html_text'}->{'printindex_index_entry_in_copying'} = '
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
  &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
@@ -1478,7 +1478,7 @@ 
$result_converted{'html_text'}->{'printindex_index_entry_in_copying'} = '
 <li><a href="#chapter" accesskey="1">Chapter</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
  &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
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 50a1bf9e6d..dbf92bad9d 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
@@ -897,7 +897,7 @@ Copying(1).
 
 
 
$result_converted{'html_text'}->{'printindex_index_entry_in_copying_in_footnote'}
 = '
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
  &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
@@ -930,7 +930,7 @@ 
$result_converted{'html_text'}->{'printindex_index_entry_in_copying_in_footnote'
 <li><a href="#chapter" accesskey="1">Chapter</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
  &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
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 594efc22fc..4af22bfac8 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
@@ -1306,7 +1306,7 @@ Top.
 
 
 
$result_converted{'html_text'}->{'printindex_index_entry_in_copying_no_insertcopying'}
 = '
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
  &nbsp; </p>
@@ -1320,7 +1320,7 @@ 
$result_converted{'html_text'}->{'printindex_index_entry_in_copying_no_insertcop
 <li><a href="#chapter" accesskey="1">Chapter</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
  &nbsp; </p>
diff --git a/tp/t/results/indices/printindex_with_space_before.pl 
b/tp/t/results/indices/printindex_with_space_before.pl
index 9b4a6e0cc1..1052a7d749 100644
--- a/tp/t/results/indices/printindex_with_space_before.pl
+++ b/tp/t/results/indices/printindex_with_space_before.pl
@@ -260,7 +260,7 @@ 
$result_converted{'plaintext'}->{'printindex_with_space_before'} = 'Text.
 ';
 
 
-$result_converted{'html_text'}->{'printindex_with_space_before'} = '<h1 
class="node-heading" id="Top">Top</h1>
+$result_converted{'html_text'}->{'printindex_with_space_before'} = '<h1 
class="node" id="Top">Top</h1>
 
 <a class="index-entry-id" id="index-index"></a>
 
diff --git a/tp/t/results/indices/same_index_entry_merged_indices.pl 
b/tp/t/results/indices/same_index_entry_merged_indices.pl
index b04b3ab521..497c1bd1bd 100644
--- a/tp/t/results/indices/same_index_entry_merged_indices.pl
+++ b/tp/t/results/indices/same_index_entry_merged_indices.pl
@@ -755,7 +755,7 @@ 
$result_converted{'plaintext'}->{'same_index_entry_merged_indices'} = 'Text.
 
 
 $result_converted{'html_text'}->{'same_index_entry_merged_indices'} = '
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <a class="top" id="SEC_Top"></a>
 <p>Text.
 </p>
diff --git a/tp/t/results/indices/seealso_duplicate.pl 
b/tp/t/results/indices/seealso_duplicate.pl
index e580a5d603..fd33e22fef 100644
--- a/tp/t/results/indices/seealso_duplicate.pl
+++ b/tp/t/results/indices/seealso_duplicate.pl
@@ -457,7 +457,7 @@ $result_converted{'plaintext'}->{'seealso_duplicate'} = '* 
Menu:
 ';
 
 
-$result_converted{'html_text'}->{'seealso_duplicate'} = '<h1 
class="node-heading" id="Top">Top</h1>
+$result_converted{'html_text'}->{'seealso_duplicate'} = '<h1 class="node" 
id="Top">Top</h1>
 
 <a class="index-entry-id" id="index-awk"></a>
 <a class="index-entry-id" id="index-awk-1"></a>
diff --git a/tp/t/results/indices/seeentry.pl b/tp/t/results/indices/seeentry.pl
index f000d6b9c7..529cf28f2a 100644
--- a/tp/t/results/indices/seeentry.pl
+++ b/tp/t/results/indices/seeentry.pl
@@ -815,7 +815,7 @@ $result_converted{'plaintext'}->{'seeentry'} = '1 Index
 
 
 $result_converted{'html_text'}->{'seeentry'} = '
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
  &nbsp; [<a href="#chapter-index" title="Index" rel="index">Index</a>]</p>
@@ -825,7 +825,7 @@ $result_converted{'html_text'}->{'seeentry'} = '
 <li><a href="#chapter-index" accesskey="1">Index</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chapter-index">
+<div class="chapter-level-extent" id="chapter-index">
 <div class="nav-header">
 <p>
  &nbsp; [<a href="#chapter-index" title="Index" rel="index">Index</a>]</p>
diff --git a/tp/t/results/indices/subentries.pl 
b/tp/t/results/indices/subentries.pl
index 6f2a494aca..ecf84e14fd 100644
--- a/tp/t/results/indices/subentries.pl
+++ b/tp/t/results/indices/subentries.pl
@@ -1342,7 +1342,7 @@ $result_converted{'plaintext'}->{'subentries'} = '1 Index
 
 
 $result_converted{'html_text'}->{'subentries'} = '
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
  &nbsp; [<a href="#chapter-index" title="Index" rel="index">Index</a>]</p>
@@ -1352,7 +1352,7 @@ $result_converted{'html_text'}->{'subentries'} = '
 <li><a href="#chapter-index" accesskey="1">Index</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chapter-index">
+<div class="chapter-level-extent" id="chapter-index">
 <div class="nav-header">
 <p>
  &nbsp; [<a href="#chapter-index" title="Index" rel="index">Index</a>]</p>
diff --git a/tp/t/results/indices/subentry_and_sortas.pl 
b/tp/t/results/indices/subentry_and_sortas.pl
index acadfe3589..4435c211c4 100644
--- a/tp/t/results/indices/subentry_and_sortas.pl
+++ b/tp/t/results/indices/subentry_and_sortas.pl
@@ -794,7 +794,7 @@ a.summary-letter-printindex {text-decoration: none}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter-index" accesskey="n" rel="next">Index</a> &nbsp; [<a 
href="#chapter-index" title="Index" rel="index">Index</a>]</p>
@@ -804,7 +804,7 @@ Next: <a href="#chapter-index" accesskey="n" 
rel="next">Index</a> &nbsp; [<a hre
 <li><a href="#chapter-index" accesskey="1">Index</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chapter-index">
+<div class="chapter-level-extent" id="chapter-index">
 <div class="nav-header">
 <p>
  &nbsp; [<a href="#chapter-index" title="Index" rel="index">Index</a>]</p>
@@ -920,7 +920,7 @@ $result_converted{'plaintext'}->{'subentry_and_sortas'} = 
'1 Index
 
 
 $result_converted{'html_text'}->{'subentry_and_sortas'} = '
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
  &nbsp; [<a href="#chapter-index" title="Index" rel="index">Index</a>]</p>
@@ -930,7 +930,7 @@ $result_converted{'html_text'}->{'subentry_and_sortas'} = '
 <li><a href="#chapter-index" accesskey="1">Index</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chapter-index">
+<div class="chapter-level-extent" id="chapter-index">
 <div class="nav-header">
 <p>
  &nbsp; [<a href="#chapter-index" title="Index" rel="index">Index</a>]</p>
diff --git a/tp/t/results/indices/syncode_index_print_both.pl 
b/tp/t/results/indices/syncode_index_print_both.pl
index 4428723094..82e4a20d9f 100644
--- a/tp/t/results/indices/syncode_index_print_both.pl
+++ b/tp/t/results/indices/syncode_index_print_both.pl
@@ -781,7 +781,7 @@ Print fn
 
 $result_converted{'html_text'}->{'syncode_index_print_both'} = '
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
  &nbsp; [<a href="#chapter-index" title="Index" rel="index">Index</a>]</p>
@@ -792,7 +792,7 @@ 
$result_converted{'html_text'}->{'syncode_index_print_both'} = '
 <li><a href="#chapter-index" accesskey="1">index</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chapter-index">
+<div class="chapter-level-extent" id="chapter-index">
 <div class="nav-header">
 <p>
  &nbsp; [<a href="#chapter-index" title="Index" rel="index">Index</a>]</p>
diff --git a/tp/t/results/indices/syncodeindex_to_plain.pl 
b/tp/t/results/indices/syncodeindex_to_plain.pl
index 3e0f478a3e..d2cd0962ca 100644
--- a/tp/t/results/indices/syncodeindex_to_plain.pl
+++ b/tp/t/results/indices/syncodeindex_to_plain.pl
@@ -530,7 +530,7 @@ $result_converted{'plaintext'}->{'syncodeindex_to_plain'} = 
'cp index.
 
 
 $result_converted{'html_text'}->{'syncodeindex_to_plain'} = '
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 <a class="index-entry-id" id="index-_002d_002dk1"></a>
 <a class="index-entry-id" id="index-_002d_002dv"></a>
diff --git a/tp/t/results/indices/transparent_sort_chars.pl 
b/tp/t/results/indices/transparent_sort_chars.pl
index db3f9add18..1ed5d82998 100644
--- a/tp/t/results/indices/transparent_sort_chars.pl
+++ b/tp/t/results/indices/transparent_sort_chars.pl
@@ -495,7 +495,7 @@ $result_converted{'plaintext'}->{'transparent_sort_chars'} 
= '* Menu:
 
 
 $result_converted{'html_text'}->{'transparent_sort_chars'} = '
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <a class="top" id="SEC_Top"></a>
 <a class="index-entry-id" 
id="index-_002d_002dversion_002c-for-install_002dinfo"></a>
 <a class="index-entry-id" id="index-Source-file-format"></a>
diff --git a/tp/t/results/indices/w_lines_count.pl 
b/tp/t/results/indices/w_lines_count.pl
index e4f290af8e..d6a47a3129 100644
--- a/tp/t/results/indices/w_lines_count.pl
+++ b/tp/t/results/indices/w_lines_count.pl
@@ -453,7 +453,7 @@ $result_converted{'plaintext'}->{'w_lines_count'} = 
'xzcompilationxdmbufferxmsub
 ';
 
 
-$result_converted{'html_text'}->{'w_lines_count'} = '<div class="top" id="Top">
+$result_converted{'html_text'}->{'w_lines_count'} = '<div 
class="top-level-extent" id="Top">
 <a class="top" id="SEC_Top"></a>
 <p>xzcompilationxdmbufferxmsubsequentmxCtxaxxmcommandsmadvancemfrommthere.  
 <code class="code"><span class="w-nolinebreak-text">C-u</span></code><!-- /@w 
--> starts again from the beginning
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 c28f79ad93..c90555c149 100644
--- a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
@@ -1494,7 +1494,7 @@ 
$result_converted{'plaintext'}->{'inter_item_commands_in_enumerate'} = 'top
 
 
 $result_converted{'html_text'}->{'inter_item_commands_in_enumerate'} = '
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
  &nbsp; </p>
@@ -1505,7 +1505,7 @@ 
$result_converted{'html_text'}->{'inter_item_commands_in_enumerate'} = '
 <li><a href="#chapter" accesskey="1">chap</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
  &nbsp; </p>
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 e9fd1911a4..2e8d23c28b 100644
--- a/tp/t/results/itemize/inter_item_commands_in_itemize.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
@@ -1037,7 +1037,7 @@ 
$result_converted{'plaintext'}->{'inter_item_commands_in_itemize'} = 'top
 
 
 $result_converted{'html_text'}->{'inter_item_commands_in_itemize'} = '
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
  &nbsp; </p>
@@ -1048,7 +1048,7 @@ 
$result_converted{'html_text'}->{'inter_item_commands_in_itemize'} = '
 <li><a href="#chapter" accesskey="1">chap</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
  &nbsp; </p>
diff --git a/tp/t/results/languages/appendix_translated.pl 
b/tp/t/results/languages/appendix_translated.pl
index 7f0cb027e1..22c8e7e111 100644
--- a/tp/t/results/languages/appendix_translated.pl
+++ b/tp/t/results/languages/appendix_translated.pl
@@ -357,7 +357,7 @@ ul.toc-numbered-mark {list-style: none}
 
 <body lang="fr">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="top">top</h1>
 
 <div class="element-contents" id="SEC_Contents">
@@ -370,7 +370,7 @@ ul.toc-numbered-mark {list-style: none}
 </ul>
 </div>
 </div>
-<div class="appendix" id="dernier">
+<div class="appendix-level-extent" id="dernier">
 <h2 class="appendix">Annexe A dernier</h2>
 
 </div>
diff --git a/tp/t/results/languages/command_translated.pl 
b/tp/t/results/languages/command_translated.pl
index 51e8b2ca3c..5263c3b891 100644
--- a/tp/t/results/languages/command_translated.pl
+++ b/tp/t/results/languages/command_translated.pl
@@ -321,7 +321,7 @@ $result_converted{'html'}->{'command_translated'} = 
'<!DOCTYPE html>
 
 <body lang="fr">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="top-error_002d_002d_003e">top erreur&rarr;</h1>
 
 <p>erreur&rarr;
diff --git a/tp/t/results/languages/multiple.pl 
b/tp/t/results/languages/multiple.pl
index 014bcaab3c..47e01b61e6 100644
--- a/tp/t/results/languages/multiple.pl
+++ b/tp/t/results/languages/multiple.pl
@@ -1215,7 +1215,7 @@ span:hover a.copiable-anchor {visibility: visible}
 <body lang="fr">
 
 
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 <dl class="first-defcv first-defivar-alias-first-defcv">
 <dt class="defcv defivar-alias-defcv" id="index-BBB-of-fr"><span>Variable 
d\'instance de fr&nbsp;: <strong class="strong">BBB</strong> <em 
class="emph">CCC</em><a class="copiable-anchor" href=\'#index-BBB-of-fr\'> 
&para;</a></span></dt>
diff --git a/tp/t/results/languages/multiple_in_preamble.pl 
b/tp/t/results/languages/multiple_in_preamble.pl
index 33b41161af..3746b5ebce 100644
--- a/tp/t/results/languages/multiple_in_preamble.pl
+++ b/tp/t/results/languages/multiple_in_preamble.pl
@@ -1262,7 +1262,7 @@ span:hover a.copiable-anchor {visibility: visible}
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Sljedeće: <a href="#chapter" accesskey="n" rel="next">chap</a> &nbsp; </p>
@@ -1273,7 +1273,7 @@ Sljedeće: <a href="#chapter" accesskey="n" 
rel="next">chap</a> &nbsp; </p>
 <li><a href="#chapter" accesskey="1">chap</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
 Prethodno: <a href="#Top" accesskey="p" rel="prev">top section</a>, Gore: <a 
href="#Top" accesskey="u" rel="up">top section</a> &nbsp; </p>
diff --git a/tp/t/results/languages/multiple_in_preamble_before_node.pl 
b/tp/t/results/languages/multiple_in_preamble_before_node.pl
index a803021f0c..68502110d0 100644
--- a/tp/t/results/languages/multiple_in_preamble_before_node.pl
+++ b/tp/t/results/languages/multiple_in_preamble_before_node.pl
@@ -1088,7 +1088,7 @@ span:hover a.copiable-anchor {visibility: visible}
 <p>Text ending the preamble
 </p>
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Nächste: <a href="#chapter" accesskey="n" rel="next">chap</a> &nbsp; </p>
@@ -1099,7 +1099,7 @@ Nächste: <a href="#chapter" accesskey="n" 
rel="next">chap</a> &nbsp; </p>
 <li><a href="#chapter" accesskey="1">chap</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
 Vorige: <a href="#Top" accesskey="p" rel="prev">top section</a>, Nach oben: <a 
href="#Top" accesskey="u" rel="up">top section</a> &nbsp; </p>
diff --git 
a/tp/t/results/languages/multiple_lang_chapters/res_html/multiple_lang_chapters.html
 
b/tp/t/results/languages/multiple_lang_chapters/res_html/multiple_lang_chapters.html
index cd580f1a5b..550c25b919 100644
--- 
a/tp/t/results/languages/multiple_lang_chapters/res_html/multiple_lang_chapters.html
+++ 
b/tp/t/results/languages/multiple_lang_chapters/res_html/multiple_lang_chapters.html
@@ -26,7 +26,7 @@ span:hover a.copiable-anchor {visibility: visible}
 <body lang="ja">
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter-ja" accesskey="n" rel="next">ja</a> &nbsp; </p>
@@ -42,7 +42,7 @@ Next: <a href="#chapter-ja" accesskey="n" rel="next">ja</a> 
&nbsp; </p>
 <li><a href="#chapter-pt_005fBR" accesskey="5">pt_bR</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chapter-ja">
+<div class="chapter-level-extent" id="chapter-ja">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter-en" accesskey="n" rel="next">en</a>, Previous: <a 
href="#Top" accesskey="p" rel="prev">Multi language file</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Multi language file</a> &nbsp; </p>
@@ -56,7 +56,7 @@ Next: <a href="#chapter-en" accesskey="n" rel="next">en</a>, 
Previous: <a href="
 
 <hr>
 </div>
-<div class="chapter" id="chapter-en">
+<div class="chapter-level-extent" id="chapter-en">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter-fr_005fFR" accesskey="n" rel="next">fr_FR</a>, 
Previous: <a href="#chapter-ja" accesskey="p" rel="prev">ja</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Multi language file</a> &nbsp; </p>
@@ -70,7 +70,7 @@ Next: <a href="#chapter-fr_005fFR" accesskey="n" 
rel="next">fr_FR</a>, Previous:
 
 <hr>
 </div>
-<div class="chapter" id="chapter-fr_005fFR">
+<div class="chapter-level-extent" id="chapter-fr_005fFR">
 <div class="nav-header">
 <p>
 Suivant: <a href="#chapter-de" accesskey="n" rel="next">de</a>, 
Pr&eacute;c&eacute;dent: <a href="#chapter-en" accesskey="p" rel="prev">en</a>, 
Monter: <a href="#Top" accesskey="u" rel="up">Multi language file</a> &nbsp; 
</p>
@@ -83,7 +83,7 @@ Suivant: <a href="#chapter-de" accesskey="n" 
rel="next">de</a>, Pr&eacute;c&eacu
 
 <hr>
 </div>
-<div class="chapter" id="chapter-de">
+<div class="chapter-level-extent" id="chapter-de">
 <div class="nav-header">
 <p>
 Nächste: <a href="#chapter-pt_005fBR" accesskey="n" rel="next">pt_bR</a>, 
Vorige: <a href="#chapter-fr_005fFR" accesskey="p" rel="prev">fr_FR</a>, Nach 
oben: <a href="#Top" accesskey="u" rel="up">Multi language file</a> &nbsp; </p>
@@ -92,7 +92,7 @@ Nächste: <a href="#chapter-pt_005fBR" accesskey="n" 
rel="next">pt_bR</a>, Vorig
 
 <hr>
 </div>
-<div class="chapter" id="chapter-pt_005fBR">
+<div class="chapter-level-extent" id="chapter-pt_005fBR">
 <div class="nav-header">
 <p>
 Anterior: <a href="#chapter-de" accesskey="p" rel="prev">de</a>, Acima: <a 
href="#Top" accesskey="u" rel="up">Multi language file</a> &nbsp; </p>
diff --git 
a/tp/t/results/languages/multiple_lang_chapters_texi2html/res_html/multiple_lang_chapters.html
 
b/tp/t/results/languages/multiple_lang_chapters_texi2html/res_html/multiple_lang_chapters.html
index fb82c403ac..38f8e4996b 100644
--- 
a/tp/t/results/languages/multiple_lang_chapters_texi2html/res_html/multiple_lang_chapters.html
+++ 
b/tp/t/results/languages/multiple_lang_chapters_texi2html/res_html/multiple_lang_chapters.html
@@ -25,7 +25,7 @@ span:hover a.copiable-anchor {visibility: visible}
 <body lang="en">
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter-ja" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -50,7 +50,7 @@ span:hover a.copiable-anchor {visibility: visible}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter-ja">
+<div class="chapter-level-extent" id="chapter-ja">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -75,7 +75,7 @@ span:hover a.copiable-anchor {visibility: visible}
 
 <hr>
 </div>
-<div class="chapter" id="chapter-en">
+<div class="chapter-level-extent" id="chapter-en">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter-ja" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter-ja" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -100,7 +100,7 @@ span:hover a.copiable-anchor {visibility: visible}
 
 <hr>
 </div>
-<div class="chapter" id="chapter-fr_005fFR">
+<div class="chapter-level-extent" id="chapter-fr_005fFR">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter-en" 
title="D&eacute;but de ce chapitre ou chapitre pr&eacute;c&eacute;dent"> 
&lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter-en" title="Section 
pr&eacute;c&eacute;dente dans l&rsquo;ordre de lecture"> &lt; </a>]</td>
@@ -124,7 +124,7 @@ span:hover a.copiable-anchor {visibility: visible}
 
 <hr>
 </div>
-<div class="chapter" id="chapter-de">
+<div class="chapter-level-extent" id="chapter-de">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter-fr_005fFR" 
title="Anfang dieses oder des letzten Kapitels"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter-fr_005fFR" title="Voriger 
Abschnitt in Lesereihenfolge"> &lt; </a>]</td>
@@ -144,7 +144,7 @@ span:hover a.copiable-anchor {visibility: visible}
 
 <hr>
 </div>
-<div class="chapter" id="chapter-pt_005fBR">
+<div class="chapter-level-extent" id="chapter-pt_005fBR">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter-de" 
title="Come&ccedil;o desse cap&iacute;tulo ou cap&iacute;tulo anterior"> 
&lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter-de" 
title="Se&ccedil;&atilde;o anterior na ordem de leitura"> &lt; </a>]</td>
diff --git a/tp/t/results/languages/unknown_language.pl 
b/tp/t/results/languages/unknown_language.pl
index c2d448b518..c85876aa3a 100644
--- a/tp/t/results/languages/unknown_language.pl
+++ b/tp/t/results/languages/unknown_language.pl
@@ -463,7 +463,7 @@ $result_converted{'html'}->{'unknown_language'} = 
'<!DOCTYPE html>
 
 <body lang="unknown">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="unknkown-language">unknkown language</h1>
 
 <p>Unknown language. See <a class="xref" href="#Top">unknkown language</a>.
diff --git a/tp/t/results/languages/unknown_region.pl 
b/tp/t/results/languages/unknown_region.pl
index 4a8f7d5ed3..51150225fc 100644
--- a/tp/t/results/languages/unknown_region.pl
+++ b/tp/t/results/languages/unknown_region.pl
@@ -408,7 +408,7 @@ span:hover a.copiable-anchor {visibility: visible}
 
 <body lang="fr_NOWHERE">
 
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 <dl class="first-defcv first-defivar-alias-first-defcv">
 <dt class="defcv defivar-alias-defcv" id="index-BBB-of-AAA"><span>Variable 
d\'instance de AAA&nbsp;: <strong class="strong">BBB</strong> <em 
class="emph">CCC</em><a class="copiable-anchor" href=\'#index-BBB-of-AAA\'> 
&para;</a></span></dt>
diff --git a/tp/t/results/layout/navigation/res_html/navigation.html 
b/tp/t/results/layout/navigation/res_html/navigation.html
index d718f058e7..53b980f21f 100644
--- a/tp/t/results/layout/navigation/res_html/navigation.html
+++ b/tp/t/results/layout/navigation/res_html/navigation.html
@@ -24,7 +24,7 @@ ul.toc-numbered-mark {list-style: none}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -41,7 +41,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -65,7 +65,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr>
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section 
in reading order"> &lt; </a>]</td>
@@ -116,7 +116,7 @@ b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b  
bb  b bb.
 </table>
 
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#section" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git a/tp/t/results/layout/navigation_chapter/res_html/chapter.html 
b/tp/t/results/layout/navigation_chapter/res_html/chapter.html
index c38bf4f189..11f2cc4f95 100644
--- a/tp/t/results/layout/navigation_chapter/res_html/chapter.html
+++ b/tp/t/results/layout/navigation_chapter/res_html/chapter.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
@@ -46,7 +46,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr>
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section 
in reading order"> &lt; </a>]</td>
@@ -97,7 +97,7 @@ b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b  bb 
 b bb.
 </table>
 
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#section" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git a/tp/t/results/layout/navigation_chapter/res_html/index.html 
b/tp/t/results/layout/navigation_chapter/res_html/index.html
index 8a6de45e8b..4e6ba694ab 100644
--- a/tp/t/results/layout/navigation_chapter/res_html/index.html
+++ b/tp/t/results/layout/navigation_chapter/res_html/index.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next 
section in reading order"> &gt; </a>]</td>
diff --git 
a/tp/t/results/layout/navigation_chapter_no_header/res_html/chapter.html 
b/tp/t/results/layout/navigation_chapter_no_header/res_html/chapter.html
index f0807a2a85..d5c6c4cbfb 100644
--- a/tp/t/results/layout/navigation_chapter_no_header/res_html/chapter.html
+++ b/tp/t/results/layout/navigation_chapter_no_header/res_html/chapter.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
@@ -45,7 +45,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr>
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <h2 class="section" id="Section-in-chapter">1.1 Section in chapter</h2>
 
 <p>AAAA
@@ -81,7 +81,7 @@ b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b  bb 
 b bb.
 </table>
 
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <h3 class="subsection" id="Sub-section-in-section">1.1.1 Sub section in 
section</h3>
 
 
diff --git 
a/tp/t/results/layout/navigation_chapter_no_header/res_html/index.html 
b/tp/t/results/layout/navigation_chapter_no_header/res_html/index.html
index 8a6de45e8b..4e6ba694ab 100644
--- a/tp/t/results/layout/navigation_chapter_no_header/res_html/index.html
+++ b/tp/t/results/layout/navigation_chapter_no_header/res_html/index.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next 
section in reading order"> &gt; </a>]</td>
diff --git 
a/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/chapter.html
 
b/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/chapter.html
index 41a1e7e6e1..1c7dde066a 100644
--- 
a/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/chapter.html
+++ 
b/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/chapter.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
@@ -71,7 +71,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr>
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <h2 class="section" id="Section-in-chapter">1.1 Section in chapter</h2>
 
 <p>AAAA
@@ -107,7 +107,7 @@ b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b  
bb  b bb.
 </table>
 
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <h3 class="subsection" id="Sub-section-in-section">1.1.1 Sub section in 
section</h3>
 
 
diff --git 
a/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/index.html 
b/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/index.html
index b8fda05327..25bfe30fae 100644
--- 
a/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/index.html
+++ 
b/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/index.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git 
a/tp/t/results/layout/navigation_chapter_vertical/res_html/chapter.html 
b/tp/t/results/layout/navigation_chapter_vertical/res_html/chapter.html
index 1a5e393e7b..e281acfa71 100644
--- a/tp/t/results/layout/navigation_chapter_vertical/res_html/chapter.html
+++ b/tp/t/results/layout/navigation_chapter_vertical/res_html/chapter.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
@@ -77,7 +77,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr>
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section 
in reading order"> &lt; </a>]</td>
@@ -128,7 +128,7 @@ b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b  
bb  b bb.
 </table>
 
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#section" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git 
a/tp/t/results/layout/navigation_chapter_vertical/res_html/index.html 
b/tp/t/results/layout/navigation_chapter_vertical/res_html/index.html
index b8fda05327..25bfe30fae 100644
--- a/tp/t/results/layout/navigation_chapter_vertical/res_html/index.html
+++ b/tp/t/results/layout/navigation_chapter_vertical/res_html/index.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git a/tp/t/results/layout/navigation_no_header/res_html/navigation.html 
b/tp/t/results/layout/navigation_no_header/res_html/navigation.html
index e4115daf19..3e2c062399 100644
--- a/tp/t/results/layout/navigation_no_header/res_html/navigation.html
+++ b/tp/t/results/layout/navigation_no_header/res_html/navigation.html
@@ -24,7 +24,7 @@ ul.toc-numbered-mark {list-style: none}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="File-used-for-navigation-testing">File used for navigation 
testing</h1>
 
 <table class="menu" border="0" cellspacing="0">
@@ -33,7 +33,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <h1 class="chapter" id="First-chapter">1 First chapter</h1>
 
 <table class="menu" border="0" cellspacing="0">
@@ -42,7 +42,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr>
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <h2 class="section" id="Section-in-chapter">1.1 Section in chapter</h2>
 
 <p>AAAA
@@ -78,7 +78,7 @@ b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b  bb 
 b bb.
 </table>
 
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <h3 class="subsection" id="Sub-section-in-section">1.1.1 Sub section in 
section</h3>
 
 
diff --git 
a/tp/t/results/layout/navigation_no_header_vertical/res_html/navigation.html 
b/tp/t/results/layout/navigation_no_header_vertical/res_html/navigation.html
index 4a5c3ddfe8..b5171e6596 100644
--- a/tp/t/results/layout/navigation_no_header_vertical/res_html/navigation.html
+++ b/tp/t/results/layout/navigation_no_header_vertical/res_html/navigation.html
@@ -24,7 +24,7 @@ ul.toc-numbered-mark {list-style: none}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="File-used-for-navigation-testing">File used for navigation 
testing</h1>
 
 <table class="menu" border="0" cellspacing="0">
@@ -36,7 +36,7 @@ ul.toc-numbered-mark {list-style: none}
 </tr>
 </table>
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <h1 class="chapter" id="First-chapter">1 First chapter</h1>
 
 <table class="menu" border="0" cellspacing="0">
@@ -45,7 +45,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr>
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <h2 class="section" id="Section-in-chapter">1.1 Section in chapter</h2>
 
 <p>AAAA
@@ -81,7 +81,7 @@ b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b  bb 
 b bb.
 </table>
 
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <h3 class="subsection" id="Sub-section-in-section">1.1.1 Sub section in 
section</h3>
 
 
diff --git a/tp/t/results/layout/navigation_node/res_html/chapter.html 
b/tp/t/results/layout/navigation_node/res_html/chapter.html
index 820de5d606..08c1beda67 100644
--- a/tp/t/results/layout/navigation_node/res_html/chapter.html
+++ b/tp/t/results/layout/navigation_node/res_html/chapter.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git a/tp/t/results/layout/navigation_node/res_html/index.html 
b/tp/t/results/layout/navigation_node/res_html/index.html
index ad67924fb5..9a4595bbb9 100644
--- a/tp/t/results/layout/navigation_node/res_html/index.html
+++ b/tp/t/results/layout/navigation_node/res_html/index.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="chapter.html" title="Next section 
in reading order"> &gt; </a>]</td>
diff --git a/tp/t/results/layout/navigation_node/res_html/section.html 
b/tp/t/results/layout/navigation_node/res_html/section.html
index a8a2c5949c..c4e32da883 100644
--- a/tp/t/results/layout/navigation_node/res_html/section.html
+++ b/tp/t/results/layout/navigation_node/res_html/section.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="chapter.html" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git a/tp/t/results/layout/navigation_node/res_html/subsection.html 
b/tp/t/results/layout/navigation_node/res_html/subsection.html
index 83a027b93e..d2989fed6a 100644
--- a/tp/t/results/layout/navigation_node/res_html/subsection.html
+++ b/tp/t/results/layout/navigation_node/res_html/subsection.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="section.html" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/t/results/layout/navigation_node_no_header/res_html/chapter.html 
b/tp/t/results/layout/navigation_node_no_header/res_html/chapter.html
index 73e2c5d9bc..ceafc4d974 100644
--- a/tp/t/results/layout/navigation_node_no_header/res_html/chapter.html
+++ b/tp/t/results/layout/navigation_node_no_header/res_html/chapter.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git a/tp/t/results/layout/navigation_node_no_header/res_html/index.html 
b/tp/t/results/layout/navigation_node_no_header/res_html/index.html
index 243bbd7f5a..5ea134e461 100644
--- a/tp/t/results/layout/navigation_node_no_header/res_html/index.html
+++ b/tp/t/results/layout/navigation_node_no_header/res_html/index.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="chapter.html" title="Next section 
in reading order"> &gt; </a>]</td>
diff --git 
a/tp/t/results/layout/navigation_node_no_header/res_html/section.html 
b/tp/t/results/layout/navigation_node_no_header/res_html/section.html
index 378a9ecd22..fca659ee8a 100644
--- a/tp/t/results/layout/navigation_node_no_header/res_html/section.html
+++ b/tp/t/results/layout/navigation_node_no_header/res_html/section.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="chapter.html" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/t/results/layout/navigation_node_no_header/res_html/subsection.html 
b/tp/t/results/layout/navigation_node_no_header/res_html/subsection.html
index 60a2f68620..08136ddbc0 100644
--- a/tp/t/results/layout/navigation_node_no_header/res_html/subsection.html
+++ b/tp/t/results/layout/navigation_node_no_header/res_html/subsection.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="section.html" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/t/results/layout/navigation_node_no_header_vertical/res_html/chapter.html 
b/tp/t/results/layout/navigation_node_no_header_vertical/res_html/chapter.html
index 73e2c5d9bc..ceafc4d974 100644
--- 
a/tp/t/results/layout/navigation_node_no_header_vertical/res_html/chapter.html
+++ 
b/tp/t/results/layout/navigation_node_no_header_vertical/res_html/chapter.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git 
a/tp/t/results/layout/navigation_node_no_header_vertical/res_html/index.html 
b/tp/t/results/layout/navigation_node_no_header_vertical/res_html/index.html
index 9da4b2ec43..4324eade05 100644
--- a/tp/t/results/layout/navigation_node_no_header_vertical/res_html/index.html
+++ b/tp/t/results/layout/navigation_node_no_header_vertical/res_html/index.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git 
a/tp/t/results/layout/navigation_node_no_header_vertical/res_html/section.html 
b/tp/t/results/layout/navigation_node_no_header_vertical/res_html/section.html
index 378a9ecd22..fca659ee8a 100644
--- 
a/tp/t/results/layout/navigation_node_no_header_vertical/res_html/section.html
+++ 
b/tp/t/results/layout/navigation_node_no_header_vertical/res_html/section.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="chapter.html" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/t/results/layout/navigation_node_no_header_vertical/res_html/subsection.html
 
b/tp/t/results/layout/navigation_node_no_header_vertical/res_html/subsection.html
index 60a2f68620..08136ddbc0 100644
--- 
a/tp/t/results/layout/navigation_node_no_header_vertical/res_html/subsection.html
+++ 
b/tp/t/results/layout/navigation_node_no_header_vertical/res_html/subsection.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="section.html" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git a/tp/t/results/layout/navigation_node_vertical/res_html/chapter.html 
b/tp/t/results/layout/navigation_node_vertical/res_html/chapter.html
index 3c030c5c6b..9706d4a59f 100644
--- a/tp/t/results/layout/navigation_node_vertical/res_html/chapter.html
+++ b/tp/t/results/layout/navigation_node_vertical/res_html/chapter.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git a/tp/t/results/layout/navigation_node_vertical/res_html/index.html 
b/tp/t/results/layout/navigation_node_vertical/res_html/index.html
index 47c6e36e63..23c817107a 100644
--- a/tp/t/results/layout/navigation_node_vertical/res_html/index.html
+++ b/tp/t/results/layout/navigation_node_vertical/res_html/index.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git a/tp/t/results/layout/navigation_node_vertical/res_html/section.html 
b/tp/t/results/layout/navigation_node_vertical/res_html/section.html
index a01333c5ca..46cdafea21 100644
--- a/tp/t/results/layout/navigation_node_vertical/res_html/section.html
+++ b/tp/t/results/layout/navigation_node_vertical/res_html/section.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git 
a/tp/t/results/layout/navigation_node_vertical/res_html/subsection.html 
b/tp/t/results/layout/navigation_node_vertical/res_html/subsection.html
index 0c92a16da0..821d1492df 100644
--- a/tp/t/results/layout/navigation_node_vertical/res_html/subsection.html
+++ b/tp/t/results/layout/navigation_node_vertical/res_html/subsection.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git a/tp/t/results/layout/navigation_section/res_html/chapter.html 
b/tp/t/results/layout/navigation_section/res_html/chapter.html
index 5f92b01395..8c1da52c3b 100644
--- a/tp/t/results/layout/navigation_section/res_html/chapter.html
+++ b/tp/t/results/layout/navigation_section/res_html/chapter.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git a/tp/t/results/layout/navigation_section/res_html/index.html 
b/tp/t/results/layout/navigation_section/res_html/index.html
index f66c66b8b3..fdb7f466c4 100644
--- a/tp/t/results/layout/navigation_section/res_html/index.html
+++ b/tp/t/results/layout/navigation_section/res_html/index.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="chapter.html" title="Next section 
in reading order"> &gt; </a>]</td>
diff --git a/tp/t/results/layout/navigation_section/res_html/section.html 
b/tp/t/results/layout/navigation_section/res_html/section.html
index c5f65b14fc..edc0d91a46 100644
--- a/tp/t/results/layout/navigation_section/res_html/section.html
+++ b/tp/t/results/layout/navigation_section/res_html/section.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="chapter.html" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -73,7 +73,7 @@ b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b  bb 
 b bb.
 </table>
 
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#section" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git 
a/tp/t/results/layout/navigation_section_no_header/res_html/chapter.html 
b/tp/t/results/layout/navigation_section_no_header/res_html/chapter.html
index 5f92b01395..8c1da52c3b 100644
--- a/tp/t/results/layout/navigation_section_no_header/res_html/chapter.html
+++ b/tp/t/results/layout/navigation_section_no_header/res_html/chapter.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git 
a/tp/t/results/layout/navigation_section_no_header/res_html/index.html 
b/tp/t/results/layout/navigation_section_no_header/res_html/index.html
index f66c66b8b3..fdb7f466c4 100644
--- a/tp/t/results/layout/navigation_section_no_header/res_html/index.html
+++ b/tp/t/results/layout/navigation_section_no_header/res_html/index.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="chapter.html" title="Next section 
in reading order"> &gt; </a>]</td>
diff --git 
a/tp/t/results/layout/navigation_section_no_header/res_html/section.html 
b/tp/t/results/layout/navigation_section_no_header/res_html/section.html
index b11137cb02..d6393fc7fe 100644
--- a/tp/t/results/layout/navigation_section_no_header/res_html/section.html
+++ b/tp/t/results/layout/navigation_section_no_header/res_html/section.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="chapter.html" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -73,7 +73,7 @@ b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b  bb 
 b bb.
 </table>
 
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <h3 class="subsection" id="Sub-section-in-section">1.1.1 Sub section in 
section</h3>
 
 
diff --git 
a/tp/t/results/layout/navigation_section_no_header_vertical/res_html/chapter.html
 
b/tp/t/results/layout/navigation_section_no_header_vertical/res_html/chapter.html
index ed34c989bc..3c615135dc 100644
--- 
a/tp/t/results/layout/navigation_section_no_header_vertical/res_html/chapter.html
+++ 
b/tp/t/results/layout/navigation_section_no_header_vertical/res_html/chapter.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git 
a/tp/t/results/layout/navigation_section_no_header_vertical/res_html/index.html 
b/tp/t/results/layout/navigation_section_no_header_vertical/res_html/index.html
index 47c6e36e63..23c817107a 100644
--- 
a/tp/t/results/layout/navigation_section_no_header_vertical/res_html/index.html
+++ 
b/tp/t/results/layout/navigation_section_no_header_vertical/res_html/index.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git 
a/tp/t/results/layout/navigation_section_no_header_vertical/res_html/section.html
 
b/tp/t/results/layout/navigation_section_no_header_vertical/res_html/section.html
index c0bc8dab0f..810f5cb817 100644
--- 
a/tp/t/results/layout/navigation_section_no_header_vertical/res_html/section.html
+++ 
b/tp/t/results/layout/navigation_section_no_header_vertical/res_html/section.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
@@ -104,7 +104,7 @@ b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b  
bb  b bb.
 </table>
 
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <h3 class="subsection" id="Sub-section-in-section">1.1.1 Sub section in 
section</h3>
 
 
diff --git 
a/tp/t/results/layout/navigation_section_vertical/res_html/chapter.html 
b/tp/t/results/layout/navigation_section_vertical/res_html/chapter.html
index ed34c989bc..3c615135dc 100644
--- a/tp/t/results/layout/navigation_section_vertical/res_html/chapter.html
+++ b/tp/t/results/layout/navigation_section_vertical/res_html/chapter.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git 
a/tp/t/results/layout/navigation_section_vertical/res_html/index.html 
b/tp/t/results/layout/navigation_section_vertical/res_html/index.html
index 47c6e36e63..23c817107a 100644
--- a/tp/t/results/layout/navigation_section_vertical/res_html/index.html
+++ b/tp/t/results/layout/navigation_section_vertical/res_html/index.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git 
a/tp/t/results/layout/navigation_section_vertical/res_html/section.html 
b/tp/t/results/layout/navigation_section_vertical/res_html/section.html
index 17f05af836..ec807499e1 100644
--- a/tp/t/results/layout/navigation_section_vertical/res_html/section.html
+++ b/tp/t/results/layout/navigation_section_vertical/res_html/section.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
@@ -104,7 +104,7 @@ b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b  
bb  b bb.
 </table>
 
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#section" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git a/tp/t/results/layout/navigation_vertical/res_html/navigation.html 
b/tp/t/results/layout/navigation_vertical/res_html/navigation.html
index 6e42c2bb96..1be3410c60 100644
--- a/tp/t/results/layout/navigation_vertical/res_html/navigation.html
+++ b/tp/t/results/layout/navigation_vertical/res_html/navigation.html
@@ -24,7 +24,7 @@ ul.toc-numbered-mark {list-style: none}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
@@ -61,7 +61,7 @@ ul.toc-numbered-mark {list-style: none}
 </tr>
 </table>
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
@@ -116,7 +116,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr>
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section 
in reading order"> &lt; </a>]</td>
@@ -167,7 +167,7 @@ b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b  
bb  b bb.
 </table>
 
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#section" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git a/tp/t/results/layout/no_monolithic/res_html/no_monolithic.html 
b/tp/t/results/layout/no_monolithic/res_html/no_monolithic.html
index 7d9c9711ea..b0c8e2cb91 100644
--- a/tp/t/results/layout/no_monolithic/res_html/no_monolithic.html
+++ b/tp/t/results/layout/no_monolithic/res_html/no_monolithic.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -45,7 +45,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
diff --git a/tp/t/results/menu/block_commands_in_menu_description.pl 
b/tp/t/results/menu/block_commands_in_menu_description.pl
index 42847dbe6a..528c8be206 100644
--- a/tp/t/results/menu/block_commands_in_menu_description.pl
+++ b/tp/t/results/menu/block_commands_in_menu_description.pl
@@ -844,7 +844,7 @@ ul.mark-bullet {list-style-type: disc}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="top">top</h1>
 
 <table class="menu" border="0" cellspacing="0">
diff --git a/tp/t/results/menu/comment_on_menu_line.pl 
b/tp/t/results/menu/comment_on_menu_line.pl
index 14e10895b6..3b9a0d9158 100644
--- a/tp/t/results/menu/comment_on_menu_line.pl
+++ b/tp/t/results/menu/comment_on_menu_line.pl
@@ -445,7 +445,7 @@ $result_converted{'html'}->{'comment_on_menu_line'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="chapter" id="Top">
+<div class="chapter-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#first" accesskey="n" rel="next">first</a> &nbsp; </p>
@@ -458,11 +458,11 @@ Next: <a href="#first" accesskey="n" rel="next">first</a> 
&nbsp; </p>
 
 <h2 class="chapter" id="first-1">1 first</h2>
 <hr>
-<a class="node" id="first"></a><div class="nav-header">
+<a class="node-id" id="first"></a><div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">first</a>, Up: <a 
href="#Top" accesskey="u" rel="up">first</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">first</h4>
+<h4 class="node">first</h4>
 </div>
 
 
diff --git a/tp/t/results/menu/detailmenu_on_subnodes.pl 
b/tp/t/results/menu/detailmenu_on_subnodes.pl
index 5f8405e6b9..1a3a9e77a6 100644
--- a/tp/t/results/menu/detailmenu_on_subnodes.pl
+++ b/tp/t/results/menu/detailmenu_on_subnodes.pl
@@ -1936,7 +1936,7 @@ pre.menu-comment-preformatted {font-family: serif}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; </p>
@@ -1963,7 +1963,7 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">chapter</a> &nbsp; </p>
 </table>
 
 <hr>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter-2" accesskey="n" rel="next">chapter 2</a>, Previous: 
<a href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">top</a> &nbsp; </p>
@@ -1976,7 +1976,7 @@ Next: <a href="#chapter-2" accesskey="n" 
rel="next">chapter 2</a>, Previous: <a
 </table>
 
 <hr>
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <div class="nav-header">
 <p>
 Up: <a href="#chapter" accesskey="u" rel="up">chapter</a> &nbsp; </p>
@@ -1986,7 +1986,7 @@ Up: <a href="#chapter" accesskey="u" rel="up">chapter</a> 
&nbsp; </p>
 <hr>
 </div>
 </div>
-<div class="chapter" id="chapter-2">
+<div class="chapter-level-extent" id="chapter-2">
 <div class="nav-header">
 <p>
 Previous: <a href="#chapter" accesskey="p" rel="prev">chapter</a>, Up: <a 
href="#Top" accesskey="u" rel="up">top</a> &nbsp; </p>
@@ -2001,7 +2001,7 @@ Previous: <a href="#chapter" accesskey="p" 
rel="prev">chapter</a>, Up: <a href="
 </table>
 
 <hr>
-<div class="section" id="section-chap-2">
+<div class="section-level-extent" id="section-chap-2">
 <div class="nav-header">
 <p>
 Next: <a href="#unnumberedsec" accesskey="n" rel="next">unnumberedsec</a>, Up: 
<a href="#chapter-2" accesskey="u" rel="up">chapter 2</a> &nbsp; </p>
@@ -2010,7 +2010,7 @@ Next: <a href="#unnumberedsec" accesskey="n" 
rel="next">unnumberedsec</a>, Up: <
 
 <hr>
 </div>
-<div class="unnumberedsec" id="unnumberedsec">
+<div class="unnumberedsec-level-extent" id="unnumberedsec">
 <div class="nav-header">
 <p>
 Previous: <a href="#section-chap-2" accesskey="p" rel="prev">section chap 
2</a>, Up: <a href="#chapter-2" accesskey="u" rel="up">chapter 2</a> &nbsp; </p>
diff --git a/tp/t/results/menu/detailmenu_unknown_node.pl 
b/tp/t/results/menu/detailmenu_unknown_node.pl
index 04fb700ae6..3788d979ac 100644
--- a/tp/t/results/menu/detailmenu_unknown_node.pl
+++ b/tp/t/results/menu/detailmenu_unknown_node.pl
@@ -338,7 +338,7 @@ $result_converted{'html'}->{'detailmenu_unknown_node'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; unknown:</td><td>&nbsp;&nbsp;</td><td 
align="left" valign="top">
diff --git a/tp/t/results/menu/entry_after_detailmenu.pl 
b/tp/t/results/menu/entry_after_detailmenu.pl
index a3321f0745..f36ec9e642 100644
--- a/tp/t/results/menu/entry_after_detailmenu.pl
+++ b/tp/t/results/menu/entry_after_detailmenu.pl
@@ -830,11 +830,11 @@ pre.menu-comment-preformatted {font-family: serif}
 </head>
 
 <body lang="en">
-<a class="node" id="Top"></a><div class="nav-header">
+<a class="node-id" id="Top"></a><div class="nav-header">
 <p>
 Next: <a href="#first" accesskey="n" rel="next">first</a> &nbsp; </p>
 </div>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a href="#second" 
accesskey="1">second</a>:</td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top">
@@ -854,17 +854,17 @@ Menu comment
 </table>
 
 <hr>
-<a class="node" id="first"></a><div class="nav-header">
+<a class="node-id" id="first"></a><div class="nav-header">
 <p>
 Next: <a href="#second" accesskey="n" rel="next">second</a>, Previous: <a 
href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">first</h4>
+<h4 class="node">first</h4>
 <hr>
-<a class="node" id="second"></a><div class="nav-header">
+<a class="node-id" id="second"></a><div class="nav-header">
 <p>
 Previous: <a href="#first" accesskey="p" rel="prev">first</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">second</h4>
+<h4 class="node">second</h4>
 
 
 
diff --git a/tp/t/results/menu/example_in_menu_description.pl 
b/tp/t/results/menu/example_in_menu_description.pl
index 43ef25bc40..1e48e3b05c 100644
--- a/tp/t/results/menu/example_in_menu_description.pl
+++ b/tp/t/results/menu/example_in_menu_description.pl
@@ -490,7 +490,7 @@ pre.menu-comment-preformatted {font-family: serif}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="top">top</h1>
 
 <table class="menu" border="0" cellspacing="0">
diff --git a/tp/t/results/menu/formats_in_menu.pl 
b/tp/t/results/menu/formats_in_menu.pl
index 67eb37be46..739e299f6a 100644
--- a/tp/t/results/menu/formats_in_menu.pl
+++ b/tp/t/results/menu/formats_in_menu.pl
@@ -1030,7 +1030,7 @@ pre.menu-preformatted {font-family: serif}
 </head>
 
 <body lang="en">
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a href="gcc.html#Top" 
accesskey="1">(gcc)</a>:</td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top">text
diff --git a/tp/t/results/menu/inlineraw_in_menu_description.pl 
b/tp/t/results/menu/inlineraw_in_menu_description.pl
index 54c5b548aa..7b68020ce0 100644
--- a/tp/t/results/menu/inlineraw_in_menu_description.pl
+++ b/tp/t/results/menu/inlineraw_in_menu_description.pl
@@ -460,7 +460,7 @@ pre.menu-comment-preformatted {font-family: serif}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="top">top</h1>
 
 <table class="menu" border="0" cellspacing="0">
diff --git a/tp/t/results/menu/invalid_info_menu_entry.pl 
b/tp/t/results/menu/invalid_info_menu_entry.pl
index cbf17101b2..2396fd31a5 100644
--- a/tp/t/results/menu/invalid_info_menu_entry.pl
+++ b/tp/t/results/menu/invalid_info_menu_entry.pl
@@ -896,7 +896,7 @@ $result_converted{'html'}->{'invalid_info_menu_entry'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a href="f.html#a_003a" 
accesskey="1">(f)a:</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
diff --git a/tp/t/results/menu/menu_in_example.pl 
b/tp/t/results/menu/menu_in_example.pl
index 82ae838040..83d24d5c40 100644
--- a/tp/t/results/menu/menu_in_example.pl
+++ b/tp/t/results/menu/menu_in_example.pl
@@ -749,7 +749,7 @@ pre.menu-preformatted {font-family: serif}
 </head>
 
 <body lang="en">
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 <div class="example">
 <table class="menu" border="0" cellspacing="0"><tr><td>
diff --git a/tp/t/results/menu/menu_pointing_to_anchor.pl 
b/tp/t/results/menu/menu_pointing_to_anchor.pl
index 60f51dea79..955e147eed 100644
--- a/tp/t/results/menu/menu_pointing_to_anchor.pl
+++ b/tp/t/results/menu/menu_pointing_to_anchor.pl
@@ -438,7 +438,7 @@ $result_converted{'html'}->{'menu_pointing_to_anchor'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="top">top</h1>
 
 <p>Text
diff --git a/tp/t/results/menu/menu_title_before_entries.pl 
b/tp/t/results/menu/menu_title_before_entries.pl
index 5b5532dc05..97326f68ff 100644
--- a/tp/t/results/menu/menu_title_before_entries.pl
+++ b/tp/t/results/menu/menu_title_before_entries.pl
@@ -378,11 +378,11 @@ pre.menu-comment-preformatted {font-family: serif}
 </head>
 
 <body lang="en">
-<a class="node" id="Top"></a><div class="nav-header">
+<a class="node-id" id="Top"></a><div class="nav-header">
 <p>
 Next: <a href="#subnode" accesskey="n" rel="next">subnode</a> &nbsp; </p>
 </div>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><th colspan="3" align="left" valign="top"><pre 
class="menu-comment-preformatted">Horizontal space
@@ -391,11 +391,11 @@ Next: <a href="#subnode" accesskey="n" 
rel="next">subnode</a> &nbsp; </p>
 </table>
 
 <hr>
-<a class="node" id="subnode"></a><div class="nav-header">
+<a class="node-id" id="subnode"></a><div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">subnode</h4>
+<h4 class="node">subnode</h4>
 
 
 
diff --git a/tp/t/results/menu/no_colon_in_menu.pl 
b/tp/t/results/menu/no_colon_in_menu.pl
index 7b39adbbdc..942394692e 100644
--- a/tp/t/results/menu/no_colon_in_menu.pl
+++ b/tp/t/results/menu/no_colon_in_menu.pl
@@ -220,7 +220,7 @@ pre.menu-comment-preformatted {font-family: serif}
 </head>
 
 <body lang="en">
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><th colspan="3" align="left" valign="top"><pre 
class="menu-comment-preformatted">* a
diff --git a/tp/t/results/menu/reference_to_external_manual.pl 
b/tp/t/results/menu/reference_to_external_manual.pl
index 6642656abc..307b535266 100644
--- a/tp/t/results/menu/reference_to_external_manual.pl
+++ b/tp/t/results/menu/reference_to_external_manual.pl
@@ -310,7 +310,7 @@ $result_converted{'html'}->{'reference_to_external_manual'} 
= '<!DOCTYPE html>
 
 <body lang="en">
 
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a href="info.html#Top" 
accesskey="1">(info)</a>:</td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top">
diff --git a/tp/t/results/menu/sc_in_menu.pl b/tp/t/results/menu/sc_in_menu.pl
index 0839891f05..92ecfb2381 100644
--- a/tp/t/results/menu/sc_in_menu.pl
+++ b/tp/t/results/menu/sc_in_menu.pl
@@ -1141,11 +1141,11 @@ pre.menu-preformatted {font-family: serif}
 
 <body lang="en">
 
-<a class="node" id="Top"></a><div class="nav-header">
+<a class="node-id" id="Top"></a><div class="nav-header">
 <p>
 Next: <a href="#NODE" accesskey="n" rel="next"><small 
class="sc">NODE</small></a> &nbsp; </p>
 </div>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a href="#NODE" accesskey="1"><small 
class="sc">VALUE</small></a>:</td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top"><small class="sc">DESCRIP TION</small>
@@ -1162,11 +1162,11 @@ Next: <a href="#NODE" accesskey="n" rel="next"><small 
class="sc">NODE</small></a
 </th></tr></table>
 
 <hr>
-<a class="node" id="NODE"></a><div class="nav-header">
+<a class="node-id" id="NODE"></a><div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
-<h4 class="node-heading"><small class="sc">NODE</small></h4>
+<h4 class="node"><small class="sc">NODE</small></h4>
 
 <div class="example">
 <table class="menu" border="0" cellspacing="0"><tr><td>
diff --git a/tp/t/results/menu/submenu_in_example.pl 
b/tp/t/results/menu/submenu_in_example.pl
index 2d44f804ef..0993c86343 100644
--- a/tp/t/results/menu/submenu_in_example.pl
+++ b/tp/t/results/menu/submenu_in_example.pl
@@ -898,7 +898,7 @@ pre.menu-comment-preformatted {font-family: serif}
 </head>
 
 <body lang="en">
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 <div class="example">
 <pre class="example-preformatted">
diff --git a/tp/t/results/menu/verb_in_menu_description.pl 
b/tp/t/results/menu/verb_in_menu_description.pl
index afbe25c903..512858041f 100644
--- a/tp/t/results/menu/verb_in_menu_description.pl
+++ b/tp/t/results/menu/verb_in_menu_description.pl
@@ -444,7 +444,7 @@ pre.menu-comment-preformatted {font-family: serif}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="top">top</h1>
 
 <table class="menu" border="0" cellspacing="0">
diff --git 
a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl 
b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
index e7cee64bad..0e4e5a1ba9 100644
--- a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -5299,7 +5299,7 @@ 
$result_converted{'html_text'}->{'codequoteundirected_codequotebacktick'} = '
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="test-quotes">test quotes</h1>
 
 <p>&ldquo;simple-double&ndash;three&mdash;four&mdash;-&rdquo; 
&lsquo;simple&rsquo; quotedblleft: &ldquo; <br>
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 e04c428640..4b1e23d12c 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
@@ -830,7 +830,7 @@ Text 1
 
 
 $result_converted{'html_text'}->{'comment_space_command_on_line'} = '
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="top-element-">top element&nbsp;</h1>
 
 
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 6743c0e50a..0f9e27f790 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
@@ -229,18 +229,18 @@ Subheading
 ';
 
 
-$result_converted{'html_text'}->{'no_empty_line_between_headings'} = '<div 
class="top" id="Top">
+$result_converted{'html_text'}->{'no_empty_line_between_headings'} = '<div 
class="top-level-extent" id="Top">
 <h1 class="top">Top</h1>
 <h4 class="subheading" id="Subheading">Subheading</h4>
 <ul class="mini-toc">
 <li><a href="#Chapter" accesskey="1">Chapter</a></li>
 </ul>
-<div class="chapter" id="Chapter">
+<div class="chapter-level-extent" id="Chapter">
 <h2 class="chapter">1 Chapter</h2>
 <ul class="mini-toc">
 <li><a href="#Section" accesskey="1">Section</a></li>
 </ul>
-<div class="section" id="Section">
+<div class="section-level-extent" id="Section">
 <h3 class="section">1.1 Section</h3>
 </div>
 </div>
diff --git a/tp/t/results/misc_commands/ref_in_center.pl 
b/tp/t/results/misc_commands/ref_in_center.pl
index e6c726c6d0..285a57d7a7 100644
--- a/tp/t/results/misc_commands/ref_in_center.pl
+++ b/tp/t/results/misc_commands/ref_in_center.pl
@@ -294,7 +294,7 @@ $result_converted{'plaintext'}->{'ref_in_center'} = '
 ';
 
 
-$result_converted{'html_text'}->{'ref_in_center'} = '<h1 class="node-heading" 
id="Top">Top</h1>
+$result_converted{'html_text'}->{'ref_in_center'} = '<h1 class="node" 
id="Top">Top</h1>
 
 <div class="center"><a class="ref" href="#Top">Top</a>
 </div>
diff --git a/tp/t/results/misc_commands/test_allowcodebreaks.pl 
b/tp/t/results/misc_commands/test_allowcodebreaks.pl
index 54cfb95e85..c9ec0185ee 100644
--- a/tp/t/results/misc_commands/test_allowcodebreaks.pl
+++ b/tp/t/results/misc_commands/test_allowcodebreaks.pl
@@ -2740,7 +2740,7 @@ Out of code — out-of-code. ‘1aaa’ ‘2aaa-’ ‘-3bbb’ 
‘4aaa-bbb’
 ';
 
 
-$result_converted{'html_text'}->{'test_allowcodebreaks'} = '<h1 
class="node-heading" id="Top">Top</h1>
+$result_converted{'html_text'}->{'test_allowcodebreaks'} = '<h1 class="node" 
id="Top">Top</h1>
 
 
 
diff --git a/tp/t/results/morecoverage/formatting_fr.pl 
b/tp/t/results/morecoverage/formatting_fr.pl
index 3a4c877d33..3b15fc220e 100644
--- a/tp/t/results/morecoverage/formatting_fr.pl
+++ b/tp/t/results/morecoverage/formatting_fr.pl
@@ -4925,7 +4925,7 @@ ul.toc-numbered-mark {list-style: none}
 
 </p><hr>
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Section suivante 
dans l&rsquo;ordre de lecture"> &gt; </a>]</td>
@@ -5067,7 +5067,7 @@ Menu comment
 
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="D&eacute;but de ce 
chapitre ou chapitre pr&eacute;c&eacute;dent"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Section 
pr&eacute;c&eacute;dente dans l&rsquo;ordre de lecture"> &lt; </a>]</td>
@@ -5100,7 +5100,7 @@ Menu comment
 </div>
 
 <hr>
-<div class="section" id="s_002d_002dect_002cion">
+<div class="section-level-extent" id="s_002d_002dect_002cion">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="D&eacute;but 
de ce chapitre ou chapitre pr&eacute;c&eacute;dent"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Section 
pr&eacute;c&eacute;dente dans l&rsquo;ordre de lecture"> &lt; </a>]</td>
@@ -5132,7 +5132,7 @@ Menu comment
 </table>
 
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="D&eacute;but 
de ce chapitre ou chapitre pr&eacute;c&eacute;dent"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#s_002d_002dect_002cion" 
title="Section pr&eacute;c&eacute;dente dans l&rsquo;ordre de lecture"> &lt; 
</a>]</td>
@@ -5159,7 +5159,7 @@ Menu comment
 
 <a class="anchor" id="anchor"></a>
 <hr>
-<div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
+<div class="subsubsection-level-extent" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="D&eacute;but 
de ce chapitre ou chapitre pr&eacute;c&eacute;dent"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#subsection" title="Section 
pr&eacute;c&eacute;dente dans l&rsquo;ordre de lecture"> &lt; </a>]</td>
@@ -5179,7 +5179,7 @@ Menu comment
 
 <hr>
 </div>
-<div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
+<div class="subsubsection-level-extent" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="D&eacute;but 
de ce chapitre ou chapitre pr&eacute;c&eacute;dent"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a 
href="#subsubsection-_0060_0060simple_002ddouble_002d_002d" title="Section 
pr&eacute;c&eacute;dente dans l&rsquo;ordre de lecture"> &lt; </a>]</td>
@@ -5202,7 +5202,7 @@ Menu comment
 </div>
 </div>
 </div>
-<div class="centerchap" id="chapter2">
+<div class="centerchap-level-extent" id="chapter2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="D&eacute;but 
de ce chapitre ou chapitre pr&eacute;c&eacute;dent"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a 
href="#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" 
title="Section pr&eacute;c&eacute;dente dans l&rsquo;ordre de lecture"> &lt; 
</a>]</td>
@@ -5490,7 +5490,7 @@ $result_converted{'html_text'}->{'formatting_fr'} = '<h1 
class="title">title &nd
 
 </p><hr>
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[ &gt; ]</td>
@@ -5632,7 +5632,7 @@ Menu comment
 
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[ &lt; ]</td>
@@ -5665,7 +5665,7 @@ Menu comment
 </div>
 
 <hr>
-<div class="section" id="s_002d_002dect_002cion">
+<div class="section-level-extent" id="s_002d_002dect_002cion">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[ &lt; ]</td>
@@ -5697,7 +5697,7 @@ Menu comment
 </table>
 
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[ &lt; ]</td>
@@ -5724,7 +5724,7 @@ Menu comment
 
 <a class="anchor" id="anchor"></a>
 <hr>
-<div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
+<div class="subsubsection-level-extent" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[ &lt; ]</td>
@@ -5744,7 +5744,7 @@ Menu comment
 
 <hr>
 </div>
-<div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
+<div class="subsubsection-level-extent" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[ &lt; ]</td>
@@ -5767,7 +5767,7 @@ Menu comment
 </div>
 </div>
 </div>
-<div class="centerchap" id="chapter2">
+<div class="centerchap-level-extent" id="chapter2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[ &lt; ]</td>
diff --git a/tp/t/results/morecoverage/texi_formatting.pl 
b/tp/t/results/morecoverage/texi_formatting.pl
index 8d67edf1c6..da3f623abf 100644
--- a/tp/t/results/morecoverage/texi_formatting.pl
+++ b/tp/t/results/morecoverage/texi_formatting.pl
@@ -4912,7 +4912,7 @@ ul.toc-numbered-mark {list-style: none}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a 
href="#Top" title="Index" rel="index">Index</a>]</p>
@@ -5072,7 +5072,7 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">chapter</a> &nbsp; [<a href="#
 </div>
 </div>
 <hr>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter2" accesskey="n" rel="next">chapter 2</a>, Previous: <a 
href="#Top" accesskey="p" rel="prev">Top section</a>, Up: <a href="#Top" 
accesskey="u" rel="up">Top section</a> &nbsp; [<a href="#SEC_Contents" 
title="Table of contents" rel="contents">Contents</a>][<a href="#Top" 
title="Index" rel="index">Index</a>]</p>
@@ -5086,7 +5086,7 @@ Next: <a href="#chapter2" accesskey="n" 
rel="next">chapter 2</a>, Previous: <a h
 <li><a href="#s_002d_002dect_002cion" accesskey="1">A section</a></li>
 </ul>
 <hr>
-<div class="section" id="s_002d_002dect_002cion">
+<div class="section-level-extent" id="s_002d_002dect_002cion">
 <div class="nav-header">
 <p>
 Up: <a href="#chapter" accesskey="u" rel="up">chapter</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a 
href="#Top" title="Index" rel="index">Index</a>]</p>
@@ -5098,7 +5098,7 @@ Up: <a href="#chapter" accesskey="u" rel="up">chapter</a> 
&nbsp; [<a href="#SEC_
 <li><a href="#subsection" accesskey="1">subsection</a></li>
 </ul>
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <div class="nav-header">
 <p>
 Up: <a href="#s_002d_002dect_002cion" accesskey="u" rel="up">A section</a> 
&nbsp; [<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>][<a href="#Top" title="Index" 
rel="index">Index</a>]</p>
@@ -5112,7 +5112,7 @@ Up: <a href="#s_002d_002dect_002cion" accesskey="u" 
rel="up">A section</a> &nbsp
 <li><a 
href="#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" 
accesskey="2">three&mdash;four&mdash;-&rdquo;</a></li>
 </ul>
 <hr>
-<div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
+<div class="subsubsection-level-extent" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
 <div class="nav-header">
 <p>
 Next: <a 
href="#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" 
accesskey="n" rel="next">three&mdash;four&mdash;-&rdquo;</a>, Up: <a 
href="#subsection" accesskey="u" rel="up">subsection</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a 
href="#Top" title="Index" rel="index">Index</a>]</p>
@@ -5121,7 +5121,7 @@ Next: <a 
href="#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_
 
 <hr>
 </div>
-<div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
+<div class="subsubsection-level-extent" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
 <div class="nav-header">
 <p>
 Previous: <a href="#subsubsection-_0060_0060simple_002ddouble_002d_002d" 
accesskey="p" rel="prev">subsubsection &ldquo;simple-double&ndash;</a>, Up: <a 
href="#subsection" accesskey="u" rel="up">subsection</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a 
href="#Top" title="Index" rel="index">Index</a>]</p>
@@ -5133,7 +5133,7 @@ Previous: <a 
href="#subsubsection-_0060_0060simple_002ddouble_002d_002d" accessk
 </div>
 </div>
 </div>
-<div class="centerchap" id="chapter2">
+<div class="centerchap-level-extent" id="chapter2">
 <div class="nav-header">
 <p>
 Previous: <a href="#chapter" accesskey="p" rel="prev">chapter</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Top section</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a 
href="#Top" title="Index" rel="index">Index</a>]</p>
@@ -5237,7 +5237,7 @@ Previous: <a href="#chapter" accesskey="p" 
rel="prev">chapter</a>, Up: <a href="
 
 
 $result_converted{'html_text'}->{'texi_formatting'} = '
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
  &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
@@ -5397,7 +5397,7 @@ $result_converted{'html_text'}->{'texi_formatting'} = '
 </div>
 </div>
 <hr>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
  &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
@@ -5411,7 +5411,7 @@ $result_converted{'html_text'}->{'texi_formatting'} = '
 <li><a href="#s_002d_002dect_002cion" accesskey="1">A section</a></li>
 </ul>
 <hr>
-<div class="section" id="s_002d_002dect_002cion">
+<div class="section-level-extent" id="s_002d_002dect_002cion">
 <div class="nav-header">
 <p>
  &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
@@ -5423,7 +5423,7 @@ $result_converted{'html_text'}->{'texi_formatting'} = '
 <li><a href="#subsection" accesskey="1">subsection</a></li>
 </ul>
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <div class="nav-header">
 <p>
  &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
@@ -5437,7 +5437,7 @@ $result_converted{'html_text'}->{'texi_formatting'} = '
 <li><a 
href="#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" 
accesskey="2">three&mdash;four&mdash;-&rdquo;</a></li>
 </ul>
 <hr>
-<div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
+<div class="subsubsection-level-extent" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
 <div class="nav-header">
 <p>
  &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
@@ -5446,7 +5446,7 @@ $result_converted{'html_text'}->{'texi_formatting'} = '
 
 <hr>
 </div>
-<div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
+<div class="subsubsection-level-extent" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
 <div class="nav-header">
 <p>
  &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
@@ -5458,7 +5458,7 @@ $result_converted{'html_text'}->{'texi_formatting'} = '
 </div>
 </div>
 </div>
-<div class="centerchap" id="chapter2">
+<div class="centerchap-level-extent" id="chapter2">
 <div class="nav-header">
 <p>
  &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
diff --git a/tp/t/results/moreindices/index_no_node/res_html/Chapter-2.html 
b/tp/t/results/moreindices/index_no_node/res_html/Chapter-2.html
index d2b98d125f..321e4a9548 100644
--- a/tp/t/results/moreindices/index_no_node/res_html/Chapter-2.html
+++ b/tp/t/results/moreindices/index_no_node/res_html/Chapter-2.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="Chapter-2">
+<div class="chapter-level-extent" id="Chapter-2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="Chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="Chapter.html" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git a/tp/t/results/moreindices/index_no_node/res_html/Chapter.html 
b/tp/t/results/moreindices/index_no_node/res_html/Chapter.html
index 4fe65c535f..88f3aab00f 100644
--- a/tp/t/results/moreindices/index_no_node/res_html/Chapter.html
+++ b/tp/t/results/moreindices/index_no_node/res_html/Chapter.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="Chapter">
+<div class="chapter-level-extent" id="Chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html#top-section" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html#second" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git a/tp/t/results/moreindices/index_no_node/res_html/index.html 
b/tp/t/results/moreindices/index_no_node/res_html/index.html
index 11e7eb17f6..42e20f4deb 100644
--- a/tp/t/results/moreindices/index_no_node/res_html/index.html
+++ b/tp/t/results/moreindices/index_no_node/res_html/index.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="unnumbered" id="top-section">
+<div class="unnumbered-level-extent" id="top-section">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="unnumbered.html" 
title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#second" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -93,7 +93,7 @@ span.program-in-footer {font-size: smaller}
 
 
 <hr style="height: 6px;">
-<div class="section" id="second">
+<div class="section-level-extent" id="second">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#top-section" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#top-section" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git a/tp/t/results/moreindices/index_no_node/res_html/unnumbered.html 
b/tp/t/results/moreindices/index_no_node/res_html/unnumbered.html
index 8008f9a522..3026883e28 100644
--- a/tp/t/results/moreindices/index_no_node/res_html/unnumbered.html
+++ b/tp/t/results/moreindices/index_no_node/res_html/unnumbered.html
@@ -74,7 +74,7 @@ span.program-in-footer {font-size: smaller}
 </div>
 
 
-<div class="unnumbered" id="unnumbered">
+<div class="unnumbered-level-extent" id="unnumbered">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[ &lt; ]</td>
diff --git a/tp/t/results/moreindices/index_split/res_html/first.html 
b/tp/t/results/moreindices/index_split/res_html/first.html
index 2d15ddfa73..d0644e5748 100644
--- a/tp/t/results/moreindices/index_split/res_html/first.html
+++ b/tp/t/results/moreindices/index_split/res_html/first.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="first">
+<div class="chapter-level-extent" id="first">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
@@ -168,7 +168,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr>
-<div class="section" id="section-1">
+<div class="section-level-extent" id="section-1">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#first" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#first" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -268,7 +268,7 @@ span.program-in-footer {font-size: smaller}
 <a class="index-entry-id" id="index-another"></a>
 
 <hr>
-<div class="subsection" id="subsection-1">
+<div class="subsection-level-extent" id="subsection-1">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#first" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#section-1" title="Previous section 
in reading order"> &lt; </a>]</td>
@@ -290,7 +290,7 @@ span.program-in-footer {font-size: smaller}
 </p>
 <hr>
 </div>
-<div class="subsection" id="subsection-2">
+<div class="subsection-level-extent" id="subsection-2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#first" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#subsection-1" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -386,7 +386,7 @@ span.program-in-footer {font-size: smaller}
 <hr>
 </div>
 </div>
-<div class="section" id="section-2">
+<div class="section-level-extent" id="section-2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#first" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#subsection-2" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -408,7 +408,7 @@ span.program-in-footer {font-size: smaller}
 </p>
 <hr>
 </div>
-<div class="section" id="section-3">
+<div class="section-level-extent" id="section-3">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#first" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#section-2" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git a/tp/t/results/moreindices/index_split/res_html/index.html 
b/tp/t/results/moreindices/index_split/res_html/index.html
index 1f871df853..6b1625b27a 100644
--- a/tp/t/results/moreindices/index_split/res_html/index.html
+++ b/tp/t/results/moreindices/index_split/res_html/index.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="first.html#first" title="Next 
section in reading order"> &gt; </a>]</td>
diff --git a/tp/t/results/moreindices/index_split/res_html/second-chapter.html 
b/tp/t/results/moreindices/index_split/res_html/second-chapter.html
index fd86c7c0e3..50f6043271 100644
--- a/tp/t/results/moreindices/index_split/res_html/second-chapter.html
+++ b/tp/t/results/moreindices/index_split/res_html/second-chapter.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="second-chapter">
+<div class="chapter-level-extent" id="second-chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="first.html#first" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="first.html#section-3" 
title="Previous section in reading order"> &lt; </a>]</td>
diff --git a/tp/t/results/moreindices/index_split_nodes/res_html/first.html 
b/tp/t/results/moreindices/index_split_nodes/res_html/first.html
index 75665f985d..d337f00c8d 100644
--- a/tp/t/results/moreindices/index_split_nodes/res_html/first.html
+++ b/tp/t/results/moreindices/index_split_nodes/res_html/first.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="first">
+<div class="chapter-level-extent" id="first">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git a/tp/t/results/moreindices/index_split_nodes/res_html/index.html 
b/tp/t/results/moreindices/index_split_nodes/res_html/index.html
index 5c39a60060..ebe6560d18 100644
--- a/tp/t/results/moreindices/index_split_nodes/res_html/index.html
+++ b/tp/t/results/moreindices/index_split_nodes/res_html/index.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="first.html" title="Next section in 
reading order"> &gt; </a>]</td>
diff --git 
a/tp/t/results/moreindices/index_split_nodes/res_html/node-2-in-section-3.html 
b/tp/t/results/moreindices/index_split_nodes/res_html/node-2-in-section-3.html
index 5b578205cb..5f0ecaeaf9 100644
--- 
a/tp/t/results/moreindices/index_split_nodes/res_html/node-2-in-section-3.html
+++ 
b/tp/t/results/moreindices/index_split_nodes/res_html/node-2-in-section-3.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<a class="node" id="node-2-in-section-3"></a><table class="nav-header" 
cellpadding="1" cellspacing="1" border="0">
+<a class="node-id" id="node-2-in-section-3"></a><table class="nav-header" 
cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[<a href="node-in-section-3.html" 
title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="first.html" title="Up section"> Up 
</a>]</td>
@@ -39,7 +39,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<h3 class="node-heading">node 2 in section 3</h3>
+<h3 class="node">node 2 in section 3</h3>
 
 <a class="index-entry-id" id="index-node-2-in-section-3"></a>
 <p>Text for the node 2 in section 3
diff --git 
a/tp/t/results/moreindices/index_split_nodes/res_html/node-3-in-section-3.html 
b/tp/t/results/moreindices/index_split_nodes/res_html/node-3-in-section-3.html
index 56f306b9fe..a11ecd5159 100644
--- 
a/tp/t/results/moreindices/index_split_nodes/res_html/node-3-in-section-3.html
+++ 
b/tp/t/results/moreindices/index_split_nodes/res_html/node-3-in-section-3.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<a class="node" id="node-3-in-section-3"></a><table class="nav-header" 
cellpadding="1" cellspacing="1" border="0">
+<a class="node-id" id="node-3-in-section-3"></a><table class="nav-header" 
cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[<a href="node-2-in-section-3.html" 
title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="first.html" title="Up section"> Up 
</a>]</td>
@@ -38,7 +38,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<h3 class="node-heading">node 3 in section 3</h3>
+<h3 class="node">node 3 in section 3</h3>
 
 <a class="index-entry-id" id="index-node-3-in-section-3"></a>
 
diff --git 
a/tp/t/results/moreindices/index_split_nodes/res_html/node-in-section-3.html 
b/tp/t/results/moreindices/index_split_nodes/res_html/node-in-section-3.html
index 9265a24eb5..cc1fb8cdd9 100644
--- a/tp/t/results/moreindices/index_split_nodes/res_html/node-in-section-3.html
+++ b/tp/t/results/moreindices/index_split_nodes/res_html/node-in-section-3.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<a class="node" id="node-in-section-3"></a><table class="nav-header" 
cellpadding="1" cellspacing="1" border="0">
+<a class="node-id" id="node-in-section-3"></a><table class="nav-header" 
cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[<a href="section-3.html" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="first.html" title="Up section"> Up 
</a>]</td>
@@ -38,7 +38,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<h3 class="node-heading">node in section 3</h3>
+<h3 class="node">node in section 3</h3>
 
 <a class="index-entry-id" id="index-node-in-section-3"></a>
 <p>Text for the node in section 3
diff --git 
a/tp/t/results/moreindices/index_split_nodes/res_html/second-chapter.html 
b/tp/t/results/moreindices/index_split_nodes/res_html/second-chapter.html
index be93fe3340..d0c6a62684 100644
--- a/tp/t/results/moreindices/index_split_nodes/res_html/second-chapter.html
+++ b/tp/t/results/moreindices/index_split_nodes/res_html/second-chapter.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="second-chapter">
+<div class="chapter-level-extent" id="second-chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="first.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="node-3-in-section-3.html" 
title="Previous section in reading order"> &lt; </a>]</td>
diff --git a/tp/t/results/moreindices/index_split_nodes/res_html/section-1.html 
b/tp/t/results/moreindices/index_split_nodes/res_html/section-1.html
index 31f1fab159..df45b6234c 100644
--- a/tp/t/results/moreindices/index_split_nodes/res_html/section-1.html
+++ b/tp/t/results/moreindices/index_split_nodes/res_html/section-1.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="section" id="section-1">
+<div class="section-level-extent" id="section-1">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="first.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="first.html" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git a/tp/t/results/moreindices/index_split_nodes/res_html/section-2.html 
b/tp/t/results/moreindices/index_split_nodes/res_html/section-2.html
index a974406cb8..6b0427b244 100644
--- a/tp/t/results/moreindices/index_split_nodes/res_html/section-2.html
+++ b/tp/t/results/moreindices/index_split_nodes/res_html/section-2.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="section" id="section-2">
+<div class="section-level-extent" id="section-2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="first.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="subsection-2.html" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git a/tp/t/results/moreindices/index_split_nodes/res_html/section-3.html 
b/tp/t/results/moreindices/index_split_nodes/res_html/section-3.html
index 6730c9193d..3f9d3c0355 100644
--- a/tp/t/results/moreindices/index_split_nodes/res_html/section-3.html
+++ b/tp/t/results/moreindices/index_split_nodes/res_html/section-3.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="section" id="section-3">
+<div class="section-level-extent" id="section-3">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="first.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="section-2.html" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/t/results/moreindices/index_split_nodes/res_html/subsection-1.html 
b/tp/t/results/moreindices/index_split_nodes/res_html/subsection-1.html
index d5542fa14b..1b6cf6be23 100644
--- a/tp/t/results/moreindices/index_split_nodes/res_html/subsection-1.html
+++ b/tp/t/results/moreindices/index_split_nodes/res_html/subsection-1.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="subsection" id="subsection-1">
+<div class="subsection-level-extent" id="subsection-1">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="first.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="section-1.html" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/t/results/moreindices/index_split_nodes/res_html/subsection-2.html 
b/tp/t/results/moreindices/index_split_nodes/res_html/subsection-2.html
index ec3db1428d..3c0f1466c7 100644
--- a/tp/t/results/moreindices/index_split_nodes/res_html/subsection-2.html
+++ b/tp/t/results/moreindices/index_split_nodes/res_html/subsection-2.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="subsection" id="subsection-2">
+<div class="subsection-level-extent" id="subsection-2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="first.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="subsection-1.html" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/t/results/moreindices/nodes_before_top/res_html/first-before-top.html 
b/tp/t/results/moreindices/nodes_before_top/res_html/first-before-top.html
index 465f2b73f9..51e273de01 100644
--- a/tp/t/results/moreindices/nodes_before_top/res_html/first-before-top.html
+++ b/tp/t/results/moreindices/nodes_before_top/res_html/first-before-top.html
@@ -25,7 +25,7 @@ span.program-in-footer {font-size: smaller}
 <body lang="en">
 
 
-<a class="node" id="first-before-top"></a><table class="nav-header" 
cellpadding="1" cellspacing="1" border="0">
+<a class="node-id" id="first-before-top"></a><table class="nav-header" 
cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="../dir/index.html" title="Up 
section"> Up </a>]</td>
@@ -40,7 +40,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a href="#first-before-top" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a 
href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
 </tr></table>
-<h3 class="node-heading">first before top</h3>
+<h3 class="node">first before top</h3>
 <a class="index-entry-id" id="index-first-before-top"></a>
 <div class="printindex cp-printindex">
 <table class="cp-letters-header-printindex"><tr><th valign="top">Jump to: 
&nbsp; </th><td><a class="summary-letter-printindex" 
href="#first-before-top_cp_symbol-1"><b>!</b></a>
@@ -111,7 +111,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr>
-<a class="node" id="node-in-menu-before-top"></a><table class="nav-header" 
cellpadding="1" cellspacing="1" border="0">
+<a class="node-id" id="node-in-menu-before-top"></a><table class="nav-header" 
cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[<a href="#first-before-top" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#first-before-top" title="Up 
section"> Up </a>]</td>
@@ -126,7 +126,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a href="#first-before-top" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a 
href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
 </tr></table>
-<h3 class="node-heading">node in menu before top</h3>
+<h3 class="node">node in menu before top</h3>
 
 <a class="index-entry-id" id="index-node-in-menu-before-top"></a>
 <div class="printindex cp-printindex">
@@ -197,7 +197,7 @@ span.program-in-footer {font-size: smaller}
 
 
 <hr style="height: 6px;">
-<a class="node" id="first"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="first"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Up section"> Up 
</a>]</td>
@@ -212,7 +212,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a href="#first-before-top" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a 
href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
 </tr></table>
-<h3 class="node-heading">first</h3>
+<h3 class="node">first</h3>
 <p>Text and then index entries
 <a class="index-entry-id" id="index-_0021-entry-in-node"></a>
 <a class="index-entry-id" id="index-fun-in-node"></a>
@@ -287,7 +287,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr>
-<a class="node" id="second"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="second"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[<a href="#first" title="Previous section in 
reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#first" title="Up section"> Up 
</a>]</td>
@@ -302,7 +302,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a href="#first-before-top" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a 
href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
 </tr></table>
-<h3 class="node-heading">second</h3>
+<h3 class="node">second</h3>
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a href="#a-node" rel="index">a 
node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
@@ -341,7 +341,7 @@ span.program-in-footer {font-size: smaller}
 </div>
 
 <hr>
-<a class="node" id="another"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="another"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[<a href="#second" title="Previous section in 
reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#second" title="Up section"> Up 
</a>]</td>
@@ -356,14 +356,14 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a href="#first-before-top" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a 
href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
 </tr></table>
-<h3 class="node-heading">another</h3>
+<h3 class="node">another</h3>
 
 <a class="index-entry-id" id="index-something"></a>
 <a class="index-entry-id" id="index-somewhere"></a>
 <a class="index-entry-id" id="index-another"></a>
 
 <hr>
-<a class="node" id="a-node"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="a-node"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[<a href="#another" title="Previous section 
in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#second" title="Up section"> Up 
</a>]</td>
@@ -378,7 +378,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a href="#first-before-top" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a 
href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
 </tr></table>
-<h3 class="node-heading">a node</h3>
+<h3 class="node">a node</h3>
 <a class="index-entry-id" id="index-entry-after-printindex"></a>
 
 <div class="printindex cp-printindex">
diff --git a/tp/t/results/moreindices/nodes_before_top/res_html/index.html 
b/tp/t/results/moreindices/nodes_before_top/res_html/index.html
index c9d33e3ab4..a3442422e4 100644
--- a/tp/t/results/moreindices/nodes_before_top/res_html/index.html
+++ b/tp/t/results/moreindices/nodes_before_top/res_html/index.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<a class="node" id="Top"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="Top"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a 
href="first-before-top.html#node-in-menu-before-top" title="Previous section in 
reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="first-before-top.html#first" 
title="Next section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -31,7 +31,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a 
href="first-before-top.html#first-before-top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a 
href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
 </tr></table>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 <a class="index-entry-id" id="index-entry-a"></a>
 
 <div class="printindex cp-printindex">
diff --git 
a/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic/res_html/nodes_before_top_and_sections.html
 
b/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic/res_html/nodes_before_top_and_sections.html
index 7e730e1d7b..9ff9d05629 100644
--- 
a/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic/res_html/nodes_before_top_and_sections.html
+++ 
b/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic/res_html/nodes_before_top_and_sections.html
@@ -261,7 +261,7 @@ span.program-in-footer {font-size: smaller}
 <a class="index-entry-id" id="index-printindex-node-in-menu-before-top"></a>
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <a class="index-entry-id" id="index-entry-a"></a>
 <p>in top node.
 </p><div class="printindex cp-printindex">
@@ -723,7 +723,7 @@ span.program-in-footer {font-size: smaller}
 </div>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
diff --git 
a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/a-node.html 
b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/a-node.html
index f887af8b09..7621d7979c 100644
--- a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/a-node.html
+++ b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/a-node.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<a class="node" id="a-node"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="a-node"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[<a href="another.html" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="second.html" title="Up section"> Up 
</a>]</td>
@@ -39,7 +39,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a 
href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<h3 class="node-heading">a node</h3>
+<h3 class="node">a node</h3>
 <a class="index-entry-id" id="index-entry-after-printindex"></a>
 
 <div class="printindex cp-printindex">
diff --git 
a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/another.html 
b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/another.html
index 7683bc0405..84ad4786db 100644
--- a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/another.html
+++ b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/another.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<a class="node" id="another"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="another"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[<a href="second.html" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="second.html" title="Up section"> Up 
</a>]</td>
@@ -38,7 +38,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a 
href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<h3 class="node-heading">another</h3>
+<h3 class="node">another</h3>
 
 <a class="index-entry-id" id="index-something"></a>
 <a class="index-entry-id" id="index-somewhere"></a>
diff --git 
a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first-before-top.html
 
b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first-before-top.html
index 01a2c4b834..3f57546100 100644
--- 
a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first-before-top.html
+++ 
b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first-before-top.html
@@ -25,7 +25,7 @@ span.program-in-footer {font-size: smaller}
 <body lang="en">
 
 
-<a class="node" id="first-before-top"></a><table class="nav-header" 
cellpadding="1" cellspacing="1" border="0">
+<a class="node-id" id="first-before-top"></a><table class="nav-header" 
cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="../dir/index.html" title="Up 
section"> Up </a>]</td>
@@ -41,7 +41,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a 
href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<h3 class="node-heading">first before top</h3>
+<h3 class="node">first before top</h3>
 <a class="index-entry-id" id="index-first-before-top"></a>
 <div class="printindex cp-printindex">
 <table class="cp-letters-header-printindex"><tr><th valign="top">Jump to: 
&nbsp; </th><td><a class="summary-letter-printindex" 
href="#first-before-top_cp_symbol-1"><b>!</b></a>
diff --git 
a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first.html 
b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first.html
index ae9fcc5c37..b437883410 100644
--- a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first.html
+++ b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<a class="node" id="first"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="first"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Up section"> Up 
</a>]</td>
@@ -39,7 +39,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a 
href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<h3 class="node-heading">first</h3>
+<h3 class="node">first</h3>
 <p>Text and then index entries
 <a class="index-entry-id" id="index-_0021-entry-in-node"></a>
 <a class="index-entry-id" id="index-fun-in-node"></a>
diff --git 
a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/index.html 
b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/index.html
index e6affb5b93..0d74ba4ec8 100644
--- a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/index.html
+++ b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/index.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<a class="node" id="Top"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="Top"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="node-in-menu-before-top.html" 
title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="first.html" title="Next section in 
reading order"> &gt; </a>]</td>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -32,7 +32,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a 
href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 <a class="index-entry-id" id="index-entry-a"></a>
 
 <div class="printindex cp-printindex">
diff --git 
a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/node-in-menu-before-top.html
 
b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/node-in-menu-before-top.html
index 8a47351b7c..3eb3656acd 100644
--- 
a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/node-in-menu-before-top.html
+++ 
b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/node-in-menu-before-top.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<a class="node" id="node-in-menu-before-top"></a><table class="nav-header" 
cellpadding="1" cellspacing="1" border="0">
+<a class="node-id" id="node-in-menu-before-top"></a><table class="nav-header" 
cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[<a href="first-before-top.html" 
title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="first-before-top.html" title="Up 
section"> Up </a>]</td>
@@ -39,7 +39,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a 
href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<h3 class="node-heading">node in menu before top</h3>
+<h3 class="node">node in menu before top</h3>
 
 <a class="index-entry-id" id="index-node-in-menu-before-top"></a>
 <div class="printindex cp-printindex">
diff --git 
a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/second.html 
b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/second.html
index eb75848489..b1ba53cf36 100644
--- a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/second.html
+++ b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/second.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<a class="node" id="second"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="second"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[<a href="first.html" title="Previous section 
in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="first.html" title="Up section"> Up 
</a>]</td>
@@ -39,7 +39,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a 
href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<h3 class="node-heading">second</h3>
+<h3 class="node">second</h3>
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a href="a-node.html" rel="index">a 
node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
diff --git a/tp/t/results/moreindices/split_chapter_index/res_html/first.html 
b/tp/t/results/moreindices/split_chapter_index/res_html/first.html
index 638bf9c4d1..051bfdff61 100644
--- a/tp/t/results/moreindices/split_chapter_index/res_html/first.html
+++ b/tp/t/results/moreindices/split_chapter_index/res_html/first.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="first">
+<div class="chapter-level-extent" id="first">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
@@ -109,7 +109,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr>
-<div class="section" id="section-1">
+<div class="section-level-extent" id="section-1">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#first" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#first" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -137,7 +137,7 @@ span.program-in-footer {font-size: smaller}
 <a class="index-entry-id" id="index-another"></a>
 
 <hr>
-<div class="subsection" id="subsection-1">
+<div class="subsection-level-extent" id="subsection-1">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#first" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#section-1" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git a/tp/t/results/moreindices/split_chapter_index/res_html/index.html 
b/tp/t/results/moreindices/split_chapter_index/res_html/index.html
index c15514fc86..26acef5b9b 100644
--- a/tp/t/results/moreindices/split_chapter_index/res_html/index.html
+++ b/tp/t/results/moreindices/split_chapter_index/res_html/index.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="first.html#first" title="Next 
section in reading order"> &gt; </a>]</td>
diff --git 
a/tp/t/results/moresectioning/equivalent_nodes/res_html/equivalent_nodes.html 
b/tp/t/results/moresectioning/equivalent_nodes/res_html/equivalent_nodes.html
index d0392401f6..0ae400f23d 100644
--- 
a/tp/t/results/moresectioning/equivalent_nodes/res_html/equivalent_nodes.html
+++ 
b/tp/t/results/moresectioning/equivalent_nodes/res_html/equivalent_nodes.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<a class="node" id="before-top"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="before-top"></a><table class="nav-header" 
cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="dir.html#Top" title="Up section"> 
Up </a>]</td>
@@ -38,10 +38,10 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<h3 class="node-heading">before top</h3>
+<h3 class="node">before top</h3>
 
 <hr style="height: 6px;">
-<a class="node" id="Top"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="Top"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#before-top" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#node" title="Next section in 
reading order"> &gt; </a>]</td>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -49,7 +49,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 
 <p>Equivalent nodes in node line and in menu.
 </p>
@@ -59,7 +59,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr style="height: 6px;">
-<a class="node" id="node"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="node"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Up section"> Up 
</a>]</td>
@@ -74,7 +74,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<h3 class="node-heading">node</h3>
+<h3 class="node">node</h3>
 
 <div class="float">
 <p>A figure
diff --git 
a/tp/t/results/moresectioning/more_sections_than_nodes/res_html/more_sections_than_nodes.html
 
b/tp/t/results/moresectioning/more_sections_than_nodes/res_html/more_sections_than_nodes.html
index 5e60315f5d..139fd0ede1 100644
--- 
a/tp/t/results/moresectioning/more_sections_than_nodes/res_html/more_sections_than_nodes.html
+++ 
b/tp/t/results/moresectioning/more_sections_than_nodes/res_html/more_sections_than_nodes.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#c1" title="Next section in reading 
order"> &gt; </a>]</td>
@@ -44,7 +44,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="c1">
+<div class="chapter-level-extent" id="c1">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -64,7 +64,7 @@ span.program-in-footer {font-size: smaller}
 
 <hr>
 </div>
-<div class="chapter" id="n-c2">
+<div class="chapter-level-extent" id="n-c2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#c1" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#c1" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -83,7 +83,7 @@ span.program-in-footer {font-size: smaller}
 <h1 class="chapter" id="c2">2 c2</h1>
 
 <hr>
-<div class="section" id="s1">
+<div class="section-level-extent" id="s1">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#n-c2" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#n-c2" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -104,7 +104,7 @@ span.program-in-footer {font-size: smaller}
 <hr>
 </div>
 </div>
-<div class="chapter" id="n-c3">
+<div class="chapter-level-extent" id="n-c3">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#n-c2" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#s1" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -128,7 +128,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr>
-<div class="section" id="C3-s1">
+<div class="section-level-extent" id="C3-s1">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#n-c3" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#n-c3" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -148,7 +148,7 @@ span.program-in-footer {font-size: smaller}
 
 <hr>
 </div>
-<div class="section" id="n-c3-s-2">
+<div class="section-level-extent" id="n-c3-s-2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#n-c3" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#C3-s1" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -168,7 +168,7 @@ span.program-in-footer {font-size: smaller}
 
 <hr>
 </div>
-<div class="section" id="c3-s3">
+<div class="section-level-extent" id="c3-s3">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#n-c3" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#n-c3-s-2" title="Previous section 
in reading order"> &lt; </a>]</td>
@@ -189,7 +189,7 @@ span.program-in-footer {font-size: smaller}
 <hr>
 </div>
 </div>
-<div class="chapter" id="c4">
+<div class="chapter-level-extent" id="c4">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#n-c3" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#c3-s3" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -208,7 +208,7 @@ span.program-in-footer {font-size: smaller}
 <h1 class="chapter">4 c4</h1>
 
 <hr>
-<div class="section" id="c3-s1">
+<div class="section-level-extent" id="c3-s1">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#c4" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#c4" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -227,7 +227,7 @@ span.program-in-footer {font-size: smaller}
 <h2 class="section">4.1 c3 s1</h2>
 
 <hr>
-<div class="subsection" id="c3-s1-s1">
+<div class="subsection-level-extent" id="c3-s1-s1">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#c4" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#c3-s1" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -247,7 +247,7 @@ span.program-in-footer {font-size: smaller}
 
 <hr>
 </div>
-<div class="subsection" id="n-c3-s1-s2">
+<div class="subsection-level-extent" id="n-c3-s1-s2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#c4" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#c3-s1-s1" title="Previous section 
in reading order"> &lt; </a>]</td>
@@ -269,7 +269,7 @@ span.program-in-footer {font-size: smaller}
 </div>
 </div>
 </div>
-<div class="appendix" id="appendix">
+<div class="appendix-level-extent" id="appendix">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#c4" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#n-c3-s1-s2" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/t/results/moresectioning/node_footnote_end/res_html/node_footnote.html 
b/tp/t/results/moresectioning/node_footnote_end/res_html/node_footnote.html
index 45c5c817a7..d2c3bbb6d7 100644
--- a/tp/t/results/moresectioning/node_footnote_end/res_html/node_footnote.html
+++ b/tp/t/results/moresectioning/node_footnote_end/res_html/node_footnote.html
@@ -43,7 +43,7 @@ Footnote 1<a class="footnote" id="DOCF1" 
href="#FOOT1"><sup>1</sup></a>.
 <p>node &acirc;,
 Footnote 2<a class="footnote" id="DOCF2" href="#FOOT2"><sup>2</sup></a>.
 </p>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <h1 class="chapter" id="chapter-1">1 chapter</h1>
 
 <table class="menu" border="0" cellspacing="0">
diff --git 
a/tp/t/results/moresectioning/node_footnote_separated/res_html/node_footnote.html
 
b/tp/t/results/moresectioning/node_footnote_separated/res_html/node_footnote.html
index 45c5c817a7..d2c3bbb6d7 100644
--- 
a/tp/t/results/moresectioning/node_footnote_separated/res_html/node_footnote.html
+++ 
b/tp/t/results/moresectioning/node_footnote_separated/res_html/node_footnote.html
@@ -43,7 +43,7 @@ Footnote 1<a class="footnote" id="DOCF1" 
href="#FOOT1"><sup>1</sup></a>.
 <p>node &acirc;,
 Footnote 2<a class="footnote" id="DOCF2" href="#FOOT2"><sup>2</sup></a>.
 </p>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <h1 class="chapter" id="chapter-1">1 chapter</h1>
 
 <table class="menu" border="0" cellspacing="0">
diff --git a/tp/t/results/moresectioning/node_footnote_use_node/res_html/a.html 
b/tp/t/results/moresectioning/node_footnote_use_node/res_html/a.html
index 8067fac3c7..f0ddd2c2c9 100644
--- a/tp/t/results/moresectioning/node_footnote_use_node/res_html/a.html
+++ b/tp/t/results/moresectioning/node_footnote_use_node/res_html/a.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<a class="node" id="g_t_00e1"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="g_t_00e1"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Up section"> Up 
</a>]</td>
@@ -38,13 +38,13 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a href="node_footnote_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<h3 class="node-heading">&aacute;</h3>
+<h3 class="node">&aacute;</h3>
 
 <p>node &aacute;,
 Footnote 1<a class="footnote" id="DOCF1" href="#FOOT1"><sup>1</sup></a>.
 </p>
 <hr>
-<a class="node" id="g_t_00e2"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="g_t_00e2"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[<a href="#g_t_00e1" title="Previous section 
in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Up section"> Up 
</a>]</td>
@@ -59,7 +59,7 @@ Footnote 1<a class="footnote" id="DOCF1" 
href="#FOOT1"><sup>1</sup></a>.
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="node_footnote_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<h3 class="node-heading">&acirc;</h3>
+<h3 class="node">&acirc;</h3>
 
 <p>node &acirc;,
 Footnote 2<a class="footnote" id="DOCF2" href="#FOOT2"><sup>2</sup></a>.
@@ -74,7 +74,7 @@ Footnote 2<a class="footnote" id="DOCF2" 
href="#FOOT2"><sup>2</sup></a>.
 <p>foot 2 &acirc;</p>
 </div>
 <hr>
-<a class="node" id="g_t_00e0"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="g_t_00e0"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="chapter.html" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="chapter.html" title="Up section"> 
Up </a>]</td>
@@ -89,7 +89,7 @@ Footnote 2<a class="footnote" id="DOCF2" 
href="#FOOT2"><sup>2</sup></a>.
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="node_footnote_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<h3 class="node-heading">&agrave;</h3>
+<h3 class="node">&agrave;</h3>
 
 <p>node &agrave;,
 Footnote 3<a class="footnote" id="DOCF3" href="#FOOT3"><sup>3</sup></a>.
diff --git 
a/tp/t/results/moresectioning/node_footnote_use_node/res_html/chapter.html 
b/tp/t/results/moresectioning/node_footnote_use_node/res_html/chapter.html
index ad27e2bdbf..116305b62b 100644
--- a/tp/t/results/moresectioning/node_footnote_use_node/res_html/chapter.html
+++ b/tp/t/results/moresectioning/node_footnote_use_node/res_html/chapter.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[<a href="a.html#g_t_00e2" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/t/results/moresectioning/node_footnote_use_node/res_html/index.html 
b/tp/t/results/moresectioning/node_footnote_use_node/res_html/index.html
index 89eca32be4..016d1e8939 100644
--- a/tp/t/results/moresectioning/node_footnote_use_node/res_html/index.html
+++ b/tp/t/results/moresectioning/node_footnote_use_node/res_html/index.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<a class="node" id="Top"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="Top"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="a.html#g_t_00e1" title="Next 
section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -32,7 +32,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a href="node_footnote_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a 
href="a.html#g_t_00e1">&aacute;</a></td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top">
diff --git 
a/tp/t/results/moresectioning/nodes_after_top_before_chapter/res_html/nodes_after_top_before_chapter.html
 
b/tp/t/results/moresectioning/nodes_after_top_before_chapter/res_html/nodes_after_top_before_chapter.html
index 0b2c586fee..ef032747f3 100644
--- 
a/tp/t/results/moresectioning/nodes_after_top_before_chapter/res_html/nodes_after_top_before_chapter.html
+++ 
b/tp/t/results/moresectioning/nodes_after_top_before_chapter/res_html/nodes_after_top_before_chapter.html
@@ -35,7 +35,7 @@ span.program-in-footer {font-size: smaller}
 <a class="node" id="second-node"></a>
 <p>second node
 </p>
-<div class="chapter" id="third-node">
+<div class="chapter-level-extent" id="third-node">
 <h1 class="chapter" id="chapter">1 chapter</h1>
 
 
diff --git 
a/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/index.html
 
b/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/index.html
index a15aa965b1..11f0257d96 100644
--- 
a/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/index.html
+++ 
b/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/index.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
 <body lang="en">
 
 
-<a class="node" id="Top"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="Top"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#second-node" title="Next section 
in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -32,7 +32,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a 
href="nodes_after_top_before_chapter_abt.html#SEC_About" title="About (help)"> 
? </a>]</td>
 </tr></table>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 <p>Top node
 </p><table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a href="#second-node">second 
node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
@@ -42,7 +42,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr style="height: 6px;">
-<a class="node" id="second-node"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="second-node"></a><table class="nav-header" 
cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Up section"> Up 
</a>]</td>
@@ -57,7 +57,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a 
href="nodes_after_top_before_chapter_abt.html#SEC_About" title="About (help)"> 
? </a>]</td>
 </tr></table>
-<h3 class="node-heading">second node</h3>
+<h3 class="node">second node</h3>
 
 <p>second node
 </p>
diff --git 
a/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/third-node.html
 
b/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/third-node.html
index b082a42c5d..a7f43ef4e2 100644
--- 
a/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/third-node.html
+++ 
b/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/third-node.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="third-node">
+<div class="chapter-level-extent" id="third-node">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[<a href="index.html#second-node" 
title="Previous section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/t/results/moresectioning/nodes_after_top_before_section/res_html/index.html
 
b/tp/t/results/moresectioning/nodes_after_top_before_section/res_html/index.html
index 077c4eead3..35a5111267 100644
--- 
a/tp/t/results/moresectioning/nodes_after_top_before_section/res_html/index.html
+++ 
b/tp/t/results/moresectioning/nodes_after_top_before_section/res_html/index.html
@@ -35,7 +35,7 @@ span.program-in-footer {font-size: smaller}
 <a class="node" id="second-node"></a>
 <p>second node
 </p>
-<div class="subsection" id="third-node">
+<div class="subsection-level-extent" id="third-node">
 <h3 class="subsection" id="subsection">1 subsection</h3>
 
 
diff --git 
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes/res_html/nodes_after_top_before_section.html
 
b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes/res_html/nodes_after_top_before_section.html
index 48c485da43..1482576542 100644
--- 
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes/res_html/nodes_after_top_before_section.html
+++ 
b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes/res_html/nodes_after_top_before_section.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
 <body lang="en">
 
 
-<a class="node" id="Top"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="Top"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#second-node" title="Next section 
in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -32,7 +32,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 <p>Top node
 </p><table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a href="#second-node">second 
node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
@@ -42,7 +42,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr style="height: 6px;">
-<a class="node" id="second-node"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="second-node"></a><table class="nav-header" 
cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Up section"> Up 
</a>]</td>
@@ -57,12 +57,12 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<h3 class="node-heading">second node</h3>
+<h3 class="node">second node</h3>
 
 <p>second node
 </p>
 <hr>
-<div class="subsection" id="third-node">
+<div class="subsection-level-extent" id="third-node">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[<a href="#second-node" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter/res_html/index.html
 
b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter/res_html/index.html
index 02524c5709..efe258172f 100644
--- 
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter/res_html/index.html
+++ 
b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter/res_html/index.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
 <body lang="en">
 
 
-<a class="node" id="Top"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="Top"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#second-node" title="Next section 
in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -32,7 +32,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a 
href="nodes_after_top_before_section_abt.html#SEC_About" title="About (help)"> 
? </a>]</td>
 </tr></table>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 <p>Top node
 </p><table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a href="#second-node">second 
node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
@@ -42,7 +42,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr style="height: 6px;">
-<a class="node" id="second-node"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="second-node"></a><table class="nav-header" 
cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Up section"> Up 
</a>]</td>
@@ -57,12 +57,12 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a 
href="nodes_after_top_before_section_abt.html#SEC_About" title="About (help)"> 
? </a>]</td>
 </tr></table>
-<h3 class="node-heading">second node</h3>
+<h3 class="node">second node</h3>
 
 <p>second node
 </p>
 <hr>
-<div class="subsection" id="third-node">
+<div class="subsection-level-extent" id="third-node">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[<a href="#second-node" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/t/results/moresectioning/placed_things_before_element/res_html/placed_things_before_element.html
 
b/tp/t/results/moresectioning/placed_things_before_element/res_html/placed_things_before_element.html
index a7a3ab4602..d14f18f67d 100644
--- 
a/tp/t/results/moresectioning/placed_things_before_element/res_html/placed_things_before_element.html
+++ 
b/tp/t/results/moresectioning/placed_things_before_element/res_html/placed_things_before_element.html
@@ -50,7 +50,7 @@ span.program-in-footer {font-size: smaller}
 
 <a class="index-entry-id" id="index-index-entry"></a>
 
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <h2 class="section">1 section</h2>
 
 <p>Ref to anchor
diff --git 
a/tp/t/results/moresectioning/sectioning_frames/res_html/First-node.html 
b/tp/t/results/moresectioning/sectioning_frames/res_html/First-node.html
index 42974ed9bf..8600bc7469 100644
--- a/tp/t/results/moresectioning/sectioning_frames/res_html/First-node.html
+++ b/tp/t/results/moresectioning/sectioning_frames/res_html/First-node.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="First-node">
+<div class="chapter-level-extent" id="First-node">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
@@ -54,7 +54,7 @@ span.program-in-footer {font-size: smaller}
 </pre></th></tr></table>
 
 <hr>
-<div class="unnumberedsec" id="unnumbered">
+<div class="unnumberedsec-level-extent" id="unnumbered">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#First-node" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#First-node" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -84,7 +84,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr>
-<div class="unnumberedsubsec" id="unnumbered-sub">
+<div class="unnumberedsubsec-level-extent" id="unnumbered-sub">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#First-node" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#unnumbered" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -104,7 +104,7 @@ span.program-in-footer {font-size: smaller}
 
 <hr>
 </div>
-<div class="subsection" id="numbered-sub">
+<div class="subsection-level-extent" id="numbered-sub">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#First-node" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#unnumbered-sub" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -124,7 +124,7 @@ span.program-in-footer {font-size: smaller}
 
 <hr>
 </div>
-<div class="unnumberedsubsec" id="unnumbered-sub2">
+<div class="unnumberedsubsec-level-extent" id="unnumbered-sub2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#First-node" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#numbered-sub" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -144,7 +144,7 @@ span.program-in-footer {font-size: smaller}
 
 <hr>
 </div>
-<div class="subsection" id="numbered-sub2">
+<div class="subsection-level-extent" id="numbered-sub2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#First-node" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#unnumbered-sub2" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -165,7 +165,7 @@ span.program-in-footer {font-size: smaller}
 <hr>
 </div>
 </div>
-<div class="unnumberedsec" id="unnumbered2">
+<div class="unnumberedsec-level-extent" id="unnumbered2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#First-node" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#numbered-sub2" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -189,7 +189,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr>
-<div class="subsection" id="numbered-sub3">
+<div class="subsection-level-extent" id="numbered-sub3">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#First-node" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#unnumbered2" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -211,7 +211,7 @@ span.program-in-footer {font-size: smaller}
 <hr>
 </div>
 </div>
-<div class="section" id="numbered">
+<div class="section-level-extent" id="numbered">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#First-node" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#numbered-sub3" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/t/results/moresectioning/sectioning_frames/res_html/Second-node.html 
b/tp/t/results/moresectioning/sectioning_frames/res_html/Second-node.html
index b7a2d6bc52..44cf2f9b5f 100644
--- a/tp/t/results/moresectioning/sectioning_frames/res_html/Second-node.html
+++ b/tp/t/results/moresectioning/sectioning_frames/res_html/Second-node.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="Second-node">
+<div class="chapter-level-extent" id="Second-node">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="First-node.html#First-node" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="First-node.html#numbered" 
title="Previous section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/t/results/moresectioning/sectioning_frames/res_html/Third-node-unnumbered.html
 
b/tp/t/results/moresectioning/sectioning_frames/res_html/Third-node-unnumbered.html
index f95db99133..3b58406ae7 100644
--- 
a/tp/t/results/moresectioning/sectioning_frames/res_html/Third-node-unnumbered.html
+++ 
b/tp/t/results/moresectioning/sectioning_frames/res_html/Third-node-unnumbered.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="unnumbered" id="Third-node-unnumbered">
+<div class="unnumbered-level-extent" id="Third-node-unnumbered">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="Second-node.html" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="Second-node.html" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git a/tp/t/results/moresectioning/sectioning_frames/res_html/index.html 
b/tp/t/results/moresectioning/sectioning_frames/res_html/index.html
index 55cebd5176..1e9ea1a04f 100644
--- a/tp/t/results/moresectioning/sectioning_frames/res_html/index.html
+++ b/tp/t/results/moresectioning/sectioning_frames/res_html/index.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="First-node.html#First-node" 
title="Next section in reading order"> &gt; </a>]</td>
diff --git 
a/tp/t/results/moresectioning/top_node_up_explicit/res_html/top_node_up_explicit.html
 
b/tp/t/results/moresectioning/top_node_up_explicit/res_html/top_node_up_explicit.html
index 35ca97b6f6..0fed7fde5a 100644
--- 
a/tp/t/results/moresectioning/top_node_up_explicit/res_html/top_node_up_explicit.html
+++ 
b/tp/t/results/moresectioning/top_node_up_explicit/res_html/top_node_up_explicit.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
 <body lang="en">
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#Chap" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -43,7 +43,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="Chap">
+<div class="chapter-level-extent" id="Chap">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
diff --git 
a/tp/t/results/moresectioning/top_node_up_implicit/res_html/top_node_up_implicit.html
 
b/tp/t/results/moresectioning/top_node_up_implicit/res_html/top_node_up_implicit.html
index 35ca97b6f6..0fed7fde5a 100644
--- 
a/tp/t/results/moresectioning/top_node_up_implicit/res_html/top_node_up_implicit.html
+++ 
b/tp/t/results/moresectioning/top_node_up_implicit/res_html/top_node_up_implicit.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
 <body lang="en">
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#Chap" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -43,7 +43,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="Chap">
+<div class="chapter-level-extent" id="Chap">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
diff --git 
a/tp/t/results/moresectioning/two_footnotes_in_nodes/res_html/two_footnotes_in_nodes.html
 
b/tp/t/results/moresectioning/two_footnotes_in_nodes/res_html/two_footnotes_in_nodes.html
index fb9caeccfa..959471a80d 100644
--- 
a/tp/t/results/moresectioning/two_footnotes_in_nodes/res_html/two_footnotes_in_nodes.html
+++ 
b/tp/t/results/moresectioning/two_footnotes_in_nodes/res_html/two_footnotes_in_nodes.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -44,7 +44,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
diff --git 
a/tp/t/results/moresectioning/two_footnotes_in_nodes_separated/res_html/two_footnotes_in_nodes.html
 
b/tp/t/results/moresectioning/two_footnotes_in_nodes_separated/res_html/two_footnotes_in_nodes.html
index fb9caeccfa..959471a80d 100644
--- 
a/tp/t/results/moresectioning/two_footnotes_in_nodes_separated/res_html/two_footnotes_in_nodes.html
+++ 
b/tp/t/results/moresectioning/two_footnotes_in_nodes_separated/res_html/two_footnotes_in_nodes.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -44,7 +44,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
diff --git a/tp/t/results/regions/anchor_in_copying.pl 
b/tp/t/results/regions/anchor_in_copying.pl
index b4e32af5af..0f7e63aebc 100644
--- a/tp/t/results/regions/anchor_in_copying.pl
+++ b/tp/t/results/regions/anchor_in_copying.pl
@@ -442,7 +442,7 @@ Copying.
 <body lang="en">
 
 
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 
 <p>Copying.
diff --git a/tp/t/results/regions/anchor_in_copying_in_footnote.pl 
b/tp/t/results/regions/anchor_in_copying_in_footnote.pl
index 4fb4f6c71a..e372a4657f 100644
--- a/tp/t/results/regions/anchor_in_copying_in_footnote.pl
+++ b/tp/t/results/regions/anchor_in_copying_in_footnote.pl
@@ -488,7 +488,7 @@ Copying.
 
 <body lang="en">
 
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 
 <p>Copying<a class="footnote" id="DOCF1" href="#FOOT1"><sup>1</sup></a>.
diff --git a/tp/t/results/regions/anchor_in_titlepage.pl 
b/tp/t/results/regions/anchor_in_titlepage.pl
index ec8b85c3e7..a85dc48fa8 100644
--- a/tp/t/results/regions/anchor_in_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage.pl
@@ -374,9 +374,9 @@ $result_converted{'html'}->{'anchor_in_titlepage'} = 
'<!DOCTYPE html>
 
 <body lang="en">
 
-<div class="top" id="top">
+<div class="top-level-extent" id="top">
 <h1 class="top">top</h1>
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 <p>See <a class="xref" href="#in-titlepage">in titlepage</a>.
 </p></div>
diff --git a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl 
b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
index 175dffbc51..d827a6c814 100644
--- a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
@@ -376,9 +376,9 @@ 
$result_converted{'html'}->{'anchor_in_titlepage_titlepage'} = '<!DOCTYPE html>
 
 <a class="anchor" id="in-titlepage"></a><hr>
 
-<div class="top" id="top">
+<div class="top-level-extent" id="top">
 <h1 class="top">top</h1>
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 <p>See <a class="xref" href="#in-titlepage">in titlepage</a>.
 </p></div>
diff --git a/tp/t/results/regions/format_in_titlepage.pl 
b/tp/t/results/regions/format_in_titlepage.pl
index 1e788fdd85..d2f0d5964a 100644
--- a/tp/t/results/regions/format_in_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage.pl
@@ -307,7 +307,7 @@ $result_converted{'html'}->{'format_in_titlepage'} = 
'<!DOCTYPE html>
 
 <body lang="en">
 
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 
 
diff --git a/tp/t/results/regions/format_in_titlepage_titlepage.pl 
b/tp/t/results/regions/format_in_titlepage_titlepage.pl
index 012e4c712a..ed07cfd27c 100644
--- a/tp/t/results/regions/format_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage_titlepage.pl
@@ -314,7 +314,7 @@ pre.format-preformatted {font-family: inherit}
 
 <hr>
 
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 
 
diff --git a/tp/t/results/regions/ref_in_copying.pl 
b/tp/t/results/regions/ref_in_copying.pl
index 9fbdd756af..a2942d1d7d 100644
--- a/tp/t/results/regions/ref_in_copying.pl
+++ b/tp/t/results/regions/ref_in_copying.pl
@@ -678,7 +678,7 @@ $result_converted{'html'}->{'ref_in_copying'} = '<!DOCTYPE 
html>
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#GFDL" accesskey="n" rel="next">GFDL</a> &nbsp; </p>
@@ -692,7 +692,7 @@ Next: <a href="#GFDL" accesskey="n" rel="next">GFDL</a> 
&nbsp; </p>
 <li><a href="#GFDL" accesskey="1">GFDL</a></li>
 </ul>
 <hr>
-<div class="chapter" id="GFDL">
+<div class="chapter-level-extent" id="GFDL">
 <div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">top</a> &nbsp; </p>
diff --git a/tp/t/results/regions/today_in_copying.pl 
b/tp/t/results/regions/today_in_copying.pl
index 2b610d5f5d..3862e2114b 100644
--- a/tp/t/results/regions/today_in_copying.pl
+++ b/tp/t/results/regions/today_in_copying.pl
@@ -339,7 +339,7 @@ $result_converted{'html'}->{'today_in_copying'} = 
'<!DOCTYPE html>
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="top">top</h1>
 
 <p>a sunny day.
diff --git a/tp/t/results/sectioning/anchor_in_footnote.pl 
b/tp/t/results/sectioning/anchor_in_footnote.pl
index ffdc76f0a6..cf9aa1ea12 100644
--- a/tp/t/results/sectioning/anchor_in_footnote.pl
+++ b/tp/t/results/sectioning/anchor_in_footnote.pl
@@ -683,7 +683,7 @@ $result_converted{'html'}->{'anchor_in_footnote'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">Chap</a> &nbsp; </p>
@@ -697,7 +697,7 @@ Next: <a href="#chapter" accesskey="n" rel="next">Chap</a> 
&nbsp; </p>
 <li><a href="#chapter" accesskey="1">Chap</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git a/tp/t/results/sectioning/anchor_in_footnote_separate.pl 
b/tp/t/results/sectioning/anchor_in_footnote_separate.pl
index bd29b46e52..78c2de026f 100644
--- a/tp/t/results/sectioning/anchor_in_footnote_separate.pl
+++ b/tp/t/results/sectioning/anchor_in_footnote_separate.pl
@@ -721,7 +721,7 @@ $result_converted{'html'}->{'anchor_in_footnote_separate'} 
= '<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">Chap</a> &nbsp; </p>
@@ -735,7 +735,7 @@ Next: <a href="#chapter" accesskey="n" rel="next">Chap</a> 
&nbsp; </p>
 <li><a href="#chapter" accesskey="1">Chap</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git a/tp/t/results/sectioning/anchor_zero.pl 
b/tp/t/results/sectioning/anchor_zero.pl
index df827f6b28..1914c938ce 100644
--- a/tp/t/results/sectioning/anchor_zero.pl
+++ b/tp/t/results/sectioning/anchor_zero.pl
@@ -253,7 +253,7 @@ $result_converted{'html'}->{'anchor_zero'} = '<!DOCTYPE 
html>
 </head>
 
 <body lang="en">
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 <a class="anchor" id="g_t0"></a><p>.
 </p>
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 091a86e73f..0cf99632c0 100644
--- a/tp/t/results/sectioning/chapter_before_and_after_part.pl
+++ b/tp/t/results/sectioning/chapter_before_and_after_part.pl
@@ -414,18 +414,18 @@ ul.toc-numbered-mark {list-style: none}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <h2 class="chapter">1 chapter</h2>
 
 </div>
-<div class="part" id="part">
+<div class="part-level-extent" id="part">
 <h1 class="part">part</h1>
 <hr>
 
 <ul class="mini-toc">
 <li><a href="#chapter-2" accesskey="1">chapter 2</a></li>
 </ul>
-<div class="chapter" id="chapter-2">
+<div class="chapter-level-extent" id="chapter-2">
 <h2 class="chapter">2 chapter 2</h2>
 
 <div class="element-contents" id="SEC_Contents">
diff --git a/tp/t/results/sectioning/chapter_before_part.pl 
b/tp/t/results/sectioning/chapter_before_part.pl
index eb874a64e6..cf2964baa9 100644
--- a/tp/t/results/sectioning/chapter_before_part.pl
+++ b/tp/t/results/sectioning/chapter_before_part.pl
@@ -295,11 +295,11 @@ $result_converted{'html'}->{'chapter_before_part'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <h2 class="chapter">1 chapter</h2>
 
 </div>
-<div class="part" id="part">
+<div class="part-level-extent" id="part">
 <h1 class="part">part</h1>
 <hr>
 </div>
diff --git a/tp/t/results/sectioning/chapter_between_nodes.pl 
b/tp/t/results/sectioning/chapter_between_nodes.pl
index 5dcb143e1b..55f14b89e0 100644
--- a/tp/t/results/sectioning/chapter_between_nodes.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes.pl
@@ -756,7 +756,7 @@ ul.toc-numbered-mark {list-style: none}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#section-node" accesskey="n" rel="next">section</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
@@ -768,7 +768,7 @@ Next: <a href="#section-node" accesskey="n" 
rel="next">section</a> &nbsp; [<a hr
 <ul class="mini-toc">
 <li><a href="#Chapter" accesskey="1">Chapter</a></li>
 </ul>
-<div class="chapter" id="Chapter">
+<div class="chapter-level-extent" id="Chapter">
 <h2 class="chapter">1 Chapter</h2>
 
 <p>In chapter
@@ -777,7 +777,7 @@ Next: <a href="#section-node" accesskey="n" 
rel="next">section</a> &nbsp; [<a hr
 <li><a href="#section-node" accesskey="1">section</a></li>
 </ul>
 <hr>
-<div class="section" id="section-node">
+<div class="section-level-extent" id="section-node">
 <div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">top section</a>, Up: <a 
href="#Top" accesskey="u" rel="up">top section</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
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 c37bc4ddaa..dff5db22bb 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
@@ -644,7 +644,7 @@ ul.toc-numbered-mark {list-style: none}
 
 <body lang="en">
 
-<div class="chapter" id="Top">
+<div class="chapter-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#after" accesskey="n" rel="next">chapter 2</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
@@ -654,7 +654,7 @@ Next: <a href="#after" accesskey="n" rel="next">chapter 
2</a> &nbsp; [<a href="#
 
 <hr>
 </div>
-<div class="part" id="part">
+<div class="part-level-extent" id="part">
 <div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">chapter</a>, Up: <a 
href="#Top" accesskey="u" rel="up">chapter</a> &nbsp; [<a href="#SEC_Contents" 
title="Table of contents" rel="contents">Contents</a>]</p>
@@ -665,7 +665,7 @@ Previous: <a href="#Top" accesskey="p" 
rel="prev">chapter</a>, Up: <a href="#Top
 <ul class="mini-toc">
 <li><a href="#after" accesskey="1">chapter 2</a></li>
 </ul>
-<div class="chapter" id="after">
+<div class="chapter-level-extent" id="after">
 <h2 class="chapter" id="chapter-2">2 chapter 2</h2>
 
 <div class="element-contents" id="SEC_Contents">
diff --git a/tp/t/results/sectioning/character_and_spaces_in_node.pl 
b/tp/t/results/sectioning/character_and_spaces_in_node.pl
index 8086b07a81..e346305aa7 100644
--- a/tp/t/results/sectioning/character_and_spaces_in_node.pl
+++ b/tp/t/results/sectioning/character_and_spaces_in_node.pl
@@ -629,35 +629,35 @@ 
$result_converted{'html'}->{'character_and_spaces_in_node'} = '<!DOCTYPE html>
 
 <body lang="en">
 
-<a class="node" id="Top"></a><div class="nav-header">
+<a class="node-id" id="Top"></a><div class="nav-header">
 <p>
 Next: <a href="#other-nodes" accesskey="n" rel="next">other nodes</a> &nbsp; 
</p>
 </div>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 <hr>
-<a class="node" id="other-nodes"></a><div class="nav-header">
+<a class="node-id" id="other-nodes"></a><div class="nav-header">
 <p>
 Next: <a 
href="#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"
 accesskey="n" rel="next">!_&quot;#$%&amp;\'()*+-.</a>, Previous: <a 
href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">other nodes</h4>
+<h4 class="node">other nodes</h4>
 <hr>
-<a class="node" 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><div
 class="nav-header">
+<a class="node-id" 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><div
 class="nav-header">
 <p>
 Next: <a 
href="#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"
 accesskey="n" rel="next">/;&lt;=&gt;?[\\]^_`|~</a>, Previous: <a 
href="#other-nodes" accesskey="p" rel="prev">other nodes</a>, Up: <a 
href="#other-nodes" accesskey="u" rel="up">other nodes</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">!_&quot;#$%&amp;\'()*+-.</h4>
+<h4 class="node">!_&quot;#$%&amp;\'()*+-.</h4>
 <hr>
-<a class="node" 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><div
 class="nav-header">
+<a class="node-id" 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><div
 class="nav-header">
 <p>
 Next: <a href="#local-node" accesskey="n" rel="next">local   node</a>, 
Previous: <a 
href="#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"
 accesskey="p" rel="prev">!_&quot;#$%&amp;\'()*+-.</a>, Up: <a 
href="#other-nodes" accesskey="u" rel="up">other nodes</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">/;&lt;=&gt;?[\\]^_`|~</h4>
+<h4 class="node">/;&lt;=&gt;?[\\]^_`|~</h4>
 <hr>
-<a class="node" id="local-node"></a><div class="nav-header">
+<a class="node-id" id="local-node"></a><div class="nav-header">
 <p>
 Previous: <a 
href="#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"
 accesskey="p" rel="prev">/;&lt;=&gt;?[\\]^_`|~</a>, Up: <a href="#other-nodes" 
accesskey="u" rel="up">other nodes</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">local   node</h4>
+<h4 class="node">local   node</h4>
 
 
 
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 0ba4132ab9..a7a1269df9 100644
--- a/tp/t/results/sectioning/character_and_spaces_in_refs.pl
+++ b/tp/t/results/sectioning/character_and_spaces_in_refs.pl
@@ -1983,7 +1983,7 @@ 
$result_converted{'html'}->{'character_and_spaces_in_refs'} = '<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#other-nodes" accesskey="n" rel="next">Chapter with nodes</a> 
&nbsp; </p>
@@ -2010,7 +2010,7 @@ Next: <a href="#other-nodes" accesskey="n" 
rel="next">Chapter with nodes</a> &nb
 <li><a href="#other-nodes" accesskey="1">Chapter with nodes</a></li>
 </ul>
 <hr>
-<div class="chapter" id="other-nodes">
+<div class="chapter-level-extent" id="other-nodes">
 <div class="nav-header">
 <p>
 Next: <a 
href="#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"
 accesskey="n" rel="next">!_&quot;#$%&amp;\'()*+-.</a>, Previous: <a 
href="#Top" accesskey="p" rel="prev">Test refs</a>, Up: <a href="#Top" 
accesskey="u" rel="up">Test refs</a> &nbsp; </p>
@@ -2019,25 +2019,25 @@ Next: <a 
href="#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_
 
 
 <hr>
-<a class="node" 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><div
 class="nav-header">
+<a class="node-id" 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><div
 class="nav-header">
 <p>
 Next: <a 
href="#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"
 accesskey="n" rel="next">/;&lt;=&gt;?[\\]^_`|~</a>, Previous: <a 
href="#other-nodes" accesskey="p" rel="prev">Chapter with nodes</a>, Up: <a 
href="#other-nodes" accesskey="u" rel="up">Chapter with nodes</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">!_&quot;#$%&amp;\'()*+-.</h4>
+<h4 class="node">!_&quot;#$%&amp;\'()*+-.</h4>
 
 <hr>
-<a class="node" 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><div
 class="nav-header">
+<a class="node-id" 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><div
 class="nav-header">
 <p>
 Next: <a href="#local-node" accesskey="n" rel="next">local   node</a>, 
Previous: <a 
href="#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"
 accesskey="p" rel="prev">!_&quot;#$%&amp;\'()*+-.</a>, Up: <a 
href="#other-nodes" accesskey="u" rel="up">Chapter with nodes</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">/;&lt;=&gt;?[\\]^_`|~</h4>
+<h4 class="node">/;&lt;=&gt;?[\\]^_`|~</h4>
 
 <hr>
-<a class="node" id="local-node"></a><div class="nav-header">
+<a class="node-id" id="local-node"></a><div class="nav-header">
 <p>
 Previous: <a 
href="#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"
 accesskey="p" rel="prev">/;&lt;=&gt;?[\\]^_`|~</a>, Up: <a href="#other-nodes" 
accesskey="u" rel="up">Chapter with nodes</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">local   node</h4>
+<h4 class="node">local   node</h4>
 
 </div>
 </div>
diff --git 
a/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
 
b/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
index b31d4ab5e5..ef6be1e734 100644
--- 
a/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
+++ 
b/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
@@ -24,12 +24,12 @@
 </head>
 
 <body lang="en">
-<a class="node" 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><div
 class="nav-header">
+<a class="node-id" 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></a><div
 class="nav-header">
 <p>
 Next: <a 
href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html"
 accesskey="n" rel="next">/;&lt;=&gt;?[\]^_`|~</a>, Previous: <a 
href="other-nodes.html" accesskey="p" rel="prev">Chapter with nodes</a>, Up: <a 
href="other-nodes.html" accesskey="u" rel="up">Chapter with nodes</a> &nbsp; 
</p>
 </div>
 <hr>
-<h4 class="node-heading">!_&quot;#$%&amp;'()*+-.</h4>
+<h4 class="node">!_&quot;#$%&amp;'()*+-.</h4>
 
 
 
diff --git 
a/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
 
b/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
index 038cf003a8..22bae63d18 100644
--- 
a/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
+++ 
b/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
@@ -24,12 +24,12 @@
 </head>
 
 <body lang="en">
-<a class="node" 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><div
 class="nav-header">
+<a class="node-id" 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></a><div
 class="nav-header">
 <p>
 Next: <a href="local-node.html" accesskey="n" rel="next">local   node</a>, 
Previous: <a 
href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html"
 accesskey="p" rel="prev">!_&quot;#$%&amp;'()*+-.</a>, Up: <a 
href="other-nodes.html" accesskey="u" rel="up">Chapter with nodes</a> &nbsp; 
</p>
 </div>
 <hr>
-<h4 class="node-heading">/;&lt;=&gt;?[\]^_`|~</h4>
+<h4 class="node">/;&lt;=&gt;?[\]^_`|~</h4>
 
 
 
diff --git 
a/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/index.html 
b/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/index.html
index 46dc06782a..c9cb4e467f 100644
--- 
a/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/index.html
+++ 
b/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/index.html
@@ -22,7 +22,7 @@
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="other-nodes.html" accesskey="n" rel="next">Chapter with 
nodes</a> &nbsp; </p>
diff --git 
a/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/local-node.html
 
b/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/local-node.html
index e6b6885668..52ed5ace5f 100644
--- 
a/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/local-node.html
+++ 
b/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/local-node.html
@@ -23,12 +23,12 @@
 </head>
 
 <body lang="en">
-<a class="node" id="local-node"></a><div class="nav-header">
+<a class="node-id" id="local-node"></a><div class="nav-header">
 <p>
 Previous: <a 
href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html"
 accesskey="p" rel="prev">/;&lt;=&gt;?[\]^_`|~</a>, Up: <a 
href="other-nodes.html" accesskey="u" rel="up">Chapter with nodes</a> &nbsp; 
</p>
 </div>
 <hr>
-<h4 class="node-heading">local   node</h4>
+<h4 class="node">local   node</h4>
 
 
 
diff --git 
a/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/other-nodes.html
 
b/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/other-nodes.html
index 81fb3e5059..2e3fe022fa 100644
--- 
a/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/other-nodes.html
+++ 
b/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/other-nodes.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="other-nodes">
+<div class="chapter-level-extent" id="other-nodes">
 <div class="nav-header">
 <p>
 Next: <a 
href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html"
 accesskey="n" rel="next">!_&quot;#$%&amp;'()*+-.</a>, Previous: <a 
href="index.html" accesskey="p" rel="prev">Test refs</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Test refs</a> &nbsp; </p>
diff --git a/tp/t/results/sectioning/contents.pl 
b/tp/t/results/sectioning/contents.pl
index 5a724348fb..1eeac2b2b8 100644
--- a/tp/t/results/sectioning/contents.pl
+++ b/tp/t/results/sectioning/contents.pl
@@ -782,7 +782,7 @@ ul.toc-numbered-mark {list-style: none}
 </head>
 
 <body lang="en">
-<div class="top" id="top">
+<div class="top-level-extent" id="top">
 <h1 class="top">top</h1>
 
 <div class="element-contents" id="SEC_Contents">
@@ -817,25 +817,25 @@ ul.toc-numbered-mark {list-style: none}
 </ul>
 </div>
 </div>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <h2 class="chapter">1 chapter</h2>
 
 <ul class="mini-toc">
 <li><a href="#section" accesskey="1">section</a></li>
 </ul>
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <h3 class="section">1.1 section</h3>
 
 <ul class="mini-toc">
 <li><a href="#subsection" accesskey="1">subsection</a></li>
 </ul>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <h4 class="subsection">1.1.1 subsection</h4>
 
 <ul class="mini-toc">
 <li><a href="#subsubsection" accesskey="1">subsubsection</a></li>
 </ul>
-<div class="subsubsection" id="subsubsection">
+<div class="subsubsection-level-extent" id="subsubsection">
 <h4 class="subsubsection">1.1.1.1 subsubsection</h4>
 
 </div>
@@ -843,7 +843,7 @@ ul.toc-numbered-mark {list-style: none}
 </div>
 </div>
 </div>
-<div class="part" id="part">
+<div class="part-level-extent" id="part">
 <h1 class="part">part</h1>
 <hr>
 
@@ -852,25 +852,25 @@ ul.toc-numbered-mark {list-style: none}
 <li><a href="#second-chapter-in-part" accesskey="2">second chapter in 
part</a></li>
 <li><a href="#unnumbered" accesskey="3">unnumbered</a></li>
 </ul>
-<div class="chapter" id="chapter-in-part">
+<div class="chapter-level-extent" id="chapter-in-part">
 <h2 class="chapter">2 chapter in part</h2>
 
 </div>
-<div class="chapter" id="second-chapter-in-part">
+<div class="chapter-level-extent" id="second-chapter-in-part">
 <h2 class="chapter">3 second chapter in part</h2>
 
 </div>
-<div class="unnumbered" id="unnumbered">
+<div class="unnumbered-level-extent" id="unnumbered">
 <h2 class="unnumbered">unnumbered</h2>
 
 </div>
-<div class="appendix" id="appendix">
+<div class="appendix-level-extent" id="appendix">
 <h2 class="appendix">Appendix A appendix</h2>
 
 <ul class="mini-toc">
 <li><a href="#appendixsec" accesskey="1">appendixsec</a></li>
 </ul>
-<div class="appendixsec" id="appendixsec">
+<div class="appendixsec-level-extent" id="appendixsec">
 <h3 class="appendixsec">A.1 appendixsec</h3>
 
 </div>
diff --git a/tp/t/results/sectioning/contents_and_shortcontents.pl 
b/tp/t/results/sectioning/contents_and_shortcontents.pl
index 54d6df1281..f9dd173d13 100644
--- a/tp/t/results/sectioning/contents_and_shortcontents.pl
+++ b/tp/t/results/sectioning/contents_and_shortcontents.pl
@@ -818,7 +818,7 @@ ul.toc-numbered-mark {list-style: none}
 </head>
 
 <body lang="en">
-<div class="top" id="top">
+<div class="top-level-extent" id="top">
 <h1 class="top">top</h1>
 
 <div class="element-contents" id="SEC_Contents">
@@ -871,25 +871,25 @@ ul.toc-numbered-mark {list-style: none}
 </ul>
 </div>
 </div>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <h2 class="chapter">1 chapter</h2>
 
 <ul class="mini-toc">
 <li><a href="#section" accesskey="1">section</a></li>
 </ul>
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <h3 class="section">1.1 section</h3>
 
 <ul class="mini-toc">
 <li><a href="#subsection" accesskey="1">subsection</a></li>
 </ul>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <h4 class="subsection">1.1.1 subsection</h4>
 
 <ul class="mini-toc">
 <li><a href="#subsubsection" accesskey="1">subsubsection</a></li>
 </ul>
-<div class="subsubsection" id="subsubsection">
+<div class="subsubsection-level-extent" id="subsubsection">
 <h4 class="subsubsection">1.1.1.1 subsubsection</h4>
 
 </div>
@@ -897,7 +897,7 @@ ul.toc-numbered-mark {list-style: none}
 </div>
 </div>
 </div>
-<div class="part" id="part">
+<div class="part-level-extent" id="part">
 <h1 class="part">part</h1>
 <hr>
 
@@ -906,25 +906,25 @@ ul.toc-numbered-mark {list-style: none}
 <li><a href="#second-chapter-in-part" accesskey="2">second chapter in 
part</a></li>
 <li><a href="#unnumbered" accesskey="3">unnumbered</a></li>
 </ul>
-<div class="chapter" id="chapter-in-part">
+<div class="chapter-level-extent" id="chapter-in-part">
 <h2 class="chapter">2 chapter in part</h2>
 
 </div>
-<div class="chapter" id="second-chapter-in-part">
+<div class="chapter-level-extent" id="second-chapter-in-part">
 <h2 class="chapter">3 second chapter in part</h2>
 
 </div>
-<div class="unnumbered" id="unnumbered">
+<div class="unnumbered-level-extent" id="unnumbered">
 <h2 class="unnumbered">unnumbered</h2>
 
 </div>
-<div class="appendix" id="appendix">
+<div class="appendix-level-extent" id="appendix">
 <h2 class="appendix">Appendix A appendix</h2>
 
 <ul class="mini-toc">
 <li><a href="#appendixsec" accesskey="1">appendixsec</a></li>
 </ul>
-<div class="appendixsec" id="appendixsec">
+<div class="appendixsec-level-extent" id="appendixsec">
 <h3 class="appendixsec">A.1 appendixsec</h3>
 
 
diff --git a/tp/t/results/sectioning/contents_in_html_text.pl 
b/tp/t/results/sectioning/contents_in_html_text.pl
index a115c5c44b..52286a7616 100644
--- a/tp/t/results/sectioning/contents_in_html_text.pl
+++ b/tp/t/results/sectioning/contents_in_html_text.pl
@@ -310,25 +310,25 @@ $result_floats{'contents_in_html_text'} = {};
 
 
 
-$result_converted{'html_text'}->{'contents_in_html_text'} = '<div class="top" 
id="top">
+$result_converted{'html_text'}->{'contents_in_html_text'} = '<div 
class="top-level-extent" id="top">
 <h1 class="top">top</h1>
 
 <ul class="mini-toc">
 <li><a href="#Chap1" accesskey="1">Chap1</a></li>
 <li><a href="#Chap2" accesskey="2">Chap2</a></li>
 </ul>
-<div class="chapter" id="Chap1">
+<div class="chapter-level-extent" id="Chap1">
 <h2 class="chapter">1 Chap1</h2>
 
 <ul class="mini-toc">
 <li><a href="#Sec-1" accesskey="1">Sec 1</a></li>
 </ul>
-<div class="section" id="Sec-1">
+<div class="section-level-extent" id="Sec-1">
 <h3 class="section">1.1 Sec 1</h3>
 
 </div>
 </div>
-<div class="chapter" id="Chap2">
+<div class="chapter-level-extent" id="Chap2">
 <h2 class="chapter">2 Chap2</h2>
 
 <div class="element-shortcontents">
diff --git a/tp/t/results/sectioning/contents_with_only_top_node.pl 
b/tp/t/results/sectioning/contents_with_only_top_node.pl
index 2ccf63d520..a5423afc4e 100644
--- a/tp/t/results/sectioning/contents_with_only_top_node.pl
+++ b/tp/t/results/sectioning/contents_with_only_top_node.pl
@@ -168,7 +168,7 @@ $result_converted{'html'}->{'contents_with_only_top_node'} 
= '<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 
 
diff --git a/tp/t/results/sectioning/double_node_anchor_float.pl 
b/tp/t/results/sectioning/double_node_anchor_float.pl
index fa5da1f13e..01f5792549 100644
--- a/tp/t/results/sectioning/double_node_anchor_float.pl
+++ b/tp/t/results/sectioning/double_node_anchor_float.pl
@@ -860,11 +860,11 @@ $result_converted{'html'}->{'double_node_anchor_float'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<a class="node" id="node1"></a><div class="nav-header">
+<a class="node-id" id="node1"></a><div class="nav-header">
 <p>
  &nbsp; </p>
 </div>
-<h4 class="node-heading">node1</h4>
+<h4 class="node">node1</h4>
 
 <hr>
 <div class="nav-header">
diff --git a/tp/t/results/sectioning/double_part.pl 
b/tp/t/results/sectioning/double_part.pl
index d72dcaf597..b37308673d 100644
--- a/tp/t/results/sectioning/double_part.pl
+++ b/tp/t/results/sectioning/double_part.pl
@@ -1163,7 +1163,7 @@ $result_converted{'html'}->{'double_part'} = '<!DOCTYPE 
html>
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#node-chapter" accesskey="n" rel="next">chapter after 2 
parts</a> &nbsp; </p>
@@ -1172,14 +1172,14 @@ Next: <a href="#node-chapter" accesskey="n" 
rel="next">chapter after 2 parts</a>
 
 
 </div>
-<div class="part" id="part-first">
+<div class="part-level-extent" id="part-first">
 <h1 class="part">part first</h1>
 <hr>
 
 <p>Text part first.
 </p><hr>
 </div>
-<div class="part" id="part-second">
+<div class="part-level-extent" id="part-second">
 <div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">top</a> &nbsp; </p>
@@ -1191,7 +1191,7 @@ Previous: <a href="#Top" accesskey="p" 
rel="prev">top</a>, Up: <a href="#Top" ac
 <ul class="mini-toc">
 <li><a href="#node-chapter" accesskey="1">chapter after 2 parts</a></li>
 </ul>
-<div class="chapter" id="node-chapter">
+<div class="chapter-level-extent" id="node-chapter">
 <h2 class="chapter" id="chapter-after-2-parts">1 chapter after 2 parts</h2>
 
 </div>
diff --git a/tp/t/results/sectioning/double_top.pl 
b/tp/t/results/sectioning/double_top.pl
index c4b8f615a1..fd494672d8 100644
--- a/tp/t/results/sectioning/double_top.pl
+++ b/tp/t/results/sectioning/double_top.pl
@@ -352,11 +352,11 @@ $result_converted{'html'}->{'double_top'} = '<!DOCTYPE 
html>
 </head>
 
 <body lang="en">
-<a class="node" id="Top"></a><div class="nav-header">
+<a class="node-id" id="Top"></a><div class="nav-header">
 <p>
 Next: <a href="#Top" accesskey="n" rel="next">ToP</a> &nbsp; </p>
 </div>
-<h1 class="node-heading">ToP</h1>
+<h1 class="node">ToP</h1>
 
 <hr>
 <div class="nav-header">
diff --git a/tp/t/results/sectioning/empty_top_node_up.pl 
b/tp/t/results/sectioning/empty_top_node_up.pl
index 284f0f9b2e..07d89783bd 100644
--- a/tp/t/results/sectioning/empty_top_node_up.pl
+++ b/tp/t/results/sectioning/empty_top_node_up.pl
@@ -442,7 +442,7 @@ $result_converted{'html'}->{'empty_top_node_up'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#first" accesskey="n" rel="next">first</a> &nbsp; </p>
@@ -451,11 +451,11 @@ Next: <a href="#first" accesskey="n" rel="next">first</a> 
&nbsp; </p>
 
 
 <hr>
-<a class="node" id="first"></a><div class="nav-header">
+<a class="node-id" id="first"></a><div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">empty top node up</a>, Up: 
<a href="#Top" accesskey="u" rel="up">empty top node up</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">first</h4>
+<h4 class="node">first</h4>
 </div>
 
 
diff --git a/tp/t/results/sectioning/equivalent_labels.pl 
b/tp/t/results/sectioning/equivalent_labels.pl
index e1d77ab7db..973cd0f385 100644
--- a/tp/t/results/sectioning/equivalent_labels.pl
+++ b/tp/t/results/sectioning/equivalent_labels.pl
@@ -668,7 +668,7 @@ $result_converted{'html'}->{'equivalent_labels'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 <a class="anchor" id="anch"></a><p>.
 </p>
diff --git a/tp/t/results/sectioning/equivalent_nodes.pl 
b/tp/t/results/sectioning/equivalent_nodes.pl
index f43e557c96..0a3f6ba36b 100644
--- a/tp/t/results/sectioning/equivalent_nodes.pl
+++ b/tp/t/results/sectioning/equivalent_nodes.pl
@@ -542,19 +542,19 @@ $result_converted{'html'}->{'equivalent_nodes'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<a class="node" id="Top"></a><div class="nav-header">
+<a class="node-id" id="Top"></a><div class="nav-header">
 <p>
 Next: <a href="#node" accesskey="n" rel="next">&lsquo;<samp 
class="samp">node</samp>&rsquo;</a> &nbsp; </p>
 </div>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 
 
 <hr>
-<a class="node" id="node"></a><div class="nav-header">
+<a class="node-id" id="node"></a><div class="nav-header">
 <p>
 Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">&lsquo;<samp class="samp">node</samp>&rsquo;</h4>
+<h4 class="node">&lsquo;<samp class="samp">node</samp>&rsquo;</h4>
 
 <p>See <a class="xref" href="#node">&lsquo;<samp 
class="samp">node</samp>&rsquo;</a>.
 </p>
diff --git a/tp/t/results/sectioning/explicit_node_directions.pl 
b/tp/t/results/sectioning/explicit_node_directions.pl
index 9736437f14..6149d19412 100644
--- a/tp/t/results/sectioning/explicit_node_directions.pl
+++ b/tp/t/results/sectioning/explicit_node_directions.pl
@@ -989,28 +989,28 @@ $result_converted{'html'}->{'explicit_node_directions'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<a class="node" id="Top"></a><div class="nav-header">
+<a class="node-id" id="Top"></a><div class="nav-header">
 <p>
 Next: <a href="#second-node" accesskey="n" rel="next">second node</a> &nbsp; 
</p>
 </div>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 <p>Top node
 </p>
 <hr>
-<a class="node" id="second-node"></a><div class="nav-header">
+<a class="node-id" id="second-node"></a><div class="nav-header">
 <p>
 Next: <a href="#third-node" accesskey="n" rel="next">third node</a>, Previous: 
<a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">second node</h4>
+<h4 class="node">second node</h4>
 
 <p>second node
 </p>
 <hr>
-<a class="node" id="third-node"></a><div class="nav-header">
+<a class="node-id" id="third-node"></a><div class="nav-header">
 <p>
 Previous: <a href="#second-node" accesskey="p" rel="prev">second node</a>, Up: 
<a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">third node</h4>
+<h4 class="node">third node</h4>
 
 
 
diff --git a/tp/t/results/sectioning/external_node_in_menu.pl 
b/tp/t/results/sectioning/external_node_in_menu.pl
index b052c6908d..5d64c83b56 100644
--- a/tp/t/results/sectioning/external_node_in_menu.pl
+++ b/tp/t/results/sectioning/external_node_in_menu.pl
@@ -822,7 +822,7 @@ $result_converted{'html'}->{'external_node_in_menu'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#nchapter1" accesskey="n" rel="next">chap1</a> &nbsp; </p>
@@ -835,7 +835,7 @@ Next: <a href="#nchapter1" accesskey="n" 
rel="next">chap1</a> &nbsp; </p>
 <li><a href="#nchapter2" accesskey="2">chap2</a></li>
 </ul>
 <hr>
-<div class="chapter" id="nchapter1">
+<div class="chapter-level-extent" id="nchapter1">
 <div class="nav-header">
 <p>
 Next: <a href="#nchapter2" accesskey="n" rel="next">chap2</a>, Previous: <a 
href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top" accesskey="u" 
rel="up">top</a> &nbsp; </p>
@@ -844,7 +844,7 @@ Next: <a href="#nchapter2" accesskey="n" 
rel="next">chap2</a>, Previous: <a href
 
 <hr>
 </div>
-<div class="chapter" id="nchapter2">
+<div class="chapter-level-extent" id="nchapter2">
 <div class="nav-header">
 <p>
 Previous: <a href="#nchapter1" accesskey="p" rel="prev">chap1</a>, Up: <a 
href="#Top" accesskey="u" rel="up">top</a> &nbsp; </p>
diff --git a/tp/t/results/sectioning/internal_top_node_up.pl 
b/tp/t/results/sectioning/internal_top_node_up.pl
index 95f350d4b6..cefd59a278 100644
--- a/tp/t/results/sectioning/internal_top_node_up.pl
+++ b/tp/t/results/sectioning/internal_top_node_up.pl
@@ -702,7 +702,7 @@ $result_converted{'html'}->{'internal_top_node_up'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#first" accesskey="n" rel="next">first</a> &nbsp; </p>
@@ -711,11 +711,11 @@ Next: <a href="#first" accesskey="n" rel="next">first</a> 
&nbsp; </p>
 
 
 <hr>
-<a class="node" id="first"></a><div class="nav-header">
+<a class="node-id" id="first"></a><div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">internal top node up</a>, 
Up: <a href="#Top" accesskey="u" rel="up">internal top node up</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">first</h4>
+<h4 class="node">first</h4>
 </div>
 
 
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 68ccb8f32a..3097147bcc 100644
--- a/tp/t/results/sectioning/next_in_menu_is_below.pl
+++ b/tp/t/results/sectioning/next_in_menu_is_below.pl
@@ -1207,7 +1207,7 @@ $result_converted{'html'}->{'next_in_menu_is_below'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; </p>
@@ -1219,7 +1219,7 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">chapter</a> &nbsp; </p>
 <li><a href="#chapter" accesskey="1">chapter</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">top</a> &nbsp; </p>
@@ -1231,7 +1231,7 @@ Previous: <a href="#Top" accesskey="p" 
rel="prev">top</a>, Up: <a href="#Top" ac
 <li><a href="#section" accesskey="1">section</a></li>
 </ul>
 <hr>
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <div class="nav-header">
 <p>
 Next: <a href="#subsection" accesskey="n" rel="next">subsection</a>, Up: <a 
href="#chapter" accesskey="u" rel="up">chapter</a> &nbsp; </p>
@@ -1243,7 +1243,7 @@ Next: <a href="#subsection" accesskey="n" 
rel="next">subsection</a>, Up: <a href
 <li><a href="#subsection" accesskey="1">subsection</a></li>
 </ul>
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <div class="nav-header">
 <p>
 Previous: <a href="#section" accesskey="p" rel="prev">section</a>, Up: <a 
href="#section" accesskey="u" rel="up">section</a> &nbsp; </p>
diff --git a/tp/t/results/sectioning/no_argument_and_contents.pl 
b/tp/t/results/sectioning/no_argument_and_contents.pl
index 1116352f39..c9d5aa088e 100644
--- a/tp/t/results/sectioning/no_argument_and_contents.pl
+++ b/tp/t/results/sectioning/no_argument_and_contents.pl
@@ -239,7 +239,7 @@ ul.toc-numbered-mark {list-style: none}
 
 <body lang="en">
 
-<div class="top" id="for-example">
+<div class="top-level-extent" id="for-example">
 <h1 class="top">for example</h1>
 
 <div class="element-contents" id="SEC_Contents">
@@ -252,7 +252,7 @@ ul.toc-numbered-mark {list-style: none}
 </ul>
 </div>
 </div>
-<div class="chapter">
+<div class="chapter-level-extent">
 <h2 class="chapter">1 </h2>
 
 </div>
diff --git a/tp/t/results/sectioning/no_menu.pl 
b/tp/t/results/sectioning/no_menu.pl
index ac3c64f6e8..47dc20e376 100644
--- a/tp/t/results/sectioning/no_menu.pl
+++ b/tp/t/results/sectioning/no_menu.pl
@@ -622,7 +622,7 @@ $result_converted{'html'}->{'no_menu'} = '<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#c1" accesskey="n" rel="next">c1</a> &nbsp; </p>
@@ -634,7 +634,7 @@ Next: <a href="#c1" accesskey="n" rel="next">c1</a> &nbsp; 
</p>
 <li><a href="#c3" accesskey="3">c3</a></li>
 </ul>
 <hr>
-<div class="chapter" id="c1">
+<div class="chapter-level-extent" id="c1">
 <div class="nav-header">
 <p>
 Next: <a href="#c2" accesskey="n" rel="next">c2</a> &nbsp; </p>
@@ -643,7 +643,7 @@ Next: <a href="#c2" accesskey="n" rel="next">c2</a> &nbsp; 
</p>
 
 <hr>
 </div>
-<div class="chapter" id="c2">
+<div class="chapter-level-extent" id="c2">
 <div class="nav-header">
 <p>
 Next: <a href="#c3" accesskey="n" rel="next">c3</a>, Previous: <a href="#c1" 
accesskey="p" rel="prev">c1</a> &nbsp; </p>
@@ -652,7 +652,7 @@ Next: <a href="#c3" accesskey="n" rel="next">c3</a>, 
Previous: <a href="#c1" acc
 
 <hr>
 </div>
-<div class="chapter" id="c3">
+<div class="chapter-level-extent" id="c3">
 <div class="nav-header">
 <p>
 Previous: <a href="#c2" accesskey="p" rel="prev">c2</a> &nbsp; </p>
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 a2920d0723..1302c28102 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
@@ -1370,7 +1370,7 @@ ul.toc-numbered-mark {list-style: none}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter-node" accesskey="n" rel="next">chapter node</a> &nbsp; 
[<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
@@ -1396,7 +1396,7 @@ Next: <a href="#chapter-node" accesskey="n" 
rel="next">chapter node</a> &nbsp; [
 </div>
 </div>
 <hr>
-<div class="chapter" id="chapter-node">
+<div class="chapter-level-extent" id="chapter-node">
 <div class="nav-header">
 <p>
 Next: <a href="#part-chapter-node" accesskey="n" rel="next">chapter with part 
node</a>, Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, Up: <a 
href="#Top" accesskey="u" rel="up">top</a> &nbsp; [<a href="#SEC_Contents" 
title="Table of contents" rel="contents">Contents</a>]</p>
@@ -1406,14 +1406,14 @@ Next: <a href="#part-chapter-node" accesskey="n" 
rel="next">chapter with part no
 
 <hr>
 </div>
-<div class="chapter" id="part-chapter-node">
+<div class="chapter-level-extent" id="part-chapter-node">
 <div class="nav-header">
 <p>
 Previous: <a href="#chapter-node" accesskey="p" rel="prev">chapter node</a>, 
Up: <a href="#Top" accesskey="u" rel="up">top</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
 </div>
 </div>
-<div class="part" id="part">
+<div class="part-level-extent" id="part">
 <h1 class="part">part</h1>
 <hr>
 
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 a56b939aae..89e27b22cc 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_top.pl
@@ -897,7 +897,7 @@ $result_converted{'html'}->{'node_part_chapter_after_top'} 
= '<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter-node" accesskey="n" rel="next">chapter</a> &nbsp; </p>
@@ -906,14 +906,14 @@ Next: <a href="#chapter-node" accesskey="n" 
rel="next">chapter</a> &nbsp; </p>
 
 
 <hr>
-<div class="chapter" id="chapter-node">
+<div class="chapter-level-extent" id="chapter-node">
 <div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">top</a> &nbsp; </p>
 </div>
 </div>
 </div>
-<div class="part" id="part">
+<div class="part-level-extent" id="part">
 <h1 class="part">part</h1>
 <hr>
 
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 161604dc8b..c7deaec538 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
@@ -298,13 +298,13 @@ 
$result_converted{'html'}->{'node_sectop_before_chapter_no_node'} = '<!DOCTYPE h
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="top-section">top section</h1>
 
 <ul class="mini-toc">
 <li><a href="#chap" accesskey="1">chap</a></li>
 </ul>
-<div class="chapter" id="chap">
+<div class="chapter-level-extent" id="chap">
 <h2 class="chapter">1 chap</h2>
 </div>
 </div>
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 74a00197a3..65e473e786 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
@@ -519,7 +519,7 @@ 
$result_converted{'html'}->{'node_sectop_before_lone_node_Top'} = '<!DOCTYPE htm
 
 <body lang="en">
 
-<div class="top" id="node-before">
+<div class="top-level-extent" id="node-before">
 <div class="nav-header">
 <p>
 Next: <a href="#chap" accesskey="n" rel="next">chap</a>, Previous: <a 
href="#Top" accesskey="p" rel="prev">Top</a> &nbsp; </p>
@@ -532,16 +532,16 @@ Next: <a href="#chap" accesskey="n" rel="next">chap</a>, 
Previous: <a href="#Top
 <li><a href="#chap" accesskey="1">chap</a></li>
 </ul>
 <hr>
-<a class="node" id="Top"></a><div class="nav-header">
+<a class="node-id" id="Top"></a><div class="nav-header">
 <p>
 Next: <a href="#node-before" accesskey="n" rel="next">top sectionning</a> 
&nbsp; </p>
 </div>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 
 <p>in node Top
 </p>
 <hr>
-<div class="chapter" id="chap">
+<div class="chapter-level-extent" id="chap">
 <div class="nav-header">
 <p>
 Up: <a href="#node-before" accesskey="u" rel="up">top sectionning</a> &nbsp; 
</p>
diff --git a/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl 
b/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl
index d52ce395cb..a614cd9b15 100644
--- a/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl
+++ b/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl
@@ -198,7 +198,7 @@ 
$result_converted{'html'}->{'node_up_direction_for_top_with_manual'} = '<!DOCTYP
 </head>
 
 <body lang="en">
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 
 
 
diff --git a/tp/t/results/sectioning/node_up_external_node.pl 
b/tp/t/results/sectioning/node_up_external_node.pl
index 3b9e52f475..9bc7e1e343 100644
--- a/tp/t/results/sectioning/node_up_external_node.pl
+++ b/tp/t/results/sectioning/node_up_external_node.pl
@@ -757,19 +757,19 @@ $result_converted{'html'}->{'node_up_external_node'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<a class="node" id="Top"></a><div class="nav-header">
+<a class="node-id" id="Top"></a><div class="nav-header">
 <p>
 Next: <a href="#first" accesskey="n" rel="next">first</a> &nbsp; </p>
 </div>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 
 
 <hr>
-<a class="node" id="first"></a><div class="nav-header">
+<a class="node-id" id="first"></a><div class="nav-header">
 <p>
 Next: <a href="manual1.html#Top" accesskey="n" rel="next">(manual1)</a>, 
Previous: <a href="manual2.html#Top" accesskey="p" rel="prev">(manual2)</a>, 
Up: <a href="manual3.html#Top" accesskey="u" rel="up">(manual3)</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">first</h4>
+<h4 class="node">first</h4>
 
 
 
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 6cbe537636..e00fb9a8d2 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
@@ -1154,24 +1154,24 @@ 
$result_converted{'html'}->{'nodes_after_top_before_chapter_nodes'} = '<!DOCTYPE
 </head>
 
 <body lang="en">
-<a class="node" id="Top"></a><div class="nav-header">
+<a class="node-id" id="Top"></a><div class="nav-header">
 <p>
 Next: <a href="#second-node" accesskey="n" rel="next">second node</a> &nbsp; 
</p>
 </div>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 <p>Top node
 </p>
 <hr>
-<a class="node" id="second-node"></a><div class="nav-header">
+<a class="node-id" id="second-node"></a><div class="nav-header">
 <p>
 Next: <a href="#third-node" accesskey="n" rel="next">chapter</a>, Previous: <a 
href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">second node</h4>
+<h4 class="node">second node</h4>
 
 <p>second node
 </p>
 <hr>
-<div class="chapter" id="third-node">
+<div class="chapter-level-extent" id="third-node">
 <div class="nav-header">
 <p>
 Previous: <a href="#second-node" accesskey="p" rel="prev">second node</a>, Up: 
<a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
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 1bad24accf..cd92d54146 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
@@ -720,24 +720,24 @@ 
$result_converted{'html'}->{'nodes_after_top_before_chapter_not_split'} = '<!DOC
 </head>
 
 <body lang="en">
-<a class="node" id="Top"></a><div class="nav-header">
+<a class="node-id" id="Top"></a><div class="nav-header">
 <p>
 Next: <a href="#second-node" accesskey="n" rel="next">second node</a> &nbsp; 
</p>
 </div>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 <p>Top node
 </p>
 <hr>
-<a class="node" id="second-node"></a><div class="nav-header">
+<a class="node-id" id="second-node"></a><div class="nav-header">
 <p>
 Next: <a href="#third-node" accesskey="n" rel="next">chapter</a>, Previous: <a 
href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">second node</h4>
+<h4 class="node">second node</h4>
 
 <p>second node
 </p>
 <hr>
-<div class="chapter" id="third-node">
+<div class="chapter-level-extent" id="third-node">
 <div class="nav-header">
 <p>
 Previous: <a href="#second-node" accesskey="p" rel="prev">second node</a>, Up: 
<a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
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 ad6c06622d..b29cde8200 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
@@ -720,24 +720,24 @@ 
$result_converted{'html'}->{'nodes_after_top_before_chapter_not_split_no_use_nod
 </head>
 
 <body lang="en">
-<a class="node" id="Top"></a><div class="nav-header">
+<a class="node-id" id="Top"></a><div class="nav-header">
 <p>
  &nbsp; </p>
 </div>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 <p>Top node
 </p>
 <hr>
-<a class="node" id="second-node"></a><div class="nav-header">
+<a class="node-id" id="second-node"></a><div class="nav-header">
 <p>
  &nbsp; </p>
 </div>
-<h4 class="node-heading">second node</h4>
+<h4 class="node">second node</h4>
 
 <p>second node
 </p>
 <hr>
-<div class="chapter" id="third-node">
+<div class="chapter-level-extent" id="third-node">
 <div class="nav-header">
 <p>
  &nbsp; </p>
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 61920a361b..9985fc3471 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
@@ -866,24 +866,24 @@ 
$result_converted{'html'}->{'nodes_after_top_before_chapter_sections'} = '<!DOCT
 </head>
 
 <body lang="en">
-<a class="node" id="Top"></a><div class="nav-header">
+<a class="node-id" id="Top"></a><div class="nav-header">
 <p>
 Next: <a href="#second-node" accesskey="n" rel="next">second node</a> &nbsp; 
</p>
 </div>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 <p>Top node
 </p>
 <hr>
-<a class="node" id="second-node"></a><div class="nav-header">
+<a class="node-id" id="second-node"></a><div class="nav-header">
 <p>
 Next: <a href="#third-node" accesskey="n" rel="next">chapter</a>, Previous: <a 
href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">second node</h4>
+<h4 class="node">second node</h4>
 
 <p>second node
 </p>
 <hr>
-<div class="chapter" id="third-node">
+<div class="chapter-level-extent" id="third-node">
 <div class="nav-header">
 <p>
 Previous: <a href="#second-node" accesskey="p" rel="prev">second node</a>, Up: 
<a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
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 c110e87111..1fbd543026 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
@@ -1159,24 +1159,24 @@ 
$result_converted{'html'}->{'nodes_after_top_before_section_nodes'} = '<!DOCTYPE
 </head>
 
 <body lang="en">
-<a class="node" id="Top"></a><div class="nav-header">
+<a class="node-id" id="Top"></a><div class="nav-header">
 <p>
 Next: <a href="#second-node" accesskey="n" rel="next">second node</a> &nbsp; 
</p>
 </div>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 <p>Top node
 </p>
 <hr>
-<a class="node" id="second-node"></a><div class="nav-header">
+<a class="node-id" id="second-node"></a><div class="nav-header">
 <p>
 Next: <a href="#third-node" accesskey="n" rel="next">subsection</a>, Previous: 
<a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">second node</h4>
+<h4 class="node">second node</h4>
 
 <p>second node
 </p>
 <hr>
-<div class="subsection" id="third-node">
+<div class="subsection-level-extent" id="third-node">
 <div class="nav-header">
 <p>
 Previous: <a href="#second-node" accesskey="p" rel="prev">second node</a>, Up: 
<a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
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 281d583a41..a355a8940c 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
@@ -871,24 +871,24 @@ 
$result_converted{'html'}->{'nodes_after_top_before_section_sections'} = '<!DOCT
 </head>
 
 <body lang="en">
-<a class="node" id="Top"></a><div class="nav-header">
+<a class="node-id" id="Top"></a><div class="nav-header">
 <p>
 Next: <a href="#second-node" accesskey="n" rel="next">second node</a> &nbsp; 
</p>
 </div>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 <p>Top node
 </p>
 <hr>
-<a class="node" id="second-node"></a><div class="nav-header">
+<a class="node-id" id="second-node"></a><div class="nav-header">
 <p>
 Next: <a href="#third-node" accesskey="n" rel="next">subsection</a>, Previous: 
<a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">second node</h4>
+<h4 class="node">second node</h4>
 
 <p>second node
 </p>
 <hr>
-<div class="subsection" id="third-node">
+<div class="subsection-level-extent" id="third-node">
 <div class="nav-header">
 <p>
 Previous: <a href="#second-node" accesskey="p" rel="prev">second node</a>, Up: 
<a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
diff --git a/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl 
b/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
index d72db139cb..c407a47237 100644
--- a/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
+++ b/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
@@ -727,20 +727,20 @@ 
$result_converted{'html'}->{'nodes_no_node_top_explicit_directions'} = '<!DOCTYP
 </head>
 
 <body lang="en">
-<a class="node" id="first"></a><div class="nav-header">
+<a class="node-id" id="first"></a><div class="nav-header">
 <p>
 Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">first</h4>
+<h4 class="node">first</h4>
 <p>first node
 </p>
 
 <hr>
-<a class="node" id="second-node"></a><div class="nav-header">
+<a class="node-id" id="second-node"></a><div class="nav-header">
 <p>
 Previous: <a href="#first" accesskey="p" rel="prev">first</a>, Up: <a 
href="#first" accesskey="u" rel="up">first</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">second node</h4>
+<h4 class="node">second node</h4>
 <p>second node
 </p>
 
diff --git a/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl 
b/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
index 68ffcd2ea9..185778018f 100644
--- a/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
+++ b/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
@@ -1047,7 +1047,7 @@ 
$result_converted{'html'}->{'non_automatic_internal_top_node_up'} = '<!DOCTYPE h
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#first" accesskey="n" rel="next">first</a> &nbsp; </p>
@@ -1056,11 +1056,11 @@ Next: <a href="#first" accesskey="n" 
rel="next">first</a> &nbsp; </p>
 
 
 <hr>
-<a class="node" id="first"></a><div class="nav-header">
+<a class="node-id" id="first"></a><div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">internal top node up</a> 
&nbsp; </p>
 </div>
-<h4 class="node-heading">first</h4>
+<h4 class="node">first</h4>
 </div>
 
 
diff --git a/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl 
b/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
index 1e3738ee48..1c7753d0ca 100644
--- a/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
+++ b/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
@@ -1048,7 +1048,7 @@ 
$result_converted{'html'}->{'non_automatic_top_node_up_and_url'} = '<!DOCTYPE ht
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#first" accesskey="n" rel="next">first</a>, Up: <a 
href="http://www.gnu.org/manual/"; accesskey="u" rel="up">@acronym{GNU, 
@acronym{GNU}\'s Not Unix} manuals</a> &nbsp; </p>
@@ -1057,11 +1057,11 @@ Next: <a href="#first" accesskey="n" 
rel="next">first</a>, Up: <a href="http://w
 
 
 <hr>
-<a class="node" id="first"></a><div class="nav-header">
+<a class="node-id" id="first"></a><div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">internal top node up</a> 
&nbsp; </p>
 </div>
-<h4 class="node-heading">first</h4>
+<h4 class="node">first</h4>
 </div>
 
 
diff --git a/tp/t/results/sectioning/non_automatic_top_node_up_url.pl 
b/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
index 07fd182c6b..3aed735d4a 100644
--- a/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
+++ b/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
@@ -959,7 +959,7 @@ 
$result_converted{'html'}->{'non_automatic_top_node_up_url'} = '<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#first" accesskey="n" rel="next">first</a>, Previous: <a 
href="dir.html#Top" accesskey="p" rel="prev">(dir)</a>, Up: <a 
href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
@@ -968,11 +968,11 @@ Next: <a href="#first" accesskey="n" 
rel="next">first</a>, Previous: <a href="di
 
 
 <hr>
-<a class="node" id="first"></a><div class="nav-header">
+<a class="node-id" id="first"></a><div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">internal top node up</a>, 
Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">first</h4>
+<h4 class="node">first</h4>
 </div>
 
 
diff --git a/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl 
b/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
index ad97033851..5afe213157 100644
--- a/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
+++ b/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
@@ -345,7 +345,7 @@ 
$result_converted{'html'}->{'one_node_explicit_directions_anchor'} = '<!DOCTYPE
 </head>
 
 <body lang="en">
-<h4 class="node-heading" id="one-node">one node</h4>
+<h4 class="node" id="one-node">one node</h4>
 <p>Top node
 </p>
 <p>anchor ref <a class="anchor" id="ref"></a>.
diff --git a/tp/t/results/sectioning/one_subsection.pl 
b/tp/t/results/sectioning/one_subsection.pl
index 4fbbbebc84..bc3f09d7de 100644
--- a/tp/t/results/sectioning/one_subsection.pl
+++ b/tp/t/results/sectioning/one_subsection.pl
@@ -117,7 +117,7 @@ $result_converted{'html'}->{'one_subsection'} = '<!DOCTYPE 
html>
 </head>
 
 <body lang="en">
-<div class="subsection" id="The-subsection">
+<div class="subsection-level-extent" id="The-subsection">
 <h4 class="subsection">1 The subsection</h4>
 </div>
 
diff --git a/tp/t/results/sectioning/one_subsection_and_node.pl 
b/tp/t/results/sectioning/one_subsection_and_node.pl
index 66896dc83c..416ca2f1fe 100644
--- a/tp/t/results/sectioning/one_subsection_and_node.pl
+++ b/tp/t/results/sectioning/one_subsection_and_node.pl
@@ -212,7 +212,7 @@ $result_converted{'html'}->{'one_subsection_and_node'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="subsection" id="one-node">
+<div class="subsection-level-extent" id="one-node">
 <h4 class="subsection" id="The-subsection">1 The subsection</h4>
 </div>
 
diff --git a/tp/t/results/sectioning/part_before_chapter.pl 
b/tp/t/results/sectioning/part_before_chapter.pl
index 6591d66e7d..18ce3eb1e7 100644
--- a/tp/t/results/sectioning/part_before_chapter.pl
+++ b/tp/t/results/sectioning/part_before_chapter.pl
@@ -249,14 +249,14 @@ $result_converted{'html'}->{'part_before_chapter'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="part" id="part">
+<div class="part-level-extent" id="part">
 <h1 class="part">part</h1>
 <hr>
 
 <ul class="mini-toc">
 <li><a href="#chapter" accesskey="1">chapter</a></li>
 </ul>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <h2 class="chapter">1 chapter</h2>
 </div>
 </div>
diff --git a/tp/t/results/sectioning/part_before_section.pl 
b/tp/t/results/sectioning/part_before_section.pl
index 15aacd1747..ab8da936ce 100644
--- a/tp/t/results/sectioning/part_before_section.pl
+++ b/tp/t/results/sectioning/part_before_section.pl
@@ -224,14 +224,14 @@ $result_directions_text{'part_before_section'} = 
'element: @section section
 ';
 
 
-$result_converted{'html_text'}->{'part_before_section'} = '<div class="part" 
id="part">
+$result_converted{'html_text'}->{'part_before_section'} = '<div 
class="part-level-extent" id="part">
 <h1 class="part">part</h1>
 <hr>
 
 <ul class="mini-toc">
 <li><a href="#section" accesskey="1">section</a></li>
 </ul>
-<div class="chapter" id="section">
+<div class="chapter-level-extent" id="section">
 <h2 class="chapter">1 section</h2>
 </div>
 </div>
diff --git a/tp/t/results/sectioning/part_before_top.pl 
b/tp/t/results/sectioning/part_before_top.pl
index 38852773f5..521ce28a53 100644
--- a/tp/t/results/sectioning/part_before_top.pl
+++ b/tp/t/results/sectioning/part_before_top.pl
@@ -257,12 +257,12 @@ $result_converted{'html'}->{'part_before_top'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="part" id="part">
+<div class="part-level-extent" id="part">
 <h1 class="part">part</h1>
 <hr>
 
 </div>
-<div class="top" id="top">
+<div class="top-level-extent" id="top">
 <h1 class="top">top</h1>
 </div>
 
diff --git a/tp/t/results/sectioning/part_chapter_after_top.pl 
b/tp/t/results/sectioning/part_chapter_after_top.pl
index 8305ef9618..457c737515 100644
--- a/tp/t/results/sectioning/part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_chapter_after_top.pl
@@ -887,7 +887,7 @@ $result_converted{'html'}->{'part_chapter_after_top'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; </p>
@@ -897,7 +897,7 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">chapter</a> &nbsp; </p>
 
 <hr>
 </div>
-<div class="part" id="part">
+<div class="part-level-extent" id="part">
 <div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">top</a> &nbsp; </p>
@@ -908,7 +908,7 @@ Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, 
Up: <a href="#Top" ac
 <ul class="mini-toc">
 <li><a href="#chapter" accesskey="1">chapter</a></li>
 </ul>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <h2 class="chapter" id="chapter-1">1 chapter</h2>
 </div>
 </div>
diff --git a/tp/t/results/sectioning/part_node_after_top.pl 
b/tp/t/results/sectioning/part_node_after_top.pl
index f91afec3d2..3ca31c7c3e 100644
--- a/tp/t/results/sectioning/part_node_after_top.pl
+++ b/tp/t/results/sectioning/part_node_after_top.pl
@@ -779,7 +779,7 @@ $result_converted{'html'}->{'part_node_after_top'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#part-node-after-top" accesskey="n" rel="next">part node after 
top</a> &nbsp; </p>
@@ -788,13 +788,13 @@ Next: <a href="#part-node-after-top" accesskey="n" 
rel="next">part node after to
 
 
 <hr>
-<a class="node" id="part-node-after-top"></a><div class="nav-header">
+<a class="node-id" id="part-node-after-top"></a><div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">top</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">part node after top</h4>
+<h4 class="node">part node after top</h4>
 </div>
-<div class="part" id="part">
+<div class="part-level-extent" id="part">
 <h1 class="part">part</h1>
 <hr>
 </div>
diff --git a/tp/t/results/sectioning/part_node_before_top.pl 
b/tp/t/results/sectioning/part_node_before_top.pl
index 6c43835839..2a3f735e87 100644
--- a/tp/t/results/sectioning/part_node_before_top.pl
+++ b/tp/t/results/sectioning/part_node_before_top.pl
@@ -722,13 +722,13 @@ $result_converted{'html'}->{'part_node_before_top'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<a class="node" id="part-node-before-top"></a><div class="nav-header">
+<a class="node-id" id="part-node-before-top"></a><div class="nav-header">
 <p>
 Next: <a href="#Top" accesskey="n" rel="next">top</a>, Previous: <a 
href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top" accesskey="u" 
rel="up">top</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">part node before top</h4>
+<h4 class="node">part node before top</h4>
 <hr>
-<div class="part" id="part">
+<div class="part-level-extent" id="part">
 <div class="nav-header">
 <p>
 Next: <a href="#part-node-before-top" accesskey="n" rel="next">part node 
before top</a> &nbsp; </p>
@@ -737,7 +737,7 @@ Next: <a href="#part-node-before-top" accesskey="n" 
rel="next">part node before
 <hr>
 
 </div>
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="top">top</h1>
 
 </div>
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 acb2c9ffab..d06bdf7222 100644
--- a/tp/t/results/sectioning/part_node_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_node_chapter_after_top.pl
@@ -1190,7 +1190,7 @@ 
$result_converted{'html'}->{'part_node_chapter_after_top'} = '<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#a-node-after-part" accesskey="n" rel="next">a node after 
part</a> &nbsp; </p>
@@ -1200,7 +1200,7 @@ Next: <a href="#a-node-after-part" accesskey="n" 
rel="next">a node after part</a
 
 <hr>
 </div>
-<div class="part" id="part">
+<div class="part-level-extent" id="part">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">chapter</a>, Previous: <a 
href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top" accesskey="u" 
rel="up">top</a> &nbsp; </p>
@@ -1211,11 +1211,11 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">chapter</a>, Previous: <a href
 <ul class="mini-toc">
 <li><a href="#chapter" accesskey="1">chapter</a></li>
 </ul>
-<h4 class="node-heading" id="a-node-after-part">a node after part</h4>
+<h4 class="node" id="a-node-after-part">a node after part</h4>
 <p>After a node after part
 </p>
 <hr>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
 Next: <a href="#a-node-after-part" accesskey="n" rel="next">a node after 
part</a>, Up: <a href="#Top" accesskey="u" rel="up">top</a> &nbsp; </p>
diff --git a/tp/t/results/sectioning/part_node_chapter_appendix.pl 
b/tp/t/results/sectioning/part_node_chapter_appendix.pl
index 2fd2f4d996..4cbeb5bf39 100644
--- a/tp/t/results/sectioning/part_node_chapter_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_appendix.pl
@@ -1090,7 +1090,7 @@ $result_converted{'html'}->{'part_node_chapter_appendix'} 
= '<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter-node" accesskey="n" rel="next">chapter</a> &nbsp; </p>
@@ -1100,7 +1100,7 @@ Next: <a href="#chapter-node" accesskey="n" 
rel="next">chapter</a> &nbsp; </p>
 
 <hr>
 </div>
-<div class="part" id="Part-1">
+<div class="part-level-extent" id="Part-1">
 <div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">top</a> &nbsp; </p>
@@ -1111,11 +1111,11 @@ Previous: <a href="#Top" accesskey="p" 
rel="prev">top</a>, Up: <a href="#Top" ac
 <ul class="mini-toc">
 <li><a href="#chapter-node" accesskey="1">chapter</a></li>
 </ul>
-<div class="chapter" id="chapter-node">
+<div class="chapter-level-extent" id="chapter-node">
 <h2 class="chapter" id="chapter">1 chapter</h2>
 
 </div>
-<div class="appendix" id="Appendix">
+<div class="appendix-level-extent" id="Appendix">
 <h2 class="appendix">Appendix A Appendix</h2>
 </div>
 </div>
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 49502ecfc5..8eb1bfddea 100644
--- a/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
@@ -1302,7 +1302,7 @@ 
$result_converted{'html'}->{'part_node_chapter_node_appendix'} = '<!DOCTYPE html
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter-node" accesskey="n" rel="next">chapter</a> &nbsp; </p>
@@ -1312,7 +1312,7 @@ Next: <a href="#chapter-node" accesskey="n" 
rel="next">chapter</a> &nbsp; </p>
 
 <hr>
 </div>
-<div class="part" id="Part-1">
+<div class="part-level-extent" id="Part-1">
 <div class="nav-header">
 <p>
 Next: <a href="#appendix-node" accesskey="n" rel="next">Appendix</a>, 
Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">top</a> &nbsp; </p>
@@ -1323,12 +1323,12 @@ Next: <a href="#appendix-node" accesskey="n" 
rel="next">Appendix</a>, Previous:
 <ul class="mini-toc">
 <li><a href="#chapter-node" accesskey="1">chapter</a></li>
 </ul>
-<div class="chapter" id="chapter-node">
+<div class="chapter-level-extent" id="chapter-node">
 <h2 class="chapter" id="chapter">1 chapter</h2>
 
 <hr>
 </div>
-<div class="appendix" id="appendix-node">
+<div class="appendix-level-extent" id="appendix-node">
 <div class="nav-header">
 <p>
 Previous: <a href="#chapter-node" accesskey="p" rel="prev">chapter</a>, Up: <a 
href="#Top" accesskey="u" rel="up">top</a> &nbsp; </p>
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 5bfe4b4e27..719fcfa982 100644
--- a/tp/t/results/sectioning/part_node_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_node_part_appendix.pl
@@ -1397,7 +1397,7 @@ 
$result_converted{'html'}->{'part_node_node_part_appendix'} = '<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter-node" accesskey="n" rel="next">chapter</a> &nbsp; </p>
@@ -1407,7 +1407,7 @@ Next: <a href="#chapter-node" accesskey="n" 
rel="next">chapter</a> &nbsp; </p>
 
 <hr>
 </div>
-<div class="part" id="Part-1">
+<div class="part-level-extent" id="Part-1">
 <div class="nav-header">
 <p>
 Next: <a href="#appendix-part" accesskey="n" rel="next">Appendix</a>, 
Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">top</a> &nbsp; </p>
@@ -1418,19 +1418,19 @@ Next: <a href="#appendix-part" accesskey="n" 
rel="next">Appendix</a>, Previous:
 <ul class="mini-toc">
 <li><a href="#chapter-node" accesskey="1">chapter</a></li>
 </ul>
-<div class="chapter" id="chapter-node">
+<div class="chapter-level-extent" id="chapter-node">
 <h2 class="chapter" id="chapter">1 chapter</h2>
 
 <hr>
 </div>
-<div class="appendix" id="appendix-part">
+<div class="appendix-level-extent" id="appendix-part">
 <div class="nav-header">
 <p>
 Previous: <a href="#chapter-node" accesskey="p" rel="prev">chapter</a>, Up: <a 
href="#Top" accesskey="u" rel="up">top</a> &nbsp; </p>
 </div>
 </div>
 </div>
-<div class="part" id="Part-Appendix">
+<div class="part-level-extent" id="Part-Appendix">
 <h1 class="part">Part Appendix</h1>
 <hr>
 
diff --git a/tp/t/results/sectioning/part_node_part_appendix.pl 
b/tp/t/results/sectioning/part_node_part_appendix.pl
index f896be0789..b8924fd655 100644
--- a/tp/t/results/sectioning/part_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_appendix.pl
@@ -1176,7 +1176,7 @@ $result_converted{'html'}->{'part_node_part_appendix'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter-node" accesskey="n" rel="next">chapter</a> &nbsp; </p>
@@ -1186,7 +1186,7 @@ Next: <a href="#chapter-node" accesskey="n" 
rel="next">chapter</a> &nbsp; </p>
 
 <hr>
 </div>
-<div class="part" id="Part-1">
+<div class="part-level-extent" id="Part-1">
 <div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">top</a> &nbsp; </p>
@@ -1197,19 +1197,19 @@ Previous: <a href="#Top" accesskey="p" 
rel="prev">top</a>, Up: <a href="#Top" ac
 <ul class="mini-toc">
 <li><a href="#chapter-node" accesskey="1">chapter</a></li>
 </ul>
-<div class="chapter" id="chapter-node">
+<div class="chapter-level-extent" id="chapter-node">
 <h2 class="chapter" id="chapter">1 chapter</h2>
 
 </div>
 </div>
-<div class="part" id="Part-Appendix">
+<div class="part-level-extent" id="Part-Appendix">
 <h1 class="part">Part Appendix</h1>
 <hr>
 
 <ul class="mini-toc">
 <li><a href="#Appendix" accesskey="1">Appendix</a></li>
 </ul>
-<div class="appendix" id="Appendix">
+<div class="appendix-level-extent" id="Appendix">
 <h2 class="appendix">Appendix A Appendix</h2>
 </div>
 </div>
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 276fabb2c2..b1a584d0d0 100644
--- a/tp/t/results/sectioning/part_node_part_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_node_appendix.pl
@@ -1387,7 +1387,7 @@ 
$result_converted{'html'}->{'part_node_part_node_appendix'} = '<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter-node" accesskey="n" rel="next">chapter</a> &nbsp; </p>
@@ -1397,7 +1397,7 @@ Next: <a href="#chapter-node" accesskey="n" 
rel="next">chapter</a> &nbsp; </p>
 
 <hr>
 </div>
-<div class="part" id="Part-1">
+<div class="part-level-extent" id="Part-1">
 <div class="nav-header">
 <p>
 Next: <a href="#appendix-node" accesskey="n" rel="next">Appendix</a>, 
Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">top</a> &nbsp; </p>
@@ -1408,13 +1408,13 @@ Next: <a href="#appendix-node" accesskey="n" 
rel="next">Appendix</a>, Previous:
 <ul class="mini-toc">
 <li><a href="#chapter-node" accesskey="1">chapter</a></li>
 </ul>
-<div class="chapter" id="chapter-node">
+<div class="chapter-level-extent" id="chapter-node">
 <h2 class="chapter" id="chapter">1 chapter</h2>
 
 <hr>
 </div>
 </div>
-<div class="part" id="Part-Appendix">
+<div class="part-level-extent" id="Part-Appendix">
 <div class="nav-header">
 <p>
 Previous: <a href="#chapter-node" accesskey="p" rel="prev">chapter</a>, Up: <a 
href="#Top" accesskey="u" rel="up">top</a> &nbsp; </p>
@@ -1425,7 +1425,7 @@ Previous: <a href="#chapter-node" accesskey="p" 
rel="prev">chapter</a>, Up: <a h
 <ul class="mini-toc">
 <li><a href="#appendix-node" accesskey="1">Appendix</a></li>
 </ul>
-<div class="appendix" id="appendix-node">
+<div class="appendix-level-extent" id="appendix-node">
 <h2 class="appendix" id="Appendix">Appendix A Appendix</h2>
 </div>
 </div>
diff --git a/tp/t/results/sectioning/placed_things_before_element.pl 
b/tp/t/results/sectioning/placed_things_before_element.pl
index 1be729ec87..c83d19dce3 100644
--- a/tp/t/results/sectioning/placed_things_before_element.pl
+++ b/tp/t/results/sectioning/placed_things_before_element.pl
@@ -1116,7 +1116,7 @@ 
$result_converted{'html'}->{'placed_things_before_element'} = '<!DOCTYPE html>
 
 <a class="index-entry-id" id="index-index-entry"></a>
 
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <h3 class="section">1 section</h3>
 
 <p>Ref to anchor
diff --git a/tp/t/results/sectioning/placed_things_before_node.pl 
b/tp/t/results/sectioning/placed_things_before_node.pl
index 39bfdae2d8..d10d466288 100644
--- a/tp/t/results/sectioning/placed_things_before_node.pl
+++ b/tp/t/results/sectioning/placed_things_before_node.pl
@@ -1179,7 +1179,7 @@ $result_converted{'html'}->{'placed_things_before_node'} 
= '<!DOCTYPE html>
 
 <a class="index-entry-id" id="index-index-entry"></a>
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="top-section">top section</h1>
 
 <p>Ref to anchor
diff --git a/tp/t/results/sectioning/protected_node_parentheses.pl 
b/tp/t/results/sectioning/protected_node_parentheses.pl
index 0cbec01fa2..b7d8aab0a5 100644
--- a/tp/t/results/sectioning/protected_node_parentheses.pl
+++ b/tp/t/results/sectioning/protected_node_parentheses.pl
@@ -675,7 +675,7 @@ $result_converted{'html'}->{'protected_node_parentheses'} = 
'<!DOCTYPE html>
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#g_t_0028manual_0029-name" accesskey="n" rel="next">(manual) 
name</a> &nbsp; </p>
@@ -684,11 +684,11 @@ Next: <a href="#g_t_0028manual_0029-name" accesskey="n" 
rel="next">(manual) name
 
 
 <hr>
-<a class="node" id="g_t_0028manual_0029-name"></a><div class="nav-header">
+<a class="node-id" id="g_t_0028manual_0029-name"></a><div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">top</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">(manual) name</h4>
+<h4 class="node">(manual) name</h4>
 
 <a class="anchor" id="g_t_0028manual2_0029-name2"></a>
 <p><a class="ref" href="#g_t_0028manual2_0029-name2">(manual2) name2</a>.
diff --git a/tp/t/results/sectioning/ref_to_top.pl 
b/tp/t/results/sectioning/ref_to_top.pl
index c62fd25f00..d01cff40a0 100644
--- a/tp/t/results/sectioning/ref_to_top.pl
+++ b/tp/t/results/sectioning/ref_to_top.pl
@@ -282,7 +282,7 @@ $result_converted{'html'}->{'ref_to_top'} = '<!DOCTYPE html>
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="top">top</h1>
 
 <p>See <a class="xref" href="#Top">top</a>.
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 6e95af3a7e..e400962f9e 100644
--- a/tp/t/results/sectioning/section_before_after_top_node.pl
+++ b/tp/t/results/sectioning/section_before_after_top_node.pl
@@ -411,15 +411,15 @@ 
$result_converted{'html'}->{'section_before_after_top_node'} = '<!DOCTYPE html>
 
 <body lang="en">
 
-<div class="unnumbered" id="before">
+<div class="unnumbered-level-extent" id="before">
 <h2 class="unnumbered">before</h2>
 
 </div>
-<div class="unnumbered" id="Top">
+<div class="unnumbered-level-extent" id="Top">
 <h2 class="unnumbered" id="top-section">top section</h2>
 
 </div>
-<div class="chapter" id="Chapter">
+<div class="chapter-level-extent" id="Chapter">
 <h2 class="chapter">1 Chapter</h2>
 
 <p>in chapter
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 0bea90a48b..0e06c57534 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
@@ -486,7 +486,7 @@ 
$result_converted{'html'}->{'section_before_after_top_node_last_node'} = '<!DOCT
 
 <body lang="en">
 
-<div class="unnumbered" id="before">
+<div class="unnumbered-level-extent" id="before">
 <div class="nav-header">
 <p>
 Next: <a href="#node-after" accesskey="n" rel="next">node after</a> &nbsp; </p>
@@ -494,21 +494,21 @@ Next: <a href="#node-after" accesskey="n" rel="next">node 
after</a> &nbsp; </p>
 <h2 class="unnumbered">before</h2>
 
 </div>
-<div class="unnumbered" id="Top">
+<div class="unnumbered-level-extent" id="Top">
 <h2 class="unnumbered" id="top-section">top section</h2>
 
 </div>
-<div class="chapter" id="Chapter">
+<div class="chapter-level-extent" id="Chapter">
 <h2 class="chapter">1 Chapter</h2>
 
 <p>in chapter
 </p>
 <hr>
-<a class="node" id="node-after"></a><div class="nav-header">
+<a class="node-id" id="node-after"></a><div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">top section</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">node after</h4>
+<h4 class="node">node after</h4>
 </div>
 
 
diff --git a/tp/t/results/sectioning/section_before_part.pl 
b/tp/t/results/sectioning/section_before_part.pl
index 68e340a47a..d898e19d4a 100644
--- a/tp/t/results/sectioning/section_before_part.pl
+++ b/tp/t/results/sectioning/section_before_part.pl
@@ -224,11 +224,11 @@ ul.toc-numbered-mark {list-style: none}
 </head>
 
 <body lang="en">
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <h3 class="section">1 section</h3>
 
 </div>
-<div class="part" id="part">
+<div class="part-level-extent" id="part">
 <h1 class="part">part</h1>
 <hr>
 
diff --git a/tp/t/results/sectioning/section_before_top.pl 
b/tp/t/results/sectioning/section_before_top.pl
index c3d50fed7b..f5fde5ca3b 100644
--- a/tp/t/results/sectioning/section_before_top.pl
+++ b/tp/t/results/sectioning/section_before_top.pl
@@ -552,7 +552,7 @@ $result_converted{'html'}->{'section_before_top'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="section" id="section-node">
+<div class="section-level-extent" id="section-node">
 <div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">top</a> &nbsp; </p>
@@ -561,7 +561,7 @@ Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, 
Up: <a href="#Top" ac
 
 <hr>
 </div>
-<div class="unnumberedsec" id="Top">
+<div class="unnumberedsec-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#section-node" accesskey="n" rel="next">section</a> &nbsp; </p>
diff --git a/tp/t/results/sectioning/section_below_unnumbered.pl 
b/tp/t/results/sectioning/section_below_unnumbered.pl
index 98d20d1b89..2e2c7ae905 100644
--- a/tp/t/results/sectioning/section_below_unnumbered.pl
+++ b/tp/t/results/sectioning/section_below_unnumbered.pl
@@ -916,7 +916,7 @@ ul.toc-numbered-mark {list-style: none}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#Unn" accesskey="n" rel="next">Unn</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
@@ -941,7 +941,7 @@ Next: <a href="#Unn" accesskey="n" rel="next">Unn</a> 
&nbsp; [<a href="#SEC_Cont
 </div>
 </div>
 <hr>
-<div class="unnumbered" id="Unn">
+<div class="unnumbered-level-extent" id="Unn">
 <div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of 
contents" rel="contents">Contents</a>]</p>
@@ -953,7 +953,7 @@ Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, 
Up: <a href="#Top" ac
 <li><a href="#Sec" accesskey="1">Sec</a></li>
 </ul>
 <hr>
-<div class="section" id="Sec">
+<div class="section-level-extent" id="Sec">
 <div class="nav-header">
 <p>
 Up: <a href="#Unn" accesskey="u" rel="up">Unn</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
diff --git a/tp/t/results/sectioning/section_below_unnumbered_no_top.pl 
b/tp/t/results/sectioning/section_below_unnumbered_no_top.pl
index a461b1bf12..7d12cd215f 100644
--- a/tp/t/results/sectioning/section_below_unnumbered_no_top.pl
+++ b/tp/t/results/sectioning/section_below_unnumbered_no_top.pl
@@ -165,12 +165,12 @@ 
$result_converted{'html'}->{'section_below_unnumbered_no_top'} = '<!DOCTYPE html
 </head>
 
 <body lang="en">
-<div class="unnumbered" id="U">
+<div class="unnumbered-level-extent" id="U">
 <h2 class="unnumbered">U</h2>
 <ul class="mini-toc">
 <li><a href="#S" accesskey="1">S</a></li>
 </ul>
-<div class="section" id="S">
+<div class="section-level-extent" id="S">
 <h3 class="section">S</h3>
 </div>
 </div>
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 7df32524b3..843cfd2990 100644
--- a/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
+++ b/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
@@ -912,7 +912,7 @@ 
$result_converted{'html'}->{'section_chapter_before_top_nodes'} = '<!DOCTYPE htm
 
 <body lang="en">
 
-<div class="section" id="section-node">
+<div class="section-level-extent" id="section-node">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter-node" accesskey="n" rel="next">chapter</a>, Up: <a 
href="#chapter-node" accesskey="u" rel="up">chapter</a> &nbsp; </p>
@@ -921,7 +921,7 @@ Next: <a href="#chapter-node" accesskey="n" 
rel="next">chapter</a>, Up: <a href=
 
 <hr>
 </div>
-<div class="section" id="chapter-node">
+<div class="section-level-extent" id="chapter-node">
 <div class="nav-header">
 <p>
 Next: <a href="#Top" accesskey="n" rel="next">top</a>, Previous: <a 
href="#section-node" accesskey="p" rel="prev">section</a>, Up: <a href="#Top" 
accesskey="u" rel="up">top</a> &nbsp; </p>
@@ -931,7 +931,7 @@ Next: <a href="#Top" accesskey="n" rel="next">top</a>, 
Previous: <a href="#secti
 
 <hr>
 </div>
-<div class="unnumberedsec" id="Top">
+<div class="unnumberedsec-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter-node" accesskey="n" rel="next">chapter</a> &nbsp; </p>
diff --git a/tp/t/results/sectioning/section_in_unnumbered_info.pl 
b/tp/t/results/sectioning/section_in_unnumbered_info.pl
index 7ac8e8e093..37e64abe21 100644
--- a/tp/t/results/sectioning/section_in_unnumbered_info.pl
+++ b/tp/t/results/sectioning/section_in_unnumbered_info.pl
@@ -8134,7 +8134,7 @@ ul.toc-numbered-mark {list-style: none}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
@@ -8210,7 +8210,7 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">chapter</a> &nbsp; [<a href="#
 </div>
 </div>
 <hr>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
 Next: <a href="#unnumbered" accesskey="n" rel="next">unnumbered</a>, Previous: 
<a href="#Top" accesskey="p" rel="prev">Test section in unnumbered</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Test section in unnumbered</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
@@ -8222,7 +8222,7 @@ Next: <a href="#unnumbered" accesskey="n" 
rel="next">unnumbered</a>, Previous: <
 <li><a href="#section-in-chapter" accesskey="1">section in chapter</a></li>
 </ul>
 <hr>
-<div class="section" id="section-in-chapter">
+<div class="section-level-extent" id="section-in-chapter">
 <div class="nav-header">
 <p>
 Up: <a href="#chapter" accesskey="u" rel="up">chapter</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
@@ -8232,7 +8232,7 @@ Up: <a href="#chapter" accesskey="u" rel="up">chapter</a> 
&nbsp; [<a href="#SEC_
 <hr>
 </div>
 </div>
-<div class="unnumbered" id="unnumbered">
+<div class="unnumbered-level-extent" id="unnumbered">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter-2" accesskey="n" rel="next">chapter 2</a>, Previous: 
<a href="#chapter" accesskey="p" rel="prev">chapter</a>, Up: <a href="#Top" 
accesskey="u" rel="up">Test section in unnumbered</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
@@ -8244,7 +8244,7 @@ Next: <a href="#chapter-2" accesskey="n" 
rel="next">chapter 2</a>, Previous: <a
 <li><a href="#section-in-unnumbered" accesskey="1">section in 
unnumbered</a></li>
 </ul>
 <hr>
-<div class="section" id="section-in-unnumbered">
+<div class="section-level-extent" id="section-in-unnumbered">
 <div class="nav-header">
 <p>
 Up: <a href="#unnumbered" accesskey="u" rel="up">unnumbered</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
@@ -8254,7 +8254,7 @@ Up: <a href="#unnumbered" accesskey="u" 
rel="up">unnumbered</a> &nbsp; [<a href=
 <hr>
 </div>
 </div>
-<div class="chapter" id="chapter-2">
+<div class="chapter-level-extent" id="chapter-2">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter-3" accesskey="n" rel="next">chapter 3</a>, Previous: 
<a href="#unnumbered" accesskey="p" rel="prev">unnumbered</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Test section in unnumbered</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
@@ -8267,7 +8267,7 @@ Next: <a href="#chapter-3" accesskey="n" 
rel="next">chapter 3</a>, Previous: <a
 <li><a href="#unnumberedsec-2_002d1" accesskey="2">unnumberedsec 2-1</a></li>
 </ul>
 <hr>
-<div class="unnumberedsec" id="unnumberedsec-2">
+<div class="unnumberedsec-level-extent" id="unnumberedsec-2">
 <div class="nav-header">
 <p>
 Next: <a href="#unnumberedsec-2_002d1" accesskey="n" rel="next">unnumberedsec 
2-1</a>, Up: <a href="#chapter-2" accesskey="u" rel="up">chapter 2</a> &nbsp; 
[<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
@@ -8282,7 +8282,7 @@ Next: <a href="#unnumberedsec-2_002d1" accesskey="n" 
rel="next">unnumberedsec 2-
 <li><a href="#numbered-sub2-2" accesskey="4">numbered subsection2 2</a></li>
 </ul>
 <hr>
-<div class="unnumberedsubsec" id="unnumbered-sub-2">
+<div class="unnumberedsubsec-level-extent" id="unnumbered-sub-2">
 <div class="nav-header">
 <p>
 Next: <a href="#numbered-sub-2" accesskey="n" rel="next">numbered subsection 
2</a>, Up: <a href="#unnumberedsec-2" accesskey="u" rel="up">unnumbered section 
2</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
@@ -8291,7 +8291,7 @@ Next: <a href="#numbered-sub-2" accesskey="n" 
rel="next">numbered subsection 2</
 
 <hr>
 </div>
-<div class="subsection" id="numbered-sub-2">
+<div class="subsection-level-extent" id="numbered-sub-2">
 <div class="nav-header">
 <p>
 Next: <a href="#unnumbered-sub2-2" accesskey="n" rel="next">unnumbered 
subsection2 2</a>, Previous: <a href="#unnumbered-sub-2" accesskey="p" 
rel="prev">unnumbered subsection 2</a>, Up: <a href="#unnumberedsec-2" 
accesskey="u" rel="up">unnumbered section 2</a> &nbsp; [<a href="#SEC_Contents" 
title="Table of contents" rel="contents">Contents</a>]</p>
@@ -8300,7 +8300,7 @@ Next: <a href="#unnumbered-sub2-2" accesskey="n" 
rel="next">unnumbered subsectio
 
 <hr>
 </div>
-<div class="unnumberedsubsec" id="unnumbered-sub2-2">
+<div class="unnumberedsubsec-level-extent" id="unnumbered-sub2-2">
 <div class="nav-header">
 <p>
 Next: <a href="#numbered-sub2-2" accesskey="n" rel="next">numbered subsection2 
2</a>, Previous: <a href="#numbered-sub-2" accesskey="p" rel="prev">numbered 
subsection 2</a>, Up: <a href="#unnumberedsec-2" accesskey="u" 
rel="up">unnumbered section 2</a> &nbsp; [<a href="#SEC_Contents" title="Table 
of contents" rel="contents">Contents</a>]</p>
@@ -8309,7 +8309,7 @@ Next: <a href="#numbered-sub2-2" accesskey="n" 
rel="next">numbered subsection2 2
 
 <hr>
 </div>
-<div class="subsection" id="numbered-sub2-2">
+<div class="subsection-level-extent" id="numbered-sub2-2">
 <div class="nav-header">
 <p>
 Previous: <a href="#unnumbered-sub2-2" accesskey="p" rel="prev">unnumbered 
subsection2 2</a>, Up: <a href="#unnumberedsec-2" accesskey="u" 
rel="up">unnumbered section 2</a> &nbsp; [<a href="#SEC_Contents" title="Table 
of contents" rel="contents">Contents</a>]</p>
@@ -8319,7 +8319,7 @@ Previous: <a href="#unnumbered-sub2-2" accesskey="p" 
rel="prev">unnumbered subse
 <hr>
 </div>
 </div>
-<div class="unnumberedsec" id="unnumberedsec-2_002d1">
+<div class="unnumberedsec-level-extent" id="unnumberedsec-2_002d1">
 <div class="nav-header">
 <p>
 Previous: <a href="#unnumberedsec-2" accesskey="p" rel="prev">unnumbered 
section 2</a>, Up: <a href="#chapter-2" accesskey="u" rel="up">chapter 2</a> 
&nbsp; [<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
@@ -8331,7 +8331,7 @@ Previous: <a href="#unnumberedsec-2" accesskey="p" 
rel="prev">unnumbered section
 <li><a href="#numbered-sub-2_002d1" accesskey="1">numbered subsection 
2-1</a></li>
 </ul>
 <hr>
-<div class="subsection" id="numbered-sub-2_002d1">
+<div class="subsection-level-extent" id="numbered-sub-2_002d1">
 <div class="nav-header">
 <p>
 Up: <a href="#unnumberedsec-2_002d1" accesskey="u" rel="up">unnumberedsec 
2-1</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
@@ -8343,7 +8343,7 @@ Up: <a href="#unnumberedsec-2_002d1" accesskey="u" 
rel="up">unnumberedsec 2-1</a
 </div>
 </div>
 </div>
-<div class="chapter" id="chapter-3">
+<div class="chapter-level-extent" id="chapter-3">
 <div class="nav-header">
 <p>
 Next: <a href="#unnumbered-4" accesskey="n" rel="next">unnumbered  4</a>, 
Previous: <a href="#chapter-2" accesskey="p" rel="prev">chapter 2</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Test section in unnumbered</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
@@ -8359,7 +8359,7 @@ Next: <a href="#unnumbered-4" accesskey="n" 
rel="next">unnumbered  4</a>, Previo
 <li><a href="#unnumberedsec-3_002d4" accesskey="5">unnumberedsec 3-4</a></li>
 </ul>
 <hr>
-<div class="unnumberedsec" id="unnumberedsec-3">
+<div class="unnumberedsec-level-extent" id="unnumberedsec-3">
 <div class="nav-header">
 <p>
 Next: <a href="#section-3_002d1" accesskey="n" rel="next">section 3-1</a>, Up: 
<a href="#chapter-3" accesskey="u" rel="up">chapter 3</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
@@ -8374,7 +8374,7 @@ Next: <a href="#section-3_002d1" accesskey="n" 
rel="next">section 3-1</a>, Up: <
 <li><a href="#numbered-sub2-3" accesskey="4">numbered subsection2 3</a></li>
 </ul>
 <hr>
-<div class="unnumberedsubsec" id="unnumbered-sub-3">
+<div class="unnumberedsubsec-level-extent" id="unnumbered-sub-3">
 <div class="nav-header">
 <p>
 Next: <a href="#numbered-sub-3" accesskey="n" rel="next">numbered subsection 
3</a>, Up: <a href="#unnumberedsec-3" accesskey="u" rel="up">unnumbered section 
3</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
@@ -8383,7 +8383,7 @@ Next: <a href="#numbered-sub-3" accesskey="n" 
rel="next">numbered subsection 3</
 
 <hr>
 </div>
-<div class="subsection" id="numbered-sub-3">
+<div class="subsection-level-extent" id="numbered-sub-3">
 <div class="nav-header">
 <p>
 Next: <a href="#unnumbered-sub2-3" accesskey="n" rel="next">unnumbered 
subsection2 3</a>, Previous: <a href="#unnumbered-sub-3" accesskey="p" 
rel="prev">unnumbered subsection 3</a>, Up: <a href="#unnumberedsec-3" 
accesskey="u" rel="up">unnumbered section 3</a> &nbsp; [<a href="#SEC_Contents" 
title="Table of contents" rel="contents">Contents</a>]</p>
@@ -8392,7 +8392,7 @@ Next: <a href="#unnumbered-sub2-3" accesskey="n" 
rel="next">unnumbered subsectio
 
 <hr>
 </div>
-<div class="unnumberedsubsec" id="unnumbered-sub2-3">
+<div class="unnumberedsubsec-level-extent" id="unnumbered-sub2-3">
 <div class="nav-header">
 <p>
 Next: <a href="#numbered-sub2-3" accesskey="n" rel="next">numbered subsection2 
3</a>, Previous: <a href="#numbered-sub-3" accesskey="p" rel="prev">numbered 
subsection 3</a>, Up: <a href="#unnumberedsec-3" accesskey="u" 
rel="up">unnumbered section 3</a> &nbsp; [<a href="#SEC_Contents" title="Table 
of contents" rel="contents">Contents</a>]</p>
@@ -8401,7 +8401,7 @@ Next: <a href="#numbered-sub2-3" accesskey="n" 
rel="next">numbered subsection2 3
 
 <hr>
 </div>
-<div class="subsection" id="numbered-sub2-3">
+<div class="subsection-level-extent" id="numbered-sub2-3">
 <div class="nav-header">
 <p>
 Previous: <a href="#unnumbered-sub2-3" accesskey="p" rel="prev">unnumbered 
subsection2 3</a>, Up: <a href="#unnumberedsec-3" accesskey="u" 
rel="up">unnumbered section 3</a> &nbsp; [<a href="#SEC_Contents" title="Table 
of contents" rel="contents">Contents</a>]</p>
@@ -8411,7 +8411,7 @@ Previous: <a href="#unnumbered-sub2-3" accesskey="p" 
rel="prev">unnumbered subse
 <hr>
 </div>
 </div>
-<div class="section" id="section-3_002d1">
+<div class="section-level-extent" id="section-3_002d1">
 <div class="nav-header">
 <p>
 Next: <a href="#unnumberedsec-3_002d2" accesskey="n" rel="next">unnumberedsec 
3-2</a>, Previous: <a href="#unnumberedsec-3" accesskey="p" 
rel="prev">unnumbered section 3</a>, Up: <a href="#chapter-3" accesskey="u" 
rel="up">chapter 3</a> &nbsp; [<a href="#SEC_Contents" title="Table of 
contents" rel="contents">Contents</a>]</p>
@@ -8420,7 +8420,7 @@ Next: <a href="#unnumberedsec-3_002d2" accesskey="n" 
rel="next">unnumberedsec 3-
 
 <hr>
 </div>
-<div class="unnumberedsec" id="unnumberedsec-3_002d2">
+<div class="unnumberedsec-level-extent" id="unnumberedsec-3_002d2">
 <div class="nav-header">
 <p>
 Next: <a href="#section-3_002d3" accesskey="n" rel="next">section 3-3</a>, 
Previous: <a href="#section-3_002d1" accesskey="p" rel="prev">section 3-1</a>, 
Up: <a href="#chapter-3" accesskey="u" rel="up">chapter 3</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
@@ -8432,7 +8432,7 @@ Next: <a href="#section-3_002d3" accesskey="n" 
rel="next">section 3-3</a>, Previ
 <li><a href="#numbered-sub-3_002d2" accesskey="1">numbered subsection 
3-2</a></li>
 </ul>
 <hr>
-<div class="subsection" id="numbered-sub-3_002d2">
+<div class="subsection-level-extent" id="numbered-sub-3_002d2">
 <div class="nav-header">
 <p>
 Up: <a href="#unnumberedsec-3_002d2" accesskey="u" rel="up">unnumberedsec 
3-2</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
@@ -8442,7 +8442,7 @@ Up: <a href="#unnumberedsec-3_002d2" accesskey="u" 
rel="up">unnumberedsec 3-2</a
 <hr>
 </div>
 </div>
-<div class="section" id="section-3_002d3">
+<div class="section-level-extent" id="section-3_002d3">
 <div class="nav-header">
 <p>
 Next: <a href="#unnumberedsec-3_002d4" accesskey="n" rel="next">unnumberedsec 
3-4</a>, Previous: <a href="#unnumberedsec-3_002d2" accesskey="p" 
rel="prev">unnumberedsec 3-2</a>, Up: <a href="#chapter-3" accesskey="u" 
rel="up">chapter 3</a> &nbsp; [<a href="#SEC_Contents" title="Table of 
contents" rel="contents">Contents</a>]</p>
@@ -8454,7 +8454,7 @@ Next: <a href="#unnumberedsec-3_002d4" accesskey="n" 
rel="next">unnumberedsec 3-
 <li><a href="#subsection-3_002d3" accesskey="1">subsection 3-3</a></li>
 </ul>
 <hr>
-<div class="subsection" id="subsection-3_002d3">
+<div class="subsection-level-extent" id="subsection-3_002d3">
 <div class="nav-header">
 <p>
 Up: <a href="#section-3_002d3" accesskey="u" rel="up">section 3-3</a> &nbsp; 
[<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
@@ -8464,7 +8464,7 @@ Up: <a href="#section-3_002d3" accesskey="u" 
rel="up">section 3-3</a> &nbsp; [<a
 <hr>
 </div>
 </div>
-<div class="unnumberedsec" id="unnumberedsec-3_002d4">
+<div class="unnumberedsec-level-extent" id="unnumberedsec-3_002d4">
 <div class="nav-header">
 <p>
 Previous: <a href="#section-3_002d3" accesskey="p" rel="prev">section 3-3</a>, 
Up: <a href="#chapter-3" accesskey="u" rel="up">chapter 3</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
@@ -8476,7 +8476,7 @@ Previous: <a href="#section-3_002d3" accesskey="p" 
rel="prev">section 3-3</a>, U
 <li><a href="#numbered-sub-3_002d4" accesskey="1">numbered subsection 
3-4</a></li>
 </ul>
 <hr>
-<div class="subsection" id="numbered-sub-3_002d4">
+<div class="subsection-level-extent" id="numbered-sub-3_002d4">
 <div class="nav-header">
 <p>
 Up: <a href="#unnumberedsec-3_002d4" accesskey="u" rel="up">unnumberedsec 
3-4</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
@@ -8487,7 +8487,7 @@ Up: <a href="#unnumberedsec-3_002d4" accesskey="u" 
rel="up">unnumberedsec 3-4</a
 </div>
 </div>
 </div>
-<div class="unnumbered" id="unnumbered-4">
+<div class="unnumbered-level-extent" id="unnumbered-4">
 <div class="nav-header">
 <p>
 Previous: <a href="#chapter-3" accesskey="p" rel="prev">chapter 3</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Test section in unnumbered</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
@@ -8499,7 +8499,7 @@ Previous: <a href="#chapter-3" accesskey="p" 
rel="prev">chapter 3</a>, Up: <a hr
 <li><a href="#unnumberedsec-4" accesskey="1">unnumbered section 4</a></li>
 </ul>
 <hr>
-<div class="unnumberedsec" id="unnumberedsec-4">
+<div class="unnumberedsec-level-extent" id="unnumberedsec-4">
 <div class="nav-header">
 <p>
 Up: <a href="#unnumbered-4" accesskey="u" rel="up">unnumbered  4</a> &nbsp; 
[<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
@@ -8514,7 +8514,7 @@ Up: <a href="#unnumbered-4" accesskey="u" 
rel="up">unnumbered  4</a> &nbsp; [<a
 <li><a href="#numbered-sub2-4" accesskey="4">numbered subsection2 4</a></li>
 </ul>
 <hr>
-<div class="unnumberedsubsec" id="unnumbered-sub-4">
+<div class="unnumberedsubsec-level-extent" id="unnumbered-sub-4">
 <div class="nav-header">
 <p>
 Next: <a href="#numbered-sub-4" accesskey="n" rel="next">numbered subsection 
4</a>, Up: <a href="#unnumberedsec-4" accesskey="u" rel="up">unnumbered section 
4</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
@@ -8523,7 +8523,7 @@ Next: <a href="#numbered-sub-4" accesskey="n" 
rel="next">numbered subsection 4</
 
 <hr>
 </div>
-<div class="subsection" id="numbered-sub-4">
+<div class="subsection-level-extent" id="numbered-sub-4">
 <div class="nav-header">
 <p>
 Next: <a href="#unnumbered-sub2-4" accesskey="n" rel="next">unnumbered 
subsection2 4</a>, Previous: <a href="#unnumbered-sub-4" accesskey="p" 
rel="prev">unnumbered subsection 4</a>, Up: <a href="#unnumberedsec-4" 
accesskey="u" rel="up">unnumbered section 4</a> &nbsp; [<a href="#SEC_Contents" 
title="Table of contents" rel="contents">Contents</a>]</p>
@@ -8532,7 +8532,7 @@ Next: <a href="#unnumbered-sub2-4" accesskey="n" 
rel="next">unnumbered subsectio
 
 <hr>
 </div>
-<div class="unnumberedsubsec" id="unnumbered-sub2-4">
+<div class="unnumberedsubsec-level-extent" id="unnumbered-sub2-4">
 <div class="nav-header">
 <p>
 Next: <a href="#numbered-sub2-4" accesskey="n" rel="next">numbered subsection2 
4</a>, Previous: <a href="#numbered-sub-4" accesskey="p" rel="prev">numbered 
subsection 4</a>, Up: <a href="#unnumberedsec-4" accesskey="u" 
rel="up">unnumbered section 4</a> &nbsp; [<a href="#SEC_Contents" title="Table 
of contents" rel="contents">Contents</a>]</p>
@@ -8541,7 +8541,7 @@ Next: <a href="#numbered-sub2-4" accesskey="n" 
rel="next">numbered subsection2 4
 
 <hr>
 </div>
-<div class="subsection" id="numbered-sub2-4">
+<div class="subsection-level-extent" id="numbered-sub2-4">
 <div class="nav-header">
 <p>
 Previous: <a href="#unnumbered-sub2-4" accesskey="p" rel="prev">unnumbered 
subsection2 4</a>, Up: <a href="#unnumberedsec-4" accesskey="u" 
rel="up">unnumbered section 4</a> &nbsp; [<a href="#SEC_Contents" title="Table 
of contents" rel="contents">Contents</a>]</p>
diff --git a/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl 
b/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
index 00d9e5faa8..73ee15cea9 100644
--- a/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
+++ b/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
@@ -7967,7 +7967,7 @@ ul.toc-numbered-mark {list-style: none}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
@@ -8043,7 +8043,7 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">chapter</a> &nbsp; [<a href="#
 </div>
 </div>
 <hr>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
 Next: <a href="#unnumbered" accesskey="n" rel="next">unnumbered</a>, Previous: 
<a href="#Top" accesskey="p" rel="prev">Test section in unnumbered</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Test section in unnumbered</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
@@ -8055,7 +8055,7 @@ Next: <a href="#unnumbered" accesskey="n" 
rel="next">unnumbered</a>, Previous: <
 <li><a href="#section-in-chapter" accesskey="1">section in chapter</a></li>
 </ul>
 <hr>
-<div class="section" id="section-in-chapter">
+<div class="section-level-extent" id="section-in-chapter">
 <div class="nav-header">
 <p>
 Up: <a href="#chapter" accesskey="u" rel="up">chapter</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
@@ -8065,7 +8065,7 @@ Up: <a href="#chapter" accesskey="u" rel="up">chapter</a> 
&nbsp; [<a href="#SEC_
 <hr>
 </div>
 </div>
-<div class="unnumbered" id="unnumbered">
+<div class="unnumbered-level-extent" id="unnumbered">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter-2" accesskey="n" rel="next">chapter 2</a>, Previous: 
<a href="#chapter" accesskey="p" rel="prev">chapter</a>, Up: <a href="#Top" 
accesskey="u" rel="up">Test section in unnumbered</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
@@ -8077,7 +8077,7 @@ Next: <a href="#chapter-2" accesskey="n" 
rel="next">chapter 2</a>, Previous: <a
 <li><a href="#section-in-unnumbered" accesskey="1">section in 
unnumbered</a></li>
 </ul>
 <hr>
-<div class="section" id="section-in-unnumbered">
+<div class="section-level-extent" id="section-in-unnumbered">
 <div class="nav-header">
 <p>
 Up: <a href="#unnumbered" accesskey="u" rel="up">unnumbered</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
@@ -8087,7 +8087,7 @@ Up: <a href="#unnumbered" accesskey="u" 
rel="up">unnumbered</a> &nbsp; [<a href=
 <hr>
 </div>
 </div>
-<div class="chapter" id="chapter-2">
+<div class="chapter-level-extent" id="chapter-2">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter-3" accesskey="n" rel="next">chapter 3</a>, Previous: 
<a href="#unnumbered" accesskey="p" rel="prev">unnumbered</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Test section in unnumbered</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
@@ -8100,7 +8100,7 @@ Next: <a href="#chapter-3" accesskey="n" 
rel="next">chapter 3</a>, Previous: <a
 <li><a href="#unnumberedsec-2_002d1" accesskey="2">unnumberedsec 2-1</a></li>
 </ul>
 <hr>
-<div class="unnumberedsec" id="unnumberedsec-2">
+<div class="unnumberedsec-level-extent" id="unnumberedsec-2">
 <div class="nav-header">
 <p>
 Next: <a href="#unnumberedsec-2_002d1" accesskey="n" rel="next">unnumberedsec 
2-1</a>, Up: <a href="#chapter-2" accesskey="u" rel="up">chapter 2</a> &nbsp; 
[<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
@@ -8115,7 +8115,7 @@ Next: <a href="#unnumberedsec-2_002d1" accesskey="n" 
rel="next">unnumberedsec 2-
 <li><a href="#numbered-sub2-2" accesskey="4">numbered subsection2 2</a></li>
 </ul>
 <hr>
-<div class="unnumberedsubsec" id="unnumbered-sub-2">
+<div class="unnumberedsubsec-level-extent" id="unnumbered-sub-2">
 <div class="nav-header">
 <p>
 Next: <a href="#numbered-sub-2" accesskey="n" rel="next">numbered subsection 
2</a>, Up: <a href="#unnumberedsec-2" accesskey="u" rel="up">unnumbered section 
2</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
@@ -8124,7 +8124,7 @@ Next: <a href="#numbered-sub-2" accesskey="n" 
rel="next">numbered subsection 2</
 
 <hr>
 </div>
-<div class="subsection" id="numbered-sub-2">
+<div class="subsection-level-extent" id="numbered-sub-2">
 <div class="nav-header">
 <p>
 Next: <a href="#unnumbered-sub2-2" accesskey="n" rel="next">unnumbered 
subsection2 2</a>, Previous: <a href="#unnumbered-sub-2" accesskey="p" 
rel="prev">unnumbered subsection 2</a>, Up: <a href="#unnumberedsec-2" 
accesskey="u" rel="up">unnumbered section 2</a> &nbsp; [<a href="#SEC_Contents" 
title="Table of contents" rel="contents">Contents</a>]</p>
@@ -8133,7 +8133,7 @@ Next: <a href="#unnumbered-sub2-2" accesskey="n" 
rel="next">unnumbered subsectio
 
 <hr>
 </div>
-<div class="unnumberedsubsec" id="unnumbered-sub2-2">
+<div class="unnumberedsubsec-level-extent" id="unnumbered-sub2-2">
 <div class="nav-header">
 <p>
 Next: <a href="#numbered-sub2-2" accesskey="n" rel="next">numbered subsection2 
2</a>, Previous: <a href="#numbered-sub-2" accesskey="p" rel="prev">numbered 
subsection 2</a>, Up: <a href="#unnumberedsec-2" accesskey="u" 
rel="up">unnumbered section 2</a> &nbsp; [<a href="#SEC_Contents" title="Table 
of contents" rel="contents">Contents</a>]</p>
@@ -8142,7 +8142,7 @@ Next: <a href="#numbered-sub2-2" accesskey="n" 
rel="next">numbered subsection2 2
 
 <hr>
 </div>
-<div class="subsection" id="numbered-sub2-2">
+<div class="subsection-level-extent" id="numbered-sub2-2">
 <div class="nav-header">
 <p>
 Previous: <a href="#unnumbered-sub2-2" accesskey="p" rel="prev">unnumbered 
subsection2 2</a>, Up: <a href="#unnumberedsec-2" accesskey="u" 
rel="up">unnumbered section 2</a> &nbsp; [<a href="#SEC_Contents" title="Table 
of contents" rel="contents">Contents</a>]</p>
@@ -8152,7 +8152,7 @@ Previous: <a href="#unnumbered-sub2-2" accesskey="p" 
rel="prev">unnumbered subse
 <hr>
 </div>
 </div>
-<div class="unnumberedsec" id="unnumberedsec-2_002d1">
+<div class="unnumberedsec-level-extent" id="unnumberedsec-2_002d1">
 <div class="nav-header">
 <p>
 Previous: <a href="#unnumberedsec-2" accesskey="p" rel="prev">unnumbered 
section 2</a>, Up: <a href="#chapter-2" accesskey="u" rel="up">chapter 2</a> 
&nbsp; [<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
@@ -8164,7 +8164,7 @@ Previous: <a href="#unnumberedsec-2" accesskey="p" 
rel="prev">unnumbered section
 <li><a href="#numbered-sub-2_002d1" accesskey="1">numbered subsection 
2-1</a></li>
 </ul>
 <hr>
-<div class="subsection" id="numbered-sub-2_002d1">
+<div class="subsection-level-extent" id="numbered-sub-2_002d1">
 <div class="nav-header">
 <p>
 Up: <a href="#unnumberedsec-2_002d1" accesskey="u" rel="up">unnumberedsec 
2-1</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
@@ -8176,7 +8176,7 @@ Up: <a href="#unnumberedsec-2_002d1" accesskey="u" 
rel="up">unnumberedsec 2-1</a
 </div>
 </div>
 </div>
-<div class="chapter" id="chapter-3">
+<div class="chapter-level-extent" id="chapter-3">
 <div class="nav-header">
 <p>
 Next: <a href="#unnumbered-4" accesskey="n" rel="next">unnumbered  4</a>, 
Previous: <a href="#chapter-2" accesskey="p" rel="prev">chapter 2</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Test section in unnumbered</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
@@ -8192,7 +8192,7 @@ Next: <a href="#unnumbered-4" accesskey="n" 
rel="next">unnumbered  4</a>, Previo
 <li><a href="#unnumberedsec-3_002d4" accesskey="5">unnumberedsec 3-4</a></li>
 </ul>
 <hr>
-<div class="unnumberedsec" id="unnumberedsec-3">
+<div class="unnumberedsec-level-extent" id="unnumberedsec-3">
 <div class="nav-header">
 <p>
 Next: <a href="#section-3_002d1" accesskey="n" rel="next">section 3-1</a>, Up: 
<a href="#chapter-3" accesskey="u" rel="up">chapter 3</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
@@ -8207,7 +8207,7 @@ Next: <a href="#section-3_002d1" accesskey="n" 
rel="next">section 3-1</a>, Up: <
 <li><a href="#numbered-sub2-3" accesskey="4">numbered subsection2 3</a></li>
 </ul>
 <hr>
-<div class="unnumberedsubsec" id="unnumbered-sub-3">
+<div class="unnumberedsubsec-level-extent" id="unnumbered-sub-3">
 <div class="nav-header">
 <p>
 Next: <a href="#numbered-sub-3" accesskey="n" rel="next">numbered subsection 
3</a>, Up: <a href="#unnumberedsec-3" accesskey="u" rel="up">unnumbered section 
3</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
@@ -8216,7 +8216,7 @@ Next: <a href="#numbered-sub-3" accesskey="n" 
rel="next">numbered subsection 3</
 
 <hr>
 </div>
-<div class="subsection" id="numbered-sub-3">
+<div class="subsection-level-extent" id="numbered-sub-3">
 <div class="nav-header">
 <p>
 Next: <a href="#unnumbered-sub2-3" accesskey="n" rel="next">unnumbered 
subsection2 3</a>, Previous: <a href="#unnumbered-sub-3" accesskey="p" 
rel="prev">unnumbered subsection 3</a>, Up: <a href="#unnumberedsec-3" 
accesskey="u" rel="up">unnumbered section 3</a> &nbsp; [<a href="#SEC_Contents" 
title="Table of contents" rel="contents">Contents</a>]</p>
@@ -8225,7 +8225,7 @@ Next: <a href="#unnumbered-sub2-3" accesskey="n" 
rel="next">unnumbered subsectio
 
 <hr>
 </div>
-<div class="unnumberedsubsec" id="unnumbered-sub2-3">
+<div class="unnumberedsubsec-level-extent" id="unnumbered-sub2-3">
 <div class="nav-header">
 <p>
 Next: <a href="#numbered-sub2-3" accesskey="n" rel="next">numbered subsection2 
3</a>, Previous: <a href="#numbered-sub-3" accesskey="p" rel="prev">numbered 
subsection 3</a>, Up: <a href="#unnumberedsec-3" accesskey="u" 
rel="up">unnumbered section 3</a> &nbsp; [<a href="#SEC_Contents" title="Table 
of contents" rel="contents">Contents</a>]</p>
@@ -8234,7 +8234,7 @@ Next: <a href="#numbered-sub2-3" accesskey="n" 
rel="next">numbered subsection2 3
 
 <hr>
 </div>
-<div class="subsection" id="numbered-sub2-3">
+<div class="subsection-level-extent" id="numbered-sub2-3">
 <div class="nav-header">
 <p>
 Previous: <a href="#unnumbered-sub2-3" accesskey="p" rel="prev">unnumbered 
subsection2 3</a>, Up: <a href="#unnumberedsec-3" accesskey="u" 
rel="up">unnumbered section 3</a> &nbsp; [<a href="#SEC_Contents" title="Table 
of contents" rel="contents">Contents</a>]</p>
@@ -8244,7 +8244,7 @@ Previous: <a href="#unnumbered-sub2-3" accesskey="p" 
rel="prev">unnumbered subse
 <hr>
 </div>
 </div>
-<div class="section" id="section-3_002d1">
+<div class="section-level-extent" id="section-3_002d1">
 <div class="nav-header">
 <p>
 Next: <a href="#unnumberedsec-3_002d2" accesskey="n" rel="next">unnumberedsec 
3-2</a>, Previous: <a href="#unnumberedsec-3" accesskey="p" 
rel="prev">unnumbered section 3</a>, Up: <a href="#chapter-3" accesskey="u" 
rel="up">chapter 3</a> &nbsp; [<a href="#SEC_Contents" title="Table of 
contents" rel="contents">Contents</a>]</p>
@@ -8253,7 +8253,7 @@ Next: <a href="#unnumberedsec-3_002d2" accesskey="n" 
rel="next">unnumberedsec 3-
 
 <hr>
 </div>
-<div class="unnumberedsec" id="unnumberedsec-3_002d2">
+<div class="unnumberedsec-level-extent" id="unnumberedsec-3_002d2">
 <div class="nav-header">
 <p>
 Next: <a href="#section-3_002d3" accesskey="n" rel="next">section 3-3</a>, 
Previous: <a href="#section-3_002d1" accesskey="p" rel="prev">section 3-1</a>, 
Up: <a href="#chapter-3" accesskey="u" rel="up">chapter 3</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
@@ -8265,7 +8265,7 @@ Next: <a href="#section-3_002d3" accesskey="n" 
rel="next">section 3-3</a>, Previ
 <li><a href="#numbered-sub-3_002d2" accesskey="1">numbered subsection 
3-2</a></li>
 </ul>
 <hr>
-<div class="subsection" id="numbered-sub-3_002d2">
+<div class="subsection-level-extent" id="numbered-sub-3_002d2">
 <div class="nav-header">
 <p>
 Up: <a href="#unnumberedsec-3_002d2" accesskey="u" rel="up">unnumberedsec 
3-2</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
@@ -8275,7 +8275,7 @@ Up: <a href="#unnumberedsec-3_002d2" accesskey="u" 
rel="up">unnumberedsec 3-2</a
 <hr>
 </div>
 </div>
-<div class="section" id="section-3_002d3">
+<div class="section-level-extent" id="section-3_002d3">
 <div class="nav-header">
 <p>
 Next: <a href="#unnumberedsec-3_002d4" accesskey="n" rel="next">unnumberedsec 
3-4</a>, Previous: <a href="#unnumberedsec-3_002d2" accesskey="p" 
rel="prev">unnumberedsec 3-2</a>, Up: <a href="#chapter-3" accesskey="u" 
rel="up">chapter 3</a> &nbsp; [<a href="#SEC_Contents" title="Table of 
contents" rel="contents">Contents</a>]</p>
@@ -8287,7 +8287,7 @@ Next: <a href="#unnumberedsec-3_002d4" accesskey="n" 
rel="next">unnumberedsec 3-
 <li><a href="#subsection-3_002d3" accesskey="1">subsection 3-3</a></li>
 </ul>
 <hr>
-<div class="subsection" id="subsection-3_002d3">
+<div class="subsection-level-extent" id="subsection-3_002d3">
 <div class="nav-header">
 <p>
 Up: <a href="#section-3_002d3" accesskey="u" rel="up">section 3-3</a> &nbsp; 
[<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
@@ -8297,7 +8297,7 @@ Up: <a href="#section-3_002d3" accesskey="u" 
rel="up">section 3-3</a> &nbsp; [<a
 <hr>
 </div>
 </div>
-<div class="unnumberedsec" id="unnumberedsec-3_002d4">
+<div class="unnumberedsec-level-extent" id="unnumberedsec-3_002d4">
 <div class="nav-header">
 <p>
 Previous: <a href="#section-3_002d3" accesskey="p" rel="prev">section 3-3</a>, 
Up: <a href="#chapter-3" accesskey="u" rel="up">chapter 3</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
@@ -8309,7 +8309,7 @@ Previous: <a href="#section-3_002d3" accesskey="p" 
rel="prev">section 3-3</a>, U
 <li><a href="#numbered-sub-3_002d4" accesskey="1">numbered subsection 
3-4</a></li>
 </ul>
 <hr>
-<div class="subsection" id="numbered-sub-3_002d4">
+<div class="subsection-level-extent" id="numbered-sub-3_002d4">
 <div class="nav-header">
 <p>
 Up: <a href="#unnumberedsec-3_002d4" accesskey="u" rel="up">unnumberedsec 
3-4</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
@@ -8320,7 +8320,7 @@ Up: <a href="#unnumberedsec-3_002d4" accesskey="u" 
rel="up">unnumberedsec 3-4</a
 </div>
 </div>
 </div>
-<div class="unnumbered" id="unnumbered-4">
+<div class="unnumbered-level-extent" id="unnumbered-4">
 <div class="nav-header">
 <p>
 Previous: <a href="#chapter-3" accesskey="p" rel="prev">chapter 3</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Test section in unnumbered</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
@@ -8332,7 +8332,7 @@ Previous: <a href="#chapter-3" accesskey="p" 
rel="prev">chapter 3</a>, Up: <a hr
 <li><a href="#unnumberedsec-4" accesskey="1">unnumbered section 4</a></li>
 </ul>
 <hr>
-<div class="unnumberedsec" id="unnumberedsec-4">
+<div class="unnumberedsec-level-extent" id="unnumberedsec-4">
 <div class="nav-header">
 <p>
 Up: <a href="#unnumbered-4" accesskey="u" rel="up">unnumbered  4</a> &nbsp; 
[<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
@@ -8347,7 +8347,7 @@ Up: <a href="#unnumbered-4" accesskey="u" 
rel="up">unnumbered  4</a> &nbsp; [<a
 <li><a href="#numbered-sub2-4" accesskey="4">numbered subsection2 4</a></li>
 </ul>
 <hr>
-<div class="unnumberedsubsec" id="unnumbered-sub-4">
+<div class="unnumberedsubsec-level-extent" id="unnumbered-sub-4">
 <div class="nav-header">
 <p>
 Next: <a href="#numbered-sub-4" accesskey="n" rel="next">numbered subsection 
4</a>, Up: <a href="#unnumberedsec-4" accesskey="u" rel="up">unnumbered section 
4</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
@@ -8356,7 +8356,7 @@ Next: <a href="#numbered-sub-4" accesskey="n" 
rel="next">numbered subsection 4</
 
 <hr>
 </div>
-<div class="subsection" id="numbered-sub-4">
+<div class="subsection-level-extent" id="numbered-sub-4">
 <div class="nav-header">
 <p>
 Next: <a href="#unnumbered-sub2-4" accesskey="n" rel="next">unnumbered 
subsection2 4</a>, Previous: <a href="#unnumbered-sub-4" accesskey="p" 
rel="prev">unnumbered subsection 4</a>, Up: <a href="#unnumberedsec-4" 
accesskey="u" rel="up">unnumbered section 4</a> &nbsp; [<a href="#SEC_Contents" 
title="Table of contents" rel="contents">Contents</a>]</p>
@@ -8365,7 +8365,7 @@ Next: <a href="#unnumbered-sub2-4" accesskey="n" 
rel="next">unnumbered subsectio
 
 <hr>
 </div>
-<div class="unnumberedsubsec" id="unnumbered-sub2-4">
+<div class="unnumberedsubsec-level-extent" id="unnumbered-sub2-4">
 <div class="nav-header">
 <p>
 Next: <a href="#numbered-sub2-4" accesskey="n" rel="next">numbered subsection2 
4</a>, Previous: <a href="#numbered-sub-4" accesskey="p" rel="prev">numbered 
subsection 4</a>, Up: <a href="#unnumberedsec-4" accesskey="u" 
rel="up">unnumbered section 4</a> &nbsp; [<a href="#SEC_Contents" title="Table 
of contents" rel="contents">Contents</a>]</p>
@@ -8374,7 +8374,7 @@ Next: <a href="#numbered-sub2-4" accesskey="n" 
rel="next">numbered subsection2 4
 
 <hr>
 </div>
-<div class="subsection" id="numbered-sub2-4">
+<div class="subsection-level-extent" id="numbered-sub2-4">
 <div class="nav-header">
 <p>
 Previous: <a href="#unnumbered-sub2-4" accesskey="p" rel="prev">unnumbered 
subsection2 4</a>, Up: <a href="#unnumberedsec-4" accesskey="u" 
rel="up">unnumbered section 4</a> &nbsp; [<a href="#SEC_Contents" title="Table 
of contents" rel="contents">Contents</a>]</p>
diff --git a/tp/t/results/sectioning/section_node_before_part.pl 
b/tp/t/results/sectioning/section_node_before_part.pl
index 16a7a31a66..cc3f6be3a7 100644
--- a/tp/t/results/sectioning/section_node_before_part.pl
+++ b/tp/t/results/sectioning/section_node_before_part.pl
@@ -286,11 +286,11 @@ $result_converted{'html'}->{'section_node_before_part'} = 
'<!DOCTYPE html>
 
 <body lang="en">
 
-<div class="section" id="Top">
+<div class="section-level-extent" id="Top">
 <h3 class="section" id="section">1 section</h3>
 
 </div>
-<div class="part" id="part">
+<div class="part-level-extent" id="part">
 <h1 class="part">part</h1>
 <hr>
 </div>
diff --git a/tp/t/results/sectioning/sections_test.pl 
b/tp/t/results/sectioning/sections_test.pl
index 54711fb29b..0d54ba2db8 100644
--- a/tp/t/results/sectioning/sections_test.pl
+++ b/tp/t/results/sectioning/sections_test.pl
@@ -739,31 +739,31 @@ $result_converted{'html'}->{'sections_test'} = '<!DOCTYPE 
html>
 </head>
 
 <body lang="en">
-<div class="top" id="top">
+<div class="top-level-extent" id="top">
 <h1 class="top">top</h1>
 
 <ul class="mini-toc">
 <li><a href="#chapter" accesskey="1">chapter</a></li>
 </ul>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <h2 class="chapter">1 chapter</h2>
 
 <ul class="mini-toc">
 <li><a href="#section" accesskey="1">section</a></li>
 </ul>
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <h3 class="section">1.1 section</h3>
 
 <ul class="mini-toc">
 <li><a href="#subsection" accesskey="1">subsection</a></li>
 </ul>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <h4 class="subsection">1.1.1 subsection</h4>
 
 <ul class="mini-toc">
 <li><a href="#subsubsection" accesskey="1">subsubsection</a></li>
 </ul>
-<div class="subsubsection" id="subsubsection">
+<div class="subsubsection-level-extent" id="subsubsection">
 <h4 class="subsubsection">1.1.1.1 subsubsection</h4>
 
 </div>
@@ -771,7 +771,7 @@ $result_converted{'html'}->{'sections_test'} = '<!DOCTYPE 
html>
 </div>
 </div>
 </div>
-<div class="part" id="part">
+<div class="part-level-extent" id="part">
 <h1 class="part">part</h1>
 <hr>
 
@@ -780,25 +780,25 @@ $result_converted{'html'}->{'sections_test'} = '<!DOCTYPE 
html>
 <li><a href="#second-chapter-in-part" accesskey="2">second chapter in 
part</a></li>
 <li><a href="#unnumbered" accesskey="3">unnumbered</a></li>
 </ul>
-<div class="chapter" id="chapter-in-part">
+<div class="chapter-level-extent" id="chapter-in-part">
 <h2 class="chapter">2 chapter in part</h2>
 
 </div>
-<div class="chapter" id="second-chapter-in-part">
+<div class="chapter-level-extent" id="second-chapter-in-part">
 <h2 class="chapter">3 second chapter in part</h2>
 
 </div>
-<div class="unnumbered" id="unnumbered">
+<div class="unnumbered-level-extent" id="unnumbered">
 <h2 class="unnumbered">unnumbered</h2>
 
 </div>
-<div class="appendix" id="appendix">
+<div class="appendix-level-extent" id="appendix">
 <h2 class="appendix">Appendix A appendix</h2>
 
 <ul class="mini-toc">
 <li><a href="#appendixsec" accesskey="1">appendixsec</a></li>
 </ul>
-<div class="appendixsec" id="appendixsec">
+<div class="appendixsec-level-extent" id="appendixsec">
 <h3 class="appendixsec">A.1 appendixsec</h3>
 </div>
 </div>
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 c38b596b05..b095cda690 100644
--- a/tp/t/results/sectioning/sections_test_no_use_nodes.pl
+++ b/tp/t/results/sectioning/sections_test_no_use_nodes.pl
@@ -740,7 +740,7 @@ $result_converted{'html'}->{'sections_test_no_use_nodes'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="top" id="top">
+<div class="top-level-extent" id="top">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter-in-part" accesskey="n" rel="next">chapter in part</a> 
&nbsp; </p>
@@ -751,7 +751,7 @@ Next: <a href="#chapter-in-part" accesskey="n" 
rel="next">chapter in part</a> &n
 <li><a href="#chapter" accesskey="1">chapter</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
  Up : <a href="#top" accesskey="u" rel="up">top</a> &nbsp; </p>
@@ -762,7 +762,7 @@ Next: <a href="#chapter-in-part" accesskey="n" 
rel="next">chapter in part</a> &n
 <li><a href="#section" accesskey="1">section</a></li>
 </ul>
 <hr>
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <div class="nav-header">
 <p>
  Up : <a href="#chapter" accesskey="u" rel="up">chapter</a> &nbsp; </p>
@@ -773,7 +773,7 @@ Next: <a href="#chapter-in-part" accesskey="n" 
rel="next">chapter in part</a> &n
 <li><a href="#subsection" accesskey="1">subsection</a></li>
 </ul>
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <div class="nav-header">
 <p>
  Up : <a href="#section" accesskey="u" rel="up">section</a> &nbsp; </p>
@@ -784,7 +784,7 @@ Next: <a href="#chapter-in-part" accesskey="n" 
rel="next">chapter in part</a> &n
 <li><a href="#subsubsection" accesskey="1">subsubsection</a></li>
 </ul>
 <hr>
-<div class="subsubsection" id="subsubsection">
+<div class="subsubsection-level-extent" id="subsubsection">
 <div class="nav-header">
 <p>
  Up : <a href="#subsection" accesskey="u" rel="up">subsection</a> &nbsp; </p>
@@ -797,7 +797,7 @@ Next: <a href="#chapter-in-part" accesskey="n" 
rel="next">chapter in part</a> &n
 </div>
 </div>
 </div>
-<div class="part" id="part">
+<div class="part-level-extent" id="part">
 <div class="nav-header">
 <p>
 Next: <a href="#second-chapter-in-part" accesskey="n" rel="next">second 
chapter in part</a> &nbsp; </p>
@@ -810,12 +810,12 @@ Next: <a href="#second-chapter-in-part" accesskey="n" 
rel="next">second chapter
 <li><a href="#second-chapter-in-part" accesskey="2">second chapter in 
part</a></li>
 <li><a href="#unnumbered" accesskey="3">unnumbered</a></li>
 </ul>
-<div class="chapter" id="chapter-in-part">
+<div class="chapter-level-extent" id="chapter-in-part">
 <h2 class="chapter">2 chapter in part</h2>
 
 <hr>
 </div>
-<div class="chapter" id="second-chapter-in-part">
+<div class="chapter-level-extent" id="second-chapter-in-part">
 <div class="nav-header">
 <p>
 Next: <a href="#unnumbered" accesskey="n" rel="next">unnumbered</a>, Prev: <a 
href="#chapter-in-part" accesskey="p" rel="prev">chapter in part</a>,  Up : <a 
href="#chapter-in-part" accesskey="u" rel="up">chapter in part</a> &nbsp; </p>
@@ -824,7 +824,7 @@ Next: <a href="#unnumbered" accesskey="n" 
rel="next">unnumbered</a>, Prev: <a hr
 
 <hr>
 </div>
-<div class="unnumbered" id="unnumbered">
+<div class="unnumbered-level-extent" id="unnumbered">
 <div class="nav-header">
 <p>
 Prev: <a href="#second-chapter-in-part" accesskey="p" rel="prev">second 
chapter in part</a>,  Up : <a href="#chapter-in-part" accesskey="u" 
rel="up">chapter in part</a> &nbsp; </p>
@@ -833,7 +833,7 @@ Prev: <a href="#second-chapter-in-part" accesskey="p" 
rel="prev">second chapter
 
 <hr>
 </div>
-<div class="appendix" id="appendix">
+<div class="appendix-level-extent" id="appendix">
 <div class="nav-header">
 <p>
 Prev: <a href="#chapter-in-part" accesskey="p" rel="prev">chapter in part</a> 
&nbsp; </p>
@@ -844,7 +844,7 @@ Prev: <a href="#chapter-in-part" accesskey="p" 
rel="prev">chapter in part</a> &n
 <li><a href="#appendixsec" accesskey="1">appendixsec</a></li>
 </ul>
 <hr>
-<div class="appendixsec" id="appendixsec">
+<div class="appendixsec-level-extent" id="appendixsec">
 <div class="nav-header">
 <p>
  Up : <a href="#appendix" accesskey="u" rel="up">appendix</a> &nbsp; </p>
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 9f66fe1f60..92ccdefb8a 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
@@ -740,7 +740,7 @@ 
$result_converted{'html'}->{'sections_test_no_use_nodes_use_node_directions'} =
 </head>
 
 <body lang="en">
-<div class="top" id="top">
+<div class="top-level-extent" id="top">
 <div class="nav-header">
 <p>
  &nbsp; </p>
@@ -751,7 +751,7 @@ 
$result_converted{'html'}->{'sections_test_no_use_nodes_use_node_directions'} =
 <li><a href="#chapter" accesskey="1">chapter</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
  &nbsp; </p>
@@ -762,7 +762,7 @@ 
$result_converted{'html'}->{'sections_test_no_use_nodes_use_node_directions'} =
 <li><a href="#section" accesskey="1">section</a></li>
 </ul>
 <hr>
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <div class="nav-header">
 <p>
  &nbsp; </p>
@@ -773,7 +773,7 @@ 
$result_converted{'html'}->{'sections_test_no_use_nodes_use_node_directions'} =
 <li><a href="#subsection" accesskey="1">subsection</a></li>
 </ul>
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <div class="nav-header">
 <p>
  &nbsp; </p>
@@ -784,7 +784,7 @@ 
$result_converted{'html'}->{'sections_test_no_use_nodes_use_node_directions'} =
 <li><a href="#subsubsection" accesskey="1">subsubsection</a></li>
 </ul>
 <hr>
-<div class="subsubsection" id="subsubsection">
+<div class="subsubsection-level-extent" id="subsubsection">
 <div class="nav-header">
 <p>
  &nbsp; </p>
@@ -797,7 +797,7 @@ 
$result_converted{'html'}->{'sections_test_no_use_nodes_use_node_directions'} =
 </div>
 </div>
 </div>
-<div class="part" id="part">
+<div class="part-level-extent" id="part">
 <div class="nav-header">
 <p>
  &nbsp; </p>
@@ -810,12 +810,12 @@ 
$result_converted{'html'}->{'sections_test_no_use_nodes_use_node_directions'} =
 <li><a href="#second-chapter-in-part" accesskey="2">second chapter in 
part</a></li>
 <li><a href="#unnumbered" accesskey="3">unnumbered</a></li>
 </ul>
-<div class="chapter" id="chapter-in-part">
+<div class="chapter-level-extent" id="chapter-in-part">
 <h2 class="chapter">2 chapter in part</h2>
 
 <hr>
 </div>
-<div class="chapter" id="second-chapter-in-part">
+<div class="chapter-level-extent" id="second-chapter-in-part">
 <div class="nav-header">
 <p>
  &nbsp; </p>
@@ -824,7 +824,7 @@ 
$result_converted{'html'}->{'sections_test_no_use_nodes_use_node_directions'} =
 
 <hr>
 </div>
-<div class="unnumbered" id="unnumbered">
+<div class="unnumbered-level-extent" id="unnumbered">
 <div class="nav-header">
 <p>
  &nbsp; </p>
@@ -833,7 +833,7 @@ 
$result_converted{'html'}->{'sections_test_no_use_nodes_use_node_directions'} =
 
 <hr>
 </div>
-<div class="appendix" id="appendix">
+<div class="appendix-level-extent" id="appendix">
 <div class="nav-header">
 <p>
  &nbsp; </p>
@@ -844,7 +844,7 @@ 
$result_converted{'html'}->{'sections_test_no_use_nodes_use_node_directions'} =
 <li><a href="#appendixsec" accesskey="1">appendixsec</a></li>
 </ul>
 <hr>
-<div class="appendixsec" id="appendixsec">
+<div class="appendixsec-level-extent" id="appendixsec">
 <div class="nav-header">
 <p>
  &nbsp; </p>
diff --git a/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl 
b/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
index 99338b5a3b..7fc007431a 100644
--- a/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
+++ b/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
@@ -307,7 +307,7 @@ 
$result_converted{'html'}->{'setfilename_on_top_and_after_node'} = '<!DOCTYPE ht
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="In-top-">In top </h1>
 
 </div>
diff --git a/tp/t/results/sectioning/shortcontents.pl 
b/tp/t/results/sectioning/shortcontents.pl
index 7a90954b8f..88624fe7db 100644
--- a/tp/t/results/sectioning/shortcontents.pl
+++ b/tp/t/results/sectioning/shortcontents.pl
@@ -777,7 +777,7 @@ ul.toc-numbered-mark {list-style: none}
 </head>
 
 <body lang="en">
-<div class="top" id="top">
+<div class="top-level-extent" id="top">
 <h1 class="top">top</h1>
 
 <div class="element-shortcontents" id="SEC_Shortcontents">
@@ -798,25 +798,25 @@ ul.toc-numbered-mark {list-style: none}
 </ul>
 </div>
 </div>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <h2 class="chapter">1 chapter</h2>
 
 <ul class="mini-toc">
 <li><a href="#section" accesskey="1">section</a></li>
 </ul>
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <h3 class="section">1.1 section</h3>
 
 <ul class="mini-toc">
 <li><a href="#subsection" accesskey="1">subsection</a></li>
 </ul>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <h4 class="subsection">1.1.1 subsection</h4>
 
 <ul class="mini-toc">
 <li><a href="#subsubsection" accesskey="1">subsubsection</a></li>
 </ul>
-<div class="subsubsection" id="subsubsection">
+<div class="subsubsection-level-extent" id="subsubsection">
 <h4 class="subsubsection">1.1.1.1 subsubsection</h4>
 
 </div>
@@ -824,7 +824,7 @@ ul.toc-numbered-mark {list-style: none}
 </div>
 </div>
 </div>
-<div class="part" id="part">
+<div class="part-level-extent" id="part">
 <h1 class="part">part</h1>
 <hr>
 
@@ -833,25 +833,25 @@ ul.toc-numbered-mark {list-style: none}
 <li><a href="#second-chapter-in-part" accesskey="2">second chapter in 
part</a></li>
 <li><a href="#unnumbered" accesskey="3">unnumbered</a></li>
 </ul>
-<div class="chapter" id="chapter-in-part">
+<div class="chapter-level-extent" id="chapter-in-part">
 <h2 class="chapter">2 chapter in part</h2>
 
 </div>
-<div class="chapter" id="second-chapter-in-part">
+<div class="chapter-level-extent" id="second-chapter-in-part">
 <h2 class="chapter">3 second chapter in part</h2>
 
 </div>
-<div class="unnumbered" id="unnumbered">
+<div class="unnumbered-level-extent" id="unnumbered">
 <h2 class="unnumbered">unnumbered</h2>
 
 </div>
-<div class="appendix" id="appendix">
+<div class="appendix-level-extent" id="appendix">
 <h2 class="appendix">Appendix A appendix</h2>
 
 <ul class="mini-toc">
 <li><a href="#appendixsec" accesskey="1">appendixsec</a></li>
 </ul>
-<div class="appendixsec" id="appendixsec">
+<div class="appendixsec-level-extent" id="appendixsec">
 <h3 class="appendixsec">A.1 appendixsec</h3>
 
 </div>
diff --git a/tp/t/results/sectioning/space_in_node.pl 
b/tp/t/results/sectioning/space_in_node.pl
index ef80bfdf0b..fb067a9303 100644
--- a/tp/t/results/sectioning/space_in_node.pl
+++ b/tp/t/results/sectioning/space_in_node.pl
@@ -729,33 +729,33 @@ $result_converted{'html'}->{'space_in_node'} = '<!DOCTYPE 
html>
 
 <body lang="en">
 
-<a class="node" id="Top"></a><div class="nav-header">
+<a class="node-id" id="Top"></a><div class="nav-header">
 <p>
 Next: <a href="#Chap-first-here" accesskey="n" rel="next">Chap first  here</a> 
&nbsp; </p>
 </div>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 
 
 <hr>
-<a class="node" id="Chap-first-here"></a><div class="nav-header">
+<a class="node-id" id="Chap-first-here"></a><div class="nav-header">
 <p>
 Next: <a href="#Test-title" accesskey="n" rel="next">Test               
title</a>, Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">Chap first  here</h4>
+<h4 class="node">Chap first  here</h4>
 
 <hr>
-<a class="node" id="Test-title"></a><div class="nav-header">
+<a class="node-id" id="Test-title"></a><div class="nav-header">
 <p>
 Next: <a href="#Last-with-spaces" accesskey="n" rel="next">Last with 
spaces</a>, Previous: <a href="#Chap-first-here" accesskey="p" rel="prev">Chap 
first  here</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">Test               title</h4>
+<h4 class="node">Test               title</h4>
 
 <hr>
-<a class="node" id="Last-with-spaces"></a><div class="nav-header">
+<a class="node-id" id="Last-with-spaces"></a><div class="nav-header">
 <p>
 Previous: <a href="#Test-title" accesskey="p" rel="prev">Test               
title</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">Last with spaces</h4>
+<h4 class="node">Last with spaces</h4>
 
 
 
diff --git a/tp/t/results/sectioning/top_no_argument_and_content.pl 
b/tp/t/results/sectioning/top_no_argument_and_content.pl
index bb25f3531c..d5916d4981 100644
--- a/tp/t/results/sectioning/top_no_argument_and_content.pl
+++ b/tp/t/results/sectioning/top_no_argument_and_content.pl
@@ -129,7 +129,7 @@ $result_converted{'html'}->{'top_no_argument_and_content'} 
= '<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="top" id="SEC_Top">
+<div class="top-level-extent" id="SEC_Top">
 
 <p>A.
 </p></div>
diff --git a/tp/t/results/sectioning/top_no_argument_and_node.pl 
b/tp/t/results/sectioning/top_no_argument_and_node.pl
index ff818fe691..ab2744fe5a 100644
--- a/tp/t/results/sectioning/top_no_argument_and_node.pl
+++ b/tp/t/results/sectioning/top_no_argument_and_node.pl
@@ -196,7 +196,7 @@ $result_converted{'html'}->{'top_no_argument_and_node'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="top" id="start">
+<div class="top-level-extent" id="start">
 <a class="top" id="SEC_Top"></a></div>
 
 
diff --git a/tp/t/results/sectioning/top_no_argument_and_top_node.pl 
b/tp/t/results/sectioning/top_no_argument_and_top_node.pl
index 71706e948a..79eb10efdf 100644
--- a/tp/t/results/sectioning/top_no_argument_and_top_node.pl
+++ b/tp/t/results/sectioning/top_no_argument_and_top_node.pl
@@ -186,7 +186,7 @@ $result_converted{'html'}->{'top_no_argument_and_top_node'} 
= '<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <a class="top" id="SEC_Top"></a></div>
 
 
diff --git a/tp/t/results/sectioning/top_node_no_menu_direction.pl 
b/tp/t/results/sectioning/top_node_no_menu_direction.pl
index e939486982..7903dbcd29 100644
--- a/tp/t/results/sectioning/top_node_no_menu_direction.pl
+++ b/tp/t/results/sectioning/top_node_no_menu_direction.pl
@@ -526,19 +526,19 @@ $result_converted{'html'}->{'top_node_no_menu_direction'} 
= '<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<a class="node" id="Top"></a><div class="nav-header">
+<a class="node-id" id="Top"></a><div class="nav-header">
 <p>
 Next: <a href="#second-node" accesskey="n" rel="next">second node</a> &nbsp; 
</p>
 </div>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 
 
 <hr>
-<a class="node" id="second-node"></a><div class="nav-header">
+<a class="node-id" id="second-node"></a><div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">second node</h4>
+<h4 class="node">second node</h4>
 
 
 
diff --git a/tp/t/results/sectioning/top_node_part_top.pl 
b/tp/t/results/sectioning/top_node_part_top.pl
index ffaf2c1cfa..ecdb310159 100644
--- a/tp/t/results/sectioning/top_node_part_top.pl
+++ b/tp/t/results/sectioning/top_node_part_top.pl
@@ -421,10 +421,10 @@ $result_converted{'html'}->{'top_node_part_top'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 
 </div>
-<div class="part" id="part">
+<div class="part-level-extent" id="part">
 <h1 class="part">part</h1>
 <hr>
 
diff --git a/tp/t/results/sectioning/top_node_up_url.pl 
b/tp/t/results/sectioning/top_node_up_url.pl
index f96684e2bb..093f5c4a52 100644
--- a/tp/t/results/sectioning/top_node_up_url.pl
+++ b/tp/t/results/sectioning/top_node_up_url.pl
@@ -703,7 +703,7 @@ $result_converted{'html'}->{'top_node_up_url'} = '<!DOCTYPE 
html>
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#first" accesskey="n" rel="next">first</a>, Up: <a 
href="http://www.gnu.org/manual/"; accesskey="u" rel="up">@acronym{GNU, 
@acronym{GNU}\'s Not Unix} manuals</a> &nbsp; </p>
@@ -712,11 +712,11 @@ Next: <a href="#first" accesskey="n" 
rel="next">first</a>, Up: <a href="http://w
 
 
 <hr>
-<a class="node" id="first"></a><div class="nav-header">
+<a class="node-id" id="first"></a><div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">internal top node up</a>, 
Up: <a href="#Top" accesskey="u" rel="up">internal top node up</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">first</h4>
+<h4 class="node">first</h4>
 </div>
 
 
diff --git a/tp/t/results/sectioning/top_without_node_nodes.pl 
b/tp/t/results/sectioning/top_without_node_nodes.pl
index 30b96c1649..3d78a94a17 100644
--- a/tp/t/results/sectioning/top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/top_without_node_nodes.pl
@@ -500,14 +500,14 @@ $result_converted{'html'}->{'top_without_node_nodes'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="top" id="top-section">
+<div class="top-level-extent" id="top-section">
 <h1 class="top">top section</h1>
 <p>Top section
 </p>
 <ul class="mini-toc">
 <li><a href="#second" accesskey="1">Chapter</a></li>
 </ul>
-<div class="chapter" id="second">
+<div class="chapter-level-extent" id="second">
 <h2 class="chapter" id="Chapter">1 Chapter</h2>
 
 <p>Text of chapter
diff --git a/tp/t/results/sectioning/top_without_node_sections.pl 
b/tp/t/results/sectioning/top_without_node_sections.pl
index c267be9635..2d10a3a986 100644
--- a/tp/t/results/sectioning/top_without_node_sections.pl
+++ b/tp/t/results/sectioning/top_without_node_sections.pl
@@ -638,14 +638,14 @@ $result_converted{'html'}->{'top_without_node_sections'} 
= '<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="top" id="top-section">
+<div class="top-level-extent" id="top-section">
 <h1 class="top">top section</h1>
 <p>Top section
 </p>
 <ul class="mini-toc">
 <li><a href="#second" accesskey="1">Chapter</a></li>
 </ul>
-<div class="chapter" id="second">
+<div class="chapter-level-extent" id="second">
 <h2 class="chapter" id="Chapter">1 Chapter</h2>
 
 <p>Text of chapter
diff --git 
a/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/a.html 
b/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/a.html
index 3aa73e01e2..cbbe5a6f51 100644
--- 
a/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/a.html
+++ 
b/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/a.html
@@ -24,19 +24,19 @@
 </head>
 
 <body lang="en">
-<a class="node" id="g_t_00e3"></a><div class="nav-header">
+<a class="node-id" id="g_t_00e3"></a><div class="nav-header">
 <p>
 Next: <a href="n.html" accesskey="n" rel="next">n</a>, Previous: <a 
href="index.html" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<h4 class="node-heading">&atilde;</h4>
+<h4 class="node">&atilde;</h4>
 
 <hr>
-<a class="node" id="g_t_00e2"></a><div class="nav-header">
+<a class="node-id" id="g_t_00e2"></a><div class="nav-header">
 <p>
 Previous: <a href="n.html" accesskey="p" rel="prev">n</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">&acirc;</h4>
+<h4 class="node">&acirc;</h4>
 
 
 
diff --git 
a/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/index.html
 
b/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/index.html
index 26cd605fec..82e23348d2 100644
--- 
a/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/index.html
+++ 
b/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/index.html
@@ -22,12 +22,12 @@
 </head>
 
 <body lang="en">
-<a class="node" id="Top"></a><div class="nav-header">
+<a class="node-id" id="Top"></a><div class="nav-header">
 <p>
 Next: <a href="a.html#g_t_00e3" accesskey="n" rel="next">&atilde;</a> &nbsp; 
</p>
 </div>
 <hr>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 
 
 <hr>
diff --git 
a/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/n.html 
b/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/n.html
index a502c5acc7..f566db00dd 100644
--- 
a/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/n.html
+++ 
b/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/n.html
@@ -24,12 +24,12 @@
 </head>
 
 <body lang="en">
-<a class="node" id="n"></a><div class="nav-header">
+<a class="node-id" id="n"></a><div class="nav-header">
 <p>
 Next: <a href="a.html#g_t_00e2" accesskey="n" rel="next">&acirc;</a>, 
Previous: <a href="a.html#g_t_00e3" accesskey="p" rel="prev">&atilde;</a>, Up: 
<a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<h4 class="node-heading">n</h4>
+<h4 class="node">n</h4>
 
 
 
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 9f8cb5ce0c..e272d37288 100644
--- a/tp/t/results/sectioning/two_nodes_at_the_end.pl
+++ b/tp/t/results/sectioning/two_nodes_at_the_end.pl
@@ -1202,7 +1202,7 @@ $result_converted{'html'}->{'two_nodes_at_the_end'} = 
'<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter-1" accesskey="n" rel="next">chapter c1</a> &nbsp; </p>
@@ -1214,7 +1214,7 @@ Next: <a href="#chapter-1" accesskey="n" 
rel="next">chapter c1</a> &nbsp; </p>
 <li><a href="#chapter-1" accesskey="1">chapter c1</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chapter-1">
+<div class="chapter-level-extent" id="chapter-1">
 <div class="nav-header">
 <p>
 Next: <a href="#node-after-chapter-1" accesskey="n" rel="next">node after 
chapter 1</a>, Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, Up: 
<a href="#Top" accesskey="u" rel="up">top</a> &nbsp; </p>
@@ -1222,20 +1222,20 @@ Next: <a href="#node-after-chapter-1" accesskey="n" 
rel="next">node after chapte
 <h2 class="chapter" id="chapter-c1">1 chapter c1</h2>
 
 <hr>
-<a class="node" id="node-after-chapter-1"></a><div class="nav-header">
+<a class="node-id" id="node-after-chapter-1"></a><div class="nav-header">
 <p>
 Next: <a href="#node-after-chapter-2" accesskey="n" rel="next">node after 
chapter 2</a>, Previous: <a href="#chapter-1" accesskey="p" rel="prev">chapter 
c1</a>, Up: <a href="#Top" accesskey="u" rel="up">top</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">node after chapter 1</h4>
+<h4 class="node">node after chapter 1</h4>
 
 <p>in node after chapter 1
 </p>
 <hr>
-<a class="node" id="node-after-chapter-2"></a><div class="nav-header">
+<a class="node-id" id="node-after-chapter-2"></a><div class="nav-header">
 <p>
 Previous: <a href="#node-after-chapter-1" accesskey="p" rel="prev">node after 
chapter 1</a>, Up: <a href="#Top" accesskey="u" rel="up">top</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">node after chapter 2</h4>
+<h4 class="node">node after chapter 2</h4>
 </div>
 </div>
 
diff --git a/tp/t/results/sectioning/two_nodes_between_chapters.pl 
b/tp/t/results/sectioning/two_nodes_between_chapters.pl
index 42ea265997..77a358091a 100644
--- a/tp/t/results/sectioning/two_nodes_between_chapters.pl
+++ b/tp/t/results/sectioning/two_nodes_between_chapters.pl
@@ -1446,7 +1446,7 @@ $result_converted{'html'}->{'two_nodes_between_chapters'} 
= '<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter-1" accesskey="n" rel="next">chapter c1</a> &nbsp; </p>
@@ -1459,7 +1459,7 @@ Next: <a href="#chapter-1" accesskey="n" 
rel="next">chapter c1</a> &nbsp; </p>
 <li><a href="#chapter-2" accesskey="2">chapter c2</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chapter-1">
+<div class="chapter-level-extent" id="chapter-1">
 <div class="nav-header">
 <p>
 Next: <a href="#Top" accesskey="n" rel="next">top</a>, Previous: <a 
href="#node-between-chapters" accesskey="p" rel="prev">node between 
chapters</a>, Up: <a href="#Top" accesskey="u" rel="up">top</a> &nbsp; </p>
@@ -1467,15 +1467,15 @@ Next: <a href="#Top" accesskey="n" rel="next">top</a>, 
Previous: <a href="#node-
 <h2 class="chapter" id="chapter-c1">1 chapter c1</h2>
 
 <hr>
-<a class="node" id="node-between-chapters"></a><div class="nav-header">
+<a class="node-id" id="node-between-chapters"></a><div class="nav-header">
 <p>
 Next: <a href="#chapter-2" accesskey="n" rel="next">chapter c2</a>, Previous: 
<a href="#chapter-1" accesskey="p" rel="prev">chapter c1</a>, Up: <a 
href="#Top" accesskey="u" rel="up">top</a> &nbsp; </p>
 </div>
-<h4 class="node-heading">node between chapters</h4>
+<h4 class="node">node between chapters</h4>
 
 <hr>
 </div>
-<div class="chapter" id="chapter-2">
+<div class="chapter-level-extent" id="chapter-2">
 <div class="nav-header">
 <p>
 Previous: <a href="#chapter-1" accesskey="p" rel="prev">chapter c1</a>, Up: <a 
href="#Top" accesskey="u" rel="up">top</a> &nbsp; </p>
diff --git a/tp/t/results/sectioning/unnumbered_before_node_top_top.pl 
b/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
index 225b9bc103..c4929edd48 100644
--- a/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
+++ b/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
@@ -557,13 +557,13 @@ 
$result_converted{'html'}->{'unnumbered_before_node_top_top'} = '<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="unnumbered" id="before-nodes">
+<div class="unnumbered-level-extent" id="before-nodes">
 <h2 class="unnumbered">before nodes</h2>
 
 <p>in unnumbered
 </p>
 </div>
-<div class="unnumbered" id="Top">
+<div class="unnumbered-level-extent" id="Top">
 <h2 class="unnumbered" id="top-section">top section</h2>
 <p>Top node
 </p></div>
diff --git a/tp/t/results/sectioning/unnumbered_before_top_node.pl 
b/tp/t/results/sectioning/unnumbered_before_top_node.pl
index 8f9e193760..8032767473 100644
--- a/tp/t/results/sectioning/unnumbered_before_top_node.pl
+++ b/tp/t/results/sectioning/unnumbered_before_top_node.pl
@@ -357,10 +357,10 @@ $result_converted{'html'}->{'unnumbered_before_top_node'} 
= '<!DOCTYPE html>
 </head>
 
 <body lang="en">
-<div class="unnumbered" id="before-nodes">
+<div class="unnumbered-level-extent" id="before-nodes">
 <h2 class="unnumbered">before nodes</h2>
 
-<h1 class="node-heading" id="Top">Top</h1>
+<h1 class="node" id="Top">Top</h1>
 <p>Top node
 </p>
 <h1 class="titlefont">Title titlefont</h1>
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 b0320a1a84..88174a1f96 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
@@ -904,7 +904,7 @@ 
$result_converted{'html'}->{'unnumbered_top_without_node_nodes'} = '<!DOCTYPE ht
 </head>
 
 <body lang="en">
-<div class="unnumbered" id="a-node">
+<div class="unnumbered-level-extent" id="a-node">
 <div class="nav-header">
 <p>
 Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
@@ -914,13 +914,13 @@ Up: <a href="dir.html#Top" accesskey="u" 
rel="up">(dir)</a> &nbsp; </p>
 <p>in unnumbered
 </p>
 </div>
-<div class="unnumbered" id="top-section">
+<div class="unnumbered-level-extent" id="top-section">
 <h2 class="unnumbered">top section</h2>
 <p>Top section
 </p>
 <hr>
 </div>
-<div class="chapter" id="second">
+<div class="chapter-level-extent" id="second">
 <div class="nav-header">
 <p>
 Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
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 03198ad8c4..0c68678621 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
@@ -1046,7 +1046,7 @@ 
$result_converted{'html'}->{'unnumbered_top_without_node_sections'} = '<!DOCTYPE
 </head>
 
 <body lang="en">
-<div class="unnumbered" id="a-node">
+<div class="unnumbered-level-extent" id="a-node">
 <div class="nav-header">
 <p>
 Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
@@ -1056,13 +1056,13 @@ Up: <a href="dir.html#Top" accesskey="u" 
rel="up">(dir)</a> &nbsp; </p>
 <p>in unnumbered
 </p>
 </div>
-<div class="unnumbered" id="top-section">
+<div class="unnumbered-level-extent" id="top-section">
 <h2 class="unnumbered">top section</h2>
 <p>Top section
 </p>
 <hr>
 </div>
-<div class="chapter" id="second">
+<div class="chapter-level-extent" id="second">
 <div class="nav-header">
 <p>
 Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
diff --git a/tp/t/results/xtable/block_commands_in_table.pl 
b/tp/t/results/xtable/block_commands_in_table.pl
index ba85d35833..94875da6e1 100644
--- a/tp/t/results/xtable/block_commands_in_table.pl
+++ b/tp/t/results/xtable/block_commands_in_table.pl
@@ -1732,7 +1732,7 @@ _second item_
 ';
 
 
-$result_converted{'html_text'}->{'block_commands_in_table'} = '<div 
class="top" id="Top">
+$result_converted{'html_text'}->{'block_commands_in_table'} = '<div 
class="top-level-extent" id="Top">
 <h1 class="top" id="Element">Element</h1>
 
 <dl class="table">
diff --git a/tp/t/results/xtable/inter_item_commands_in_table.pl 
b/tp/t/results/xtable/inter_item_commands_in_table.pl
index c1230e95a9..8b33cddf45 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table.pl
@@ -3199,7 +3199,7 @@ D
 
 
 $result_converted{'html_text'}->{'inter_item_commands_in_table'} = '
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
  &nbsp; </p>
@@ -3210,7 +3210,7 @@ 
$result_converted{'html_text'}->{'inter_item_commands_in_table'} = '
 <li><a href="#chapter" accesskey="1">chap</a></li>
 </ul>
 <hr>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
  &nbsp; </p>
diff --git 
a/tp/tests/contents/res_parser/contents_and_parts/contents_and_parts.html 
b/tp/tests/contents/res_parser/contents_and_parts/contents_and_parts.html
index b68782eda0..0979712ff3 100644
--- a/tp/tests/contents/res_parser/contents_and_parts/contents_and_parts.html
+++ b/tp/tests/contents/res_parser/contents_and_parts/contents_and_parts.html
@@ -24,7 +24,7 @@ ul.toc-numbered-mark {list-style: none}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter-1-node" title="Next 
section in reading order"> &gt; </a>]</td>
@@ -46,7 +46,7 @@ ul.toc-numbered-mark {list-style: none}
 
 <hr style="height: 6px;">
 </div>
-<div class="part" id="part-1_003a-part-1">
+<div class="part-level-extent" id="part-1_003a-part-1">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -65,12 +65,12 @@ ul.toc-numbered-mark {list-style: none}
 <h1 class="part">part 1: part 1</h1>
 <hr>
 
-<div class="chapter" id="chapter-1-node">
+<div class="chapter-level-extent" id="chapter-1-node">
 <h1 class="chapter" id="chapter-1">1 chapter 1</h1>
 
 <hr>
 </div>
-<div class="chapter" id="chapter-2-node">
+<div class="chapter-level-extent" id="chapter-2-node">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter-1-node" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter-1-node" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -91,7 +91,7 @@ ul.toc-numbered-mark {list-style: none}
 <hr>
 </div>
 </div>
-<div class="part" id="part2_003a-part2">
+<div class="part-level-extent" id="part2_003a-part2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter-2-node" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter-2-node" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -110,7 +110,7 @@ ul.toc-numbered-mark {list-style: none}
 <h1 class="part">part2: part2</h1>
 <hr>
 
-<div class="chapter" id="chapter-3-node">
+<div class="chapter-level-extent" id="chapter-3-node">
 <h1 class="chapter" id="chapter-3">3 chapter 3</h1>
 
 
diff --git 
a/tp/tests/contents/res_parser/contents_at_begin/contents_at_begin.html 
b/tp/tests/contents/res_parser/contents_at_begin/contents_at_begin.html
index d15fe9c5ea..b2523bfeb8 100644
--- a/tp/tests/contents/res_parser/contents_at_begin/contents_at_begin.html
+++ b/tp/tests/contents/res_parser/contents_at_begin/contents_at_begin.html
@@ -25,7 +25,7 @@ ul.toc-numbered-mark {list-style: none}
 <body lang="en">
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -44,7 +44,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/contents/res_parser/contents_at_begin_inline/contents_at_begin.html 
b/tp/tests/contents/res_parser/contents_at_begin_inline/contents_at_begin.html
index 8cec7ef668..3c3262cda5 100644
--- 
a/tp/tests/contents/res_parser/contents_at_begin_inline/contents_at_begin.html
+++ 
b/tp/tests/contents/res_parser/contents_at_begin_inline/contents_at_begin.html
@@ -35,7 +35,7 @@ ul.toc-numbered-mark {list-style: none}
 </div>
 </div>
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -54,7 +54,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
diff --git a/tp/tests/contents/res_parser/contents_at_end/contents_at_end.html 
b/tp/tests/contents/res_parser/contents_at_end/contents_at_end.html
index 04c7388a03..b097fa8156 100644
--- a/tp/tests/contents/res_parser/contents_at_end/contents_at_end.html
+++ b/tp/tests/contents/res_parser/contents_at_end/contents_at_end.html
@@ -25,7 +25,7 @@ ul.toc-numbered-mark {list-style: none}
 <body lang="en">
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -44,7 +44,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/contents/res_parser/contents_at_end_inline/contents_at_end.html 
b/tp/tests/contents/res_parser/contents_at_end_inline/contents_at_end.html
index d1013f5151..f7bd7c342d 100644
--- a/tp/tests/contents/res_parser/contents_at_end_inline/contents_at_end.html
+++ b/tp/tests/contents/res_parser/contents_at_end_inline/contents_at_end.html
@@ -25,7 +25,7 @@ ul.toc-numbered-mark {list-style: none}
 <body lang="en">
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -44,7 +44,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/contents/res_parser/contents_in_middle_chapter/contents_in_middle_chapter.html
 
b/tp/tests/contents/res_parser/contents_in_middle_chapter/contents_in_middle_chapter.html
index 47f688fc22..19dac3c41b 100644
--- 
a/tp/tests/contents/res_parser/contents_in_middle_chapter/contents_in_middle_chapter.html
+++ 
b/tp/tests/contents/res_parser/contents_in_middle_chapter/contents_in_middle_chapter.html
@@ -25,7 +25,7 @@ ul.toc-numbered-mark {list-style: none}
 <body lang="en">
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -44,7 +44,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -70,7 +70,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr>
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/contents/res_parser/contents_in_middle_chapter_inline/contents_in_middle_chapter.html
 
b/tp/tests/contents/res_parser/contents_in_middle_chapter_inline/contents_in_middle_chapter.html
index 1e9668cfd5..db5e556b41 100644
--- 
a/tp/tests/contents/res_parser/contents_in_middle_chapter_inline/contents_in_middle_chapter.html
+++ 
b/tp/tests/contents/res_parser/contents_in_middle_chapter_inline/contents_in_middle_chapter.html
@@ -25,7 +25,7 @@ ul.toc-numbered-mark {list-style: none}
 <body lang="en">
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -44,7 +44,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -83,7 +83,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr>
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/contents/res_parser/contents_in_middle_section/contents_in_middle_section.html
 
b/tp/tests/contents/res_parser/contents_in_middle_section/contents_in_middle_section.html
index e5b62de87c..3afa4f970a 100644
--- 
a/tp/tests/contents/res_parser/contents_in_middle_section/contents_in_middle_section.html
+++ 
b/tp/tests/contents/res_parser/contents_in_middle_section/contents_in_middle_section.html
@@ -25,7 +25,7 @@ ul.toc-numbered-mark {list-style: none}
 <body lang="en">
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -44,7 +44,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -71,7 +71,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr>
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section 
in reading order"> &lt; </a>]</td>
@@ -93,7 +93,7 @@ ul.toc-numbered-mark {list-style: none}
 </p>
 <hr>
 </div>
-<div class="section" id="section1">
+<div class="section-level-extent" id="section1">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#section" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/contents/res_parser/contents_in_middle_section_inline/contents_in_middle_section.html
 
b/tp/tests/contents/res_parser/contents_in_middle_section_inline/contents_in_middle_section.html
index a227cd8fc7..60d58759ab 100644
--- 
a/tp/tests/contents/res_parser/contents_in_middle_section_inline/contents_in_middle_section.html
+++ 
b/tp/tests/contents/res_parser/contents_in_middle_section_inline/contents_in_middle_section.html
@@ -25,7 +25,7 @@ ul.toc-numbered-mark {list-style: none}
 <body lang="en">
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -44,7 +44,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -71,7 +71,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr>
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section 
in reading order"> &lt; </a>]</td>
@@ -107,7 +107,7 @@ ul.toc-numbered-mark {list-style: none}
 
 <hr>
 </div>
-<div class="section" id="section1">
+<div class="section-level-extent" id="section1">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#section" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git a/tp/tests/contents/res_parser/double_contents/double_contents.html 
b/tp/tests/contents/res_parser/double_contents/double_contents.html
index 6856a306d7..0fd3068a16 100644
--- a/tp/tests/contents/res_parser/double_contents/double_contents.html
+++ b/tp/tests/contents/res_parser/double_contents/double_contents.html
@@ -25,7 +25,7 @@ ul.toc-numbered-mark {list-style: none}
 <body lang="en">
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -44,7 +44,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -70,7 +70,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr>
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/contents/res_parser/double_contents_after_title/double_contents.html 
b/tp/tests/contents/res_parser/double_contents_after_title/double_contents.html
index cd926c6758..31942ce393 100644
--- 
a/tp/tests/contents/res_parser/double_contents_after_title/double_contents.html
+++ 
b/tp/tests/contents/res_parser/double_contents_after_title/double_contents.html
@@ -39,7 +39,7 @@ ul.toc-numbered-mark {list-style: none}
 <hr>
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -58,7 +58,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -84,7 +84,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr>
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/contents/res_parser/double_contents_after_title_book/double_contents.html
 
b/tp/tests/contents/res_parser/double_contents_after_title_book/double_contents.html
index cd926c6758..31942ce393 100644
--- 
a/tp/tests/contents/res_parser/double_contents_after_title_book/double_contents.html
+++ 
b/tp/tests/contents/res_parser/double_contents_after_title_book/double_contents.html
@@ -39,7 +39,7 @@ ul.toc-numbered-mark {list-style: none}
 <hr>
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -58,7 +58,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -84,7 +84,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr>
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/contents/res_parser/double_contents_after_title_book_chapter/chapter.html
 
b/tp/tests/contents/res_parser/double_contents_after_title_book_chapter/chapter.html
index adf79dd2c5..72da871ab4 100644
--- 
a/tp/tests/contents/res_parser/double_contents_after_title_book_chapter/chapter.html
+++ 
b/tp/tests/contents/res_parser/double_contents_after_title_book_chapter/chapter.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
@@ -48,7 +48,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr>
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/contents/res_parser/double_contents_after_title_book_chapter/index.html
 
b/tp/tests/contents/res_parser/double_contents_after_title_book_chapter/index.html
index fcc696b2d1..54b26b4168 100644
--- 
a/tp/tests/contents/res_parser/double_contents_after_title_book_chapter/index.html
+++ 
b/tp/tests/contents/res_parser/double_contents_after_title_book_chapter/index.html
@@ -39,7 +39,7 @@ ul.toc-numbered-mark {list-style: none}
 <hr>
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next 
section in reading order"> &gt; </a>]</td>
diff --git 
a/tp/tests/contents/res_parser/double_contents_after_title_no_texi2html/chapter.html
 
b/tp/tests/contents/res_parser/double_contents_after_title_no_texi2html/chapter.html
index ad46a0adc9..57a7f36214 100644
--- 
a/tp/tests/contents/res_parser/double_contents_after_title_no_texi2html/chapter.html
+++ 
b/tp/tests/contents/res_parser/double_contents_after_title_no_texi2html/chapter.html
@@ -25,7 +25,7 @@
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
 Previous: <a href="index.html" accesskey="p" rel="prev">Double contents</a>, 
Up: <a href="index.html" accesskey="u" rel="up">Double contents</a> &nbsp; [<a 
href="index.html#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
diff --git 
a/tp/tests/contents/res_parser/double_contents_after_title_no_texi2html/index.html
 
b/tp/tests/contents/res_parser/double_contents_after_title_no_texi2html/index.html
index d40aeb6f99..5e9d599c6d 100644
--- 
a/tp/tests/contents/res_parser/double_contents_after_title_no_texi2html/index.html
+++ 
b/tp/tests/contents/res_parser/double_contents_after_title_no_texi2html/index.html
@@ -41,7 +41,7 @@ ul.toc-numbered-mark {list-style: none}
 <hr>
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="chapter.html" accesskey="n" rel="next">Chapter 1</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
diff --git 
a/tp/tests/contents/res_parser/double_contents_after_title_no_texi2html/section.html
 
b/tp/tests/contents/res_parser/double_contents_after_title_no_texi2html/section.html
index 172e51c978..7ee4bcb4f1 100644
--- 
a/tp/tests/contents/res_parser/double_contents_after_title_no_texi2html/section.html
+++ 
b/tp/tests/contents/res_parser/double_contents_after_title_no_texi2html/section.html
@@ -24,7 +24,7 @@
 </head>
 
 <body lang="en">
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <div class="nav-header">
 <p>
 Up: <a href="chapter.html" accesskey="u" rel="up">Chapter 1</a> &nbsp; [<a 
href="index.html#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
diff --git a/tp/tests/contents/res_parser/double_contents_chapter/chapter.html 
b/tp/tests/contents/res_parser/double_contents_chapter/chapter.html
index e40db50b79..d0a5f18ede 100644
--- a/tp/tests/contents/res_parser/double_contents_chapter/chapter.html
+++ b/tp/tests/contents/res_parser/double_contents_chapter/chapter.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
@@ -48,7 +48,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr>
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git a/tp/tests/contents/res_parser/double_contents_chapter/index.html 
b/tp/tests/contents/res_parser/double_contents_chapter/index.html
index 868e16b8e4..6e3385f062 100644
--- a/tp/tests/contents/res_parser/double_contents_chapter/index.html
+++ b/tp/tests/contents/res_parser/double_contents_chapter/index.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
 <body lang="en">
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next 
section in reading order"> &gt; </a>]</td>
diff --git 
a/tp/tests/contents/res_parser/double_contents_inline/double_contents.html 
b/tp/tests/contents/res_parser/double_contents_inline/double_contents.html
index 3cdc86087a..0a4dbd6370 100644
--- a/tp/tests/contents/res_parser/double_contents_inline/double_contents.html
+++ b/tp/tests/contents/res_parser/double_contents_inline/double_contents.html
@@ -38,7 +38,7 @@ ul.toc-numbered-mark {list-style: none}
 </div>
 </div>
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -57,7 +57,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -96,7 +96,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr>
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/contents/res_parser/double_contents_inline_chapter/chapter.html 
b/tp/tests/contents/res_parser/double_contents_inline_chapter/chapter.html
index 1deccbe8ea..1e4f117ae5 100644
--- a/tp/tests/contents/res_parser/double_contents_inline_chapter/chapter.html
+++ b/tp/tests/contents/res_parser/double_contents_inline_chapter/chapter.html
@@ -23,7 +23,7 @@ ul.toc-numbered-mark {list-style: none}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
@@ -62,7 +62,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr>
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/contents/res_parser/double_contents_inline_chapter/index.html 
b/tp/tests/contents/res_parser/double_contents_inline_chapter/index.html
index 5d17e8ea51..b3bcec7729 100644
--- a/tp/tests/contents/res_parser/double_contents_inline_chapter/index.html
+++ b/tp/tests/contents/res_parser/double_contents_inline_chapter/index.html
@@ -38,7 +38,7 @@ ul.toc-numbered-mark {list-style: none}
 </div>
 </div>
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next 
section in reading order"> &gt; </a>]</td>
diff --git 
a/tp/tests/contents/res_parser/double_contents_inline_nodes/chapter.html 
b/tp/tests/contents/res_parser/double_contents_inline_nodes/chapter.html
index 2f7bd9e6b3..2d42a45e94 100644
--- a/tp/tests/contents/res_parser/double_contents_inline_nodes/chapter.html
+++ b/tp/tests/contents/res_parser/double_contents_inline_nodes/chapter.html
@@ -23,7 +23,7 @@ ul.toc-numbered-mark {list-style: none}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/contents/res_parser/double_contents_inline_nodes/index.html 
b/tp/tests/contents/res_parser/double_contents_inline_nodes/index.html
index bb25305eb9..83d2968b18 100644
--- a/tp/tests/contents/res_parser/double_contents_inline_nodes/index.html
+++ b/tp/tests/contents/res_parser/double_contents_inline_nodes/index.html
@@ -38,7 +38,7 @@ ul.toc-numbered-mark {list-style: none}
 </div>
 </div>
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="chapter.html" title="Next section 
in reading order"> &gt; </a>]</td>
diff --git 
a/tp/tests/contents/res_parser/double_contents_inline_nodes/section.html 
b/tp/tests/contents/res_parser/double_contents_inline_nodes/section.html
index 870a5b66b5..d7b6f23de1 100644
--- a/tp/tests/contents/res_parser/double_contents_inline_nodes/section.html
+++ b/tp/tests/contents/res_parser/double_contents_inline_nodes/section.html
@@ -23,7 +23,7 @@ ul.toc-numbered-mark {list-style: none}
 </head>
 
 <body lang="en">
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="chapter.html" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/contents/res_parser/double_contents_inline_section/chapter.html 
b/tp/tests/contents/res_parser/double_contents_inline_section/chapter.html
index e0a1231012..9da645c6db 100644
--- a/tp/tests/contents/res_parser/double_contents_inline_section/chapter.html
+++ b/tp/tests/contents/res_parser/double_contents_inline_section/chapter.html
@@ -23,7 +23,7 @@ ul.toc-numbered-mark {list-style: none}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/contents/res_parser/double_contents_inline_section/index.html 
b/tp/tests/contents/res_parser/double_contents_inline_section/index.html
index fa32cc8b23..63aba7191b 100644
--- a/tp/tests/contents/res_parser/double_contents_inline_section/index.html
+++ b/tp/tests/contents/res_parser/double_contents_inline_section/index.html
@@ -38,7 +38,7 @@ ul.toc-numbered-mark {list-style: none}
 </div>
 </div>
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="chapter.html" title="Next section 
in reading order"> &gt; </a>]</td>
diff --git 
a/tp/tests/contents/res_parser/double_contents_inline_section/section.html 
b/tp/tests/contents/res_parser/double_contents_inline_section/section.html
index 8aaeeba202..a4f6ac1927 100644
--- a/tp/tests/contents/res_parser/double_contents_inline_section/section.html
+++ b/tp/tests/contents/res_parser/double_contents_inline_section/section.html
@@ -23,7 +23,7 @@ ul.toc-numbered-mark {list-style: none}
 </head>
 
 <body lang="en">
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="chapter.html" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git a/tp/tests/contents/res_parser/double_contents_nodes/chapter.html 
b/tp/tests/contents/res_parser/double_contents_nodes/chapter.html
index 0cfa8bbf3c..ae70c9af9b 100644
--- a/tp/tests/contents/res_parser/double_contents_nodes/chapter.html
+++ b/tp/tests/contents/res_parser/double_contents_nodes/chapter.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git a/tp/tests/contents/res_parser/double_contents_nodes/index.html 
b/tp/tests/contents/res_parser/double_contents_nodes/index.html
index e3e0309e33..ac05df910d 100644
--- a/tp/tests/contents/res_parser/double_contents_nodes/index.html
+++ b/tp/tests/contents/res_parser/double_contents_nodes/index.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
 <body lang="en">
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="chapter.html" title="Next section 
in reading order"> &gt; </a>]</td>
diff --git a/tp/tests/contents/res_parser/double_contents_nodes/section.html 
b/tp/tests/contents/res_parser/double_contents_nodes/section.html
index 68ec3061c7..b9c03ae0b6 100644
--- a/tp/tests/contents/res_parser/double_contents_nodes/section.html
+++ b/tp/tests/contents/res_parser/double_contents_nodes/section.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="chapter.html" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git a/tp/tests/contents/res_parser/double_contents_section/chapter.html 
b/tp/tests/contents/res_parser/double_contents_section/chapter.html
index 2892adfaa5..5d9497e766 100644
--- a/tp/tests/contents/res_parser/double_contents_section/chapter.html
+++ b/tp/tests/contents/res_parser/double_contents_section/chapter.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git a/tp/tests/contents/res_parser/double_contents_section/index.html 
b/tp/tests/contents/res_parser/double_contents_section/index.html
index 34d241e702..1ae6a68401 100644
--- a/tp/tests/contents/res_parser/double_contents_section/index.html
+++ b/tp/tests/contents/res_parser/double_contents_section/index.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
 <body lang="en">
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="chapter.html" title="Next section 
in reading order"> &gt; </a>]</td>
diff --git a/tp/tests/contents/res_parser/double_contents_section/section.html 
b/tp/tests/contents/res_parser/double_contents_section/section.html
index 39fdf02af3..a0bd4482d6 100644
--- a/tp/tests/contents/res_parser/double_contents_section/section.html
+++ b/tp/tests/contents/res_parser/double_contents_section/section.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="chapter.html" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git a/tp/tests/contents/res_parser/no_content/no_content.html 
b/tp/tests/contents/res_parser/no_content/no_content.html
index 07adf82762..5f639b1beb 100644
--- a/tp/tests/contents/res_parser/no_content/no_content.html
+++ b/tp/tests/contents/res_parser/no_content/no_content.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -42,7 +42,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/contents/res_parser/no_content_do_contents/no_content.html 
b/tp/tests/contents/res_parser/no_content_do_contents/no_content.html
index 20bff94046..05a53eae6d 100644
--- a/tp/tests/contents/res_parser/no_content_do_contents/no_content.html
+++ b/tp/tests/contents/res_parser/no_content_do_contents/no_content.html
@@ -24,7 +24,7 @@ ul.toc-numbered-mark {list-style: none}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -43,7 +43,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/contents/res_parser/no_content_do_contents_inline/no_content.html 
b/tp/tests/contents/res_parser/no_content_do_contents_inline/no_content.html
index 07adf82762..5f639b1beb 100644
--- a/tp/tests/contents/res_parser/no_content_do_contents_inline/no_content.html
+++ b/tp/tests/contents/res_parser/no_content_do_contents_inline/no_content.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -42,7 +42,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
diff --git a/tp/tests/contents/res_parser/no_content_inline/no_content.html 
b/tp/tests/contents/res_parser/no_content_inline/no_content.html
index 07adf82762..5f639b1beb 100644
--- a/tp/tests/contents/res_parser/no_content_inline/no_content.html
+++ b/tp/tests/contents/res_parser/no_content_inline/no_content.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -42,7 +42,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/contents/res_parser/no_content_setcatpage/no_content_setcatpage.html 
b/tp/tests/contents/res_parser/no_content_setcatpage/no_content_setcatpage.html
index 07adf82762..5f639b1beb 100644
--- 
a/tp/tests/contents/res_parser/no_content_setcatpage/no_content_setcatpage.html
+++ 
b/tp/tests/contents/res_parser/no_content_setcatpage/no_content_setcatpage.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -42,7 +42,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/contents/res_parser/no_content_setcatpage_do_contents/no_content_setcatpage.html
 
b/tp/tests/contents/res_parser/no_content_setcatpage_do_contents/no_content_setcatpage.html
index 20bff94046..05a53eae6d 100644
--- 
a/tp/tests/contents/res_parser/no_content_setcatpage_do_contents/no_content_setcatpage.html
+++ 
b/tp/tests/contents/res_parser/no_content_setcatpage_do_contents/no_content_setcatpage.html
@@ -24,7 +24,7 @@ ul.toc-numbered-mark {list-style: none}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -43,7 +43,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/contents/res_parser/no_content_setcatpage_do_contents_inline/no_content_setcatpage.html
 
b/tp/tests/contents/res_parser/no_content_setcatpage_do_contents_inline/no_content_setcatpage.html
index 07adf82762..5f639b1beb 100644
--- 
a/tp/tests/contents/res_parser/no_content_setcatpage_do_contents_inline/no_content_setcatpage.html
+++ 
b/tp/tests/contents/res_parser/no_content_setcatpage_do_contents_inline/no_content_setcatpage.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -42,7 +42,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/contents/res_parser/no_content_setcatpage_inline/no_content_setcatpage.html
 
b/tp/tests/contents/res_parser/no_content_setcatpage_inline/no_content_setcatpage.html
index 07adf82762..5f639b1beb 100644
--- 
a/tp/tests/contents/res_parser/no_content_setcatpage_inline/no_content_setcatpage.html
+++ 
b/tp/tests/contents/res_parser/no_content_setcatpage_inline/no_content_setcatpage.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -42,7 +42,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/formatting/res_parser/documentlanguage_cmdline/documentlanguage.html 
b/tp/tests/formatting/res_parser/documentlanguage_cmdline/documentlanguage.html
index 99418fb85f..9abdfee7d9 100644
--- 
a/tp/tests/formatting/res_parser/documentlanguage_cmdline/documentlanguage.html
+++ 
b/tp/tests/formatting/res_parser/documentlanguage_cmdline/documentlanguage.html
@@ -27,7 +27,7 @@ span:hover a.copiable-anchor {visibility: visible}
 <body lang="fr">
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Section suivante 
dans l&rsquo;ordre de lecture"> &gt; </a>]</td>
@@ -39,7 +39,7 @@ span:hover a.copiable-anchor {visibility: visible}
 <h1 class="top" id="top-section">top section</h1>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="D&eacute;but de ce 
chapitre ou chapitre pr&eacute;c&eacute;dent"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Section 
pr&eacute;c&eacute;dente dans l&rsquo;ordre de lecture"> &lt; </a>]</td>
diff --git a/tp/tests/formatting/res_parser/simplest_test_css/simplest.html 
b/tp/tests/formatting/res_parser/simplest_test_css/simplest.html
index f3cb8a90c0..f99feb88e4 100644
--- a/tp/tests/formatting/res_parser/simplest_test_css/simplest.html
+++ b/tp/tests/formatting/res_parser/simplest_test_css/simplest.html
@@ -35,7 +35,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#Chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -47,7 +47,7 @@ span.program-in-footer {font-size: smaller}
 <h1 class="top" id="top-section">top section</h1>
 
 <hr style="height: 6px;">
-<div class="chapter" id="Chapter">
+<div class="chapter-level-extent" id="Chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
diff --git a/tp/tests/formatting/res_parser/test_redefine_need/test_need.html 
b/tp/tests/formatting/res_parser/test_redefine_need/test_need.html
index ac43e89b70..1f5bf339ce 100644
--- a/tp/tests/formatting/res_parser/test_redefine_need/test_need.html
+++ b/tp/tests/formatting/res_parser/test_redefine_need/test_need.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="Test-need">Test need</h1>
 
 <p>@need <!-- need: 0.1 on line following -->
diff --git 
a/tp/tests/indices/res_parser/index_and_node_same_name/index_and_node_same_name.html
 
b/tp/tests/indices/res_parser/index_and_node_same_name/index_and_node_same_name.html
index a8f22698b6..da79224e7f 100644
--- 
a/tp/tests/indices/res_parser/index_and_node_same_name/index_and_node_same_name.html
+++ 
b/tp/tests/indices/res_parser/index_and_node_same_name/index_and_node_same_name.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#index-node" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -45,7 +45,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="index-node">
+<div class="chapter-level-extent" id="index-node">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/indices/res_parser/index_entry_in_footnote/index_entry_in_footnote.html
 
b/tp/tests/indices/res_parser/index_entry_in_footnote/index_entry_in_footnote.html
index 4c8f7373ad..9e391fb81a 100644
--- 
a/tp/tests/indices/res_parser/index_entry_in_footnote/index_entry_in_footnote.html
+++ 
b/tp/tests/indices/res_parser/index_entry_in_footnote/index_entry_in_footnote.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#Index" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -43,7 +43,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr style="height: 6px;">
-<div class="appendix" id="Index">
+<div class="appendix-level-extent" id="Index">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/indices/res_parser/index_no_node_no_top/index_no_node_no_top.html 
b/tp/tests/indices/res_parser/index_no_node_no_top/index_no_node_no_top.html
index 58f9358a18..980962fe57 100644
--- a/tp/tests/indices/res_parser/index_no_node_no_top/index_no_node_no_top.html
+++ b/tp/tests/indices/res_parser/index_no_node_no_top/index_no_node_no_top.html
@@ -74,7 +74,7 @@ span.program-in-footer {font-size: smaller}
 </div>
 
 
-<div class="unnumbered" id="unnumbered">
+<div class="unnumbered-level-extent" id="unnumbered">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[ &lt; ]</td>
@@ -145,7 +145,7 @@ span.program-in-footer {font-size: smaller}
 
 <hr>
 </div>
-<div class="unnumbered" id="top-_0028chapter_0029-section">
+<div class="unnumbered-level-extent" id="top-_0028chapter_0029-section">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#unnumbered" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#unnumbered" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -222,7 +222,7 @@ span.program-in-footer {font-size: smaller}
 
 
 <hr>
-<div class="section" id="second">
+<div class="section-level-extent" id="second">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#top-_0028chapter_0029-section" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#top-_0028chapter_0029-section" 
title="Previous section in reading order"> &lt; </a>]</td>
@@ -339,7 +339,7 @@ span.program-in-footer {font-size: smaller}
 <hr>
 </div>
 </div>
-<div class="chapter" id="Chapter">
+<div class="chapter-level-extent" id="Chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#top-_0028chapter_0029-section" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#second" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -409,7 +409,7 @@ span.program-in-footer {font-size: smaller}
 </p>
 <hr>
 </div>
-<div class="chapter" id="Chapter-2">
+<div class="chapter-level-extent" id="Chapter-2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Chapter" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git a/tp/tests/indices/res_parser/index_nodes_nodes/a-node.html 
b/tp/tests/indices/res_parser/index_nodes_nodes/a-node.html
index 8f82b9590b..a86a916510 100644
--- a/tp/tests/indices/res_parser/index_nodes_nodes/a-node.html
+++ b/tp/tests/indices/res_parser/index_nodes_nodes/a-node.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<a class="node" id="a-node"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="a-node"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[<a href="another.html" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="second.html" title="Up section"> Up 
</a>]</td>
@@ -39,7 +39,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a href="index_nodes_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<h3 class="node-heading">a node</h3>
+<h3 class="node">a node</h3>
 <a class="index-entry-id" id="index-entry-after-printindex"></a>
 
 <div class="printindex cp-printindex">
diff --git a/tp/tests/indices/res_parser/index_nodes_nodes/another.html 
b/tp/tests/indices/res_parser/index_nodes_nodes/another.html
index 8578e17411..daf7c2604e 100644
--- a/tp/tests/indices/res_parser/index_nodes_nodes/another.html
+++ b/tp/tests/indices/res_parser/index_nodes_nodes/another.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<a class="node" id="another"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="another"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[<a href="second.html" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="second.html" title="Up section"> Up 
</a>]</td>
@@ -38,7 +38,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a href="index_nodes_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<h3 class="node-heading">another</h3>
+<h3 class="node">another</h3>
 
 <a class="index-entry-id" id="index-something"></a>
 <a class="index-entry-id" id="index-somewhere"></a>
diff --git a/tp/tests/indices/res_parser/index_nodes_nodes/first.html 
b/tp/tests/indices/res_parser/index_nodes_nodes/first.html
index edf1578235..a529e60e62 100644
--- a/tp/tests/indices/res_parser/index_nodes_nodes/first.html
+++ b/tp/tests/indices/res_parser/index_nodes_nodes/first.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<a class="node" id="first"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="first"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Up section"> Up 
</a>]</td>
@@ -39,7 +39,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a href="index_nodes_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<h3 class="node-heading">first</h3>
+<h3 class="node">first</h3>
 <p>Text and then index entries
 <a class="index-entry-id" id="index-entry-in-node"></a>
 <a class="index-entry-id" id="index-_0021-entry-in-node"></a>
diff --git a/tp/tests/indices/res_parser/index_nodes_nodes/index.html 
b/tp/tests/indices/res_parser/index_nodes_nodes/index.html
index b18c599cf5..98e0c2bf24 100644
--- a/tp/tests/indices/res_parser/index_nodes_nodes/index.html
+++ b/tp/tests/indices/res_parser/index_nodes_nodes/index.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<a class="node" id="Top"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="Top"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="first.html" title="Next section in 
reading order"> &gt; </a>]</td>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -33,7 +33,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a href="index_nodes_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<h1 class="node-heading">Top</h1>
+<h1 class="node">Top</h1>
 <a class="index-entry-id" id="index-entry-a"></a>
 
 <div class="printindex cp-printindex">
diff --git a/tp/tests/indices/res_parser/index_nodes_nodes/second.html 
b/tp/tests/indices/res_parser/index_nodes_nodes/second.html
index eafaad9632..25428c66e9 100644
--- a/tp/tests/indices/res_parser/index_nodes_nodes/second.html
+++ b/tp/tests/indices/res_parser/index_nodes_nodes/second.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<a class="node" id="second"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="second"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[<a href="first.html" title="Previous section 
in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="first.html" title="Up section"> Up 
</a>]</td>
@@ -39,7 +39,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a href="index_nodes_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<h3 class="node-heading">second</h3>
+<h3 class="node">second</h3>
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a href="a-node.html" rel="index">a 
node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
diff --git a/tp/tests/indices/res_parser/index_special_region/Chapter.html 
b/tp/tests/indices/res_parser/index_special_region/Chapter.html
index 10cadc88c4..8fd80b6c48 100644
--- a/tp/tests/indices/res_parser/index_special_region/Chapter.html
+++ b/tp/tests/indices/res_parser/index_special_region/Chapter.html
@@ -31,7 +31,7 @@ span:hover a.copiable-anchor {visibility: visible}
 </head>
 
 <body lang="en">
-<div class="chapter" id="Chapter">
+<div class="chapter-level-extent" id="Chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/indices/res_parser/index_special_region/Copying-and-indices.html 
b/tp/tests/indices/res_parser/index_special_region/Copying-and-indices.html
index 491886dd22..35ffdd2b1d 100644
--- a/tp/tests/indices/res_parser/index_special_region/Copying-and-indices.html
+++ b/tp/tests/indices/res_parser/index_special_region/Copying-and-indices.html
@@ -29,7 +29,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="appendix" id="Copying-and-indices">
+<div class="appendix-level-extent" id="Copying-and-indices">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="Chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="Chapter.html" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git a/tp/tests/indices/res_parser/index_special_region/index.html 
b/tp/tests/indices/res_parser/index_special_region/index.html
index 865f74f0f7..9910a03800 100644
--- a/tp/tests/indices/res_parser/index_special_region/index.html
+++ b/tp/tests/indices/res_parser/index_special_region/index.html
@@ -31,7 +31,7 @@ span.program-in-footer {font-size: smaller}
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="Chapter.html" title="Next section 
in reading order"> &gt; </a>]</td>
diff --git a/tp/tests/indices/res_parser/index_special_region_html/Chapter.html 
b/tp/tests/indices/res_parser/index_special_region_html/Chapter.html
index 47f1e0f2fa..2f4e9c5dd8 100644
--- a/tp/tests/indices/res_parser/index_special_region_html/Chapter.html
+++ b/tp/tests/indices/res_parser/index_special_region_html/Chapter.html
@@ -31,7 +31,7 @@ span:hover a.copiable-anchor {visibility: visible}
 </head>
 
 <body lang="en">
-<div class="chapter" id="Chapter">
+<div class="chapter-level-extent" id="Chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/indices/res_parser/index_special_region_html/Copying-and-indices.html
 
b/tp/tests/indices/res_parser/index_special_region_html/Copying-and-indices.html
index ee27a66e60..e20a81d81e 100644
--- 
a/tp/tests/indices/res_parser/index_special_region_html/Copying-and-indices.html
+++ 
b/tp/tests/indices/res_parser/index_special_region_html/Copying-and-indices.html
@@ -29,7 +29,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="appendix" id="Copying-and-indices">
+<div class="appendix-level-extent" id="Copying-and-indices">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="Chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="Chapter.html" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git a/tp/tests/indices/res_parser/index_special_region_html/index.html 
b/tp/tests/indices/res_parser/index_special_region_html/index.html
index 2f2d878426..4cba4bbde0 100644
--- a/tp/tests/indices/res_parser/index_special_region_html/index.html
+++ b/tp/tests/indices/res_parser/index_special_region_html/index.html
@@ -76,7 +76,7 @@ domain<a class="footnote" id="DOCF1" 
href="index_special_region_fot.html#FOOT1">
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="Chapter.html" title="Next section 
in reading order"> &gt; </a>]</td>
diff --git 
a/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Chapter.html
 
b/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Chapter.html
index cdb913f413..5672b484aa 100644
--- 
a/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Chapter.html
+++ 
b/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Chapter.html
@@ -30,7 +30,7 @@ span:hover a.copiable-anchor {visibility: visible}
 </head>
 
 <body lang="en">
-<div class="chapter" id="Chapter">
+<div class="chapter-level-extent" id="Chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Copying-and-indices.html
 
b/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Copying-and-indices.html
index f22dc1b654..9043a23d0e 100644
--- 
a/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Copying-and-indices.html
+++ 
b/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Copying-and-indices.html
@@ -29,7 +29,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="appendix" id="Copying-and-indices">
+<div class="appendix-level-extent" id="Copying-and-indices">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="Chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="Chapter.html" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/indices/res_parser/index_special_region_no_insertcopying/index.html 
b/tp/tests/indices/res_parser/index_special_region_no_insertcopying/index.html
index b55a2f79ef..dac05175c9 100644
--- 
a/tp/tests/indices/res_parser/index_special_region_no_insertcopying/index.html
+++ 
b/tp/tests/indices/res_parser/index_special_region_no_insertcopying/index.html
@@ -31,7 +31,7 @@ span.program-in-footer {font-size: smaller}
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="Chapter.html" title="Next section 
in reading order"> &gt; </a>]</td>
diff --git 
a/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Chapter.html
 
b/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Chapter.html
index 420ec1fd19..5f72a5cb5b 100644
--- 
a/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Chapter.html
+++ 
b/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Chapter.html
@@ -30,7 +30,7 @@ span:hover a.copiable-anchor {visibility: visible}
 </head>
 
 <body lang="en">
-<div class="chapter" id="Chapter">
+<div class="chapter-level-extent" id="Chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Copying-and-indices.html
 
b/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Copying-and-indices.html
index f0ffe54413..027cb8f838 100644
--- 
a/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Copying-and-indices.html
+++ 
b/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Copying-and-indices.html
@@ -29,7 +29,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="appendix" id="Copying-and-indices">
+<div class="appendix-level-extent" id="Copying-and-indices">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="Chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="Chapter.html" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index.html
 
b/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index.html
index 58fd7af1ce..2bf7c4dd0c 100644
--- 
a/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index.html
+++ 
b/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index.html
@@ -76,7 +76,7 @@ domain<a class="footnote" id="DOCF1" 
href="index_special_region_no_insertcopying
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="Chapter.html" title="Next section 
in reading order"> &gt; </a>]</td>
diff --git 
a/tp/tests/indices/res_parser/index_special_region_no_region/Chapter.html 
b/tp/tests/indices/res_parser/index_special_region_no_region/Chapter.html
index 7c4c493eb3..5ecc94a80e 100644
--- a/tp/tests/indices/res_parser/index_special_region_no_region/Chapter.html
+++ b/tp/tests/indices/res_parser/index_special_region_no_region/Chapter.html
@@ -30,7 +30,7 @@ span:hover a.copiable-anchor {visibility: visible}
 </head>
 
 <body lang="en">
-<div class="chapter" id="Chapter">
+<div class="chapter-level-extent" id="Chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/indices/res_parser/index_special_region_no_region/Copying-and-indices.html
 
b/tp/tests/indices/res_parser/index_special_region_no_region/Copying-and-indices.html
index d6a1277603..377c8f7523 100644
--- 
a/tp/tests/indices/res_parser/index_special_region_no_region/Copying-and-indices.html
+++ 
b/tp/tests/indices/res_parser/index_special_region_no_region/Copying-and-indices.html
@@ -29,7 +29,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="appendix" id="Copying-and-indices">
+<div class="appendix-level-extent" id="Copying-and-indices">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="Chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="Chapter.html" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/indices/res_parser/index_special_region_no_region/index.html 
b/tp/tests/indices/res_parser/index_special_region_no_region/index.html
index 7cb91f7a74..b5bfaa46ab 100644
--- a/tp/tests/indices/res_parser/index_special_region_no_region/index.html
+++ b/tp/tests/indices/res_parser/index_special_region_no_region/index.html
@@ -31,7 +31,7 @@ span.program-in-footer {font-size: smaller}
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="Chapter.html" title="Next section 
in reading order"> &gt; </a>]</td>
diff --git 
a/tp/tests/indices/res_parser/index_special_region_no_region_html/Chapter.html 
b/tp/tests/indices/res_parser/index_special_region_no_region_html/Chapter.html
index 206d979802..de0a840564 100644
--- 
a/tp/tests/indices/res_parser/index_special_region_no_region_html/Chapter.html
+++ 
b/tp/tests/indices/res_parser/index_special_region_no_region_html/Chapter.html
@@ -30,7 +30,7 @@ span:hover a.copiable-anchor {visibility: visible}
 </head>
 
 <body lang="en">
-<div class="chapter" id="Chapter">
+<div class="chapter-level-extent" id="Chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/indices/res_parser/index_special_region_no_region_html/Copying-and-indices.html
 
b/tp/tests/indices/res_parser/index_special_region_no_region_html/Copying-and-indices.html
index 9afe54a699..2b1eb9c05f 100644
--- 
a/tp/tests/indices/res_parser/index_special_region_no_region_html/Copying-and-indices.html
+++ 
b/tp/tests/indices/res_parser/index_special_region_no_region_html/Copying-and-indices.html
@@ -29,7 +29,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="appendix" id="Copying-and-indices">
+<div class="appendix-level-extent" id="Copying-and-indices">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="Chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="Chapter.html" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/indices/res_parser/index_special_region_no_region_html/index.html 
b/tp/tests/indices/res_parser/index_special_region_no_region_html/index.html
index a6da9ac729..4a96aa9bc9 100644
--- a/tp/tests/indices/res_parser/index_special_region_no_region_html/index.html
+++ b/tp/tests/indices/res_parser/index_special_region_no_region_html/index.html
@@ -76,7 +76,7 @@ domain<a class="footnote" id="DOCF1" 
href="index_special_region_no_region_fot.ht
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="Chapter.html" title="Next section 
in reading order"> &gt; </a>]</td>
diff --git a/tp/tests/indices/res_parser/index_table/index.html 
b/tp/tests/indices/res_parser/index_table/index.html
index 12682abe8b..0228d5e9ae 100644
--- a/tp/tests/indices/res_parser/index_table/index.html
+++ b/tp/tests/indices/res_parser/index_table/index.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="node-with-ftable-and-vtable.html" 
title="Next section in reading order"> &gt; </a>]</td>
diff --git a/tp/tests/indices/res_parser/index_table/indices-refs.html 
b/tp/tests/indices/res_parser/index_table/indices-refs.html
index 2ea3cd932d..081d05f920 100644
--- a/tp/tests/indices/res_parser/index_table/indices-refs.html
+++ b/tp/tests/indices/res_parser/index_table/indices-refs.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="indices-refs">
+<div class="chapter-level-extent" id="indices-refs">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="node-with-printindex.html" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="node-with-printindex.html" 
title="Previous section in reading order"> &lt; </a>]</td>
@@ -500,7 +500,7 @@ span.program-in-footer {font-size: smaller}
 </div>
 
 <hr>
-<div class="section" id="node">
+<div class="section-level-extent" id="node">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#indices-refs" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#indices-refs" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/indices/res_parser/index_table/node-with-ftable-and-vtable.html 
b/tp/tests/indices/res_parser/index_table/node-with-ftable-and-vtable.html
index 9b3036bac9..6017c371ad 100644
--- a/tp/tests/indices/res_parser/index_table/node-with-ftable-and-vtable.html
+++ b/tp/tests/indices/res_parser/index_table/node-with-ftable-and-vtable.html
@@ -24,7 +24,7 @@ span:hover a.copiable-anchor {visibility: visible}
 </head>
 
 <body lang="en">
-<div class="chapter" id="node-with-ftable-and-vtable">
+<div class="chapter-level-extent" id="node-with-ftable-and-vtable">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git a/tp/tests/indices/res_parser/index_table/node-with-printindex.html 
b/tp/tests/indices/res_parser/index_table/node-with-printindex.html
index 10e3590243..6ba0fdcf58 100644
--- a/tp/tests/indices/res_parser/index_table/node-with-printindex.html
+++ b/tp/tests/indices/res_parser/index_table/node-with-printindex.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="node-with-printindex">
+<div class="chapter-level-extent" id="node-with-printindex">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a 
href="node-with-ftable-and-vtable.html" title="Beginning of this chapter or 
previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="node-with-ftable-and-vtable.html" 
title="Previous section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/indices/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.html
 
b/tp/tests/indices/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.html
index d5826790ad..da583fdb68 100644
--- 
a/tp/tests/indices/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.html
+++ 
b/tp/tests/indices/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.html
@@ -28,7 +28,7 @@ ul.mark-minus {list-style-type: "\2212"}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -40,7 +40,7 @@ ul.mark-minus {list-style-type: "\2212"}
 <h1 class="top" id="top">top</h1>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -197,7 +197,7 @@ enum
 
 <hr>
 </div>
-<div class="chapter" id="printindex">
+<div class="chapter-level-extent" id="printindex">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/chapter.html
 
b/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/chapter.html
index 882552133e..2dd3054bb6 100644
--- 
a/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/chapter.html
+++ 
b/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/chapter.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/index.html
 
b/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/index.html
index e5a13b9f0f..0846674960 100644
--- 
a/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/index.html
+++ 
b/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/index.html
@@ -261,7 +261,7 @@ span.program-in-footer {font-size: smaller}
 <a class="index-entry-id" id="index-printindex-node-in-menu-before-top"></a>
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <a class="index-entry-id" id="index-entry-a"></a>
 <p>in top node.
 </p><div class="printindex cp-printindex">
diff --git 
a/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/chapter.html
 
b/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/chapter.html
index b3341adacf..b16ca58f8c 100644
--- 
a/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/chapter.html
+++ 
b/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/chapter.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html#Top" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html#a-node" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -113,7 +113,7 @@ span.program-in-footer {font-size: smaller}
 </div>
 
 <hr>
-<a class="node" id="node-in-chapter"></a><table class="nav-header" 
cellpadding="1" cellspacing="1" border="0">
+<a class="node-id" id="node-in-chapter"></a><table class="nav-header" 
cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section 
in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> 
Up </a>]</td>
@@ -128,7 +128,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a 
href="first-before-top.html#first-before-top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a 
href="nodes_before_top_and_sections_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<h3 class="node-heading">node in chapter</h3>
+<h3 class="node">node in chapter</h3>
 
 <a class="index-entry-id" id="index-node-in-chapter"></a>
 
diff --git 
a/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/first-before-top.html
 
b/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/first-before-top.html
index 6a9407605a..5c24d64232 100644
--- 
a/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/first-before-top.html
+++ 
b/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/first-before-top.html
@@ -25,7 +25,7 @@ span.program-in-footer {font-size: smaller}
 <body lang="en">
 
 
-<a class="node" id="first-before-top"></a><table class="nav-header" 
cellpadding="1" cellspacing="1" border="0">
+<a class="node-id" id="first-before-top"></a><table class="nav-header" 
cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="../dir/index.html" title="Up 
section"> Up </a>]</td>
@@ -40,7 +40,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a href="#first-before-top" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a 
href="nodes_before_top_and_sections_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<h3 class="node-heading">first before top</h3>
+<h3 class="node">first before top</h3>
 <a class="index-entry-id" id="index-first-before-top"></a>
 
 <p>in first node before printindex
@@ -192,7 +192,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr>
-<a class="node" id="node-in-menu-before-top"></a><table class="nav-header" 
cellpadding="1" cellspacing="1" border="0">
+<a class="node-id" id="node-in-menu-before-top"></a><table class="nav-header" 
cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[<a href="#first-before-top" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#first-before-top" title="Up 
section"> Up </a>]</td>
@@ -207,7 +207,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a href="#first-before-top" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a 
href="nodes_before_top_and_sections_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<h3 class="node-heading">node in menu before top</h3>
+<h3 class="node">node in menu before top</h3>
 
 <a class="index-entry-id" id="index-node-in-menu-before-top"></a>
 <p>between node in menu before top and printindex
diff --git 
a/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/index.html
 
b/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/index.html
index b564454605..56a8853c03 100644
--- 
a/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/index.html
+++ 
b/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/index.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a 
href="first-before-top.html#node-in-menu-before-top" title="Previous section in 
reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#first" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -223,7 +223,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr style="height: 6px;">
-<a class="node" id="first"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="first"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Up section"> Up 
</a>]</td>
@@ -238,7 +238,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a 
href="first-before-top.html#first-before-top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a 
href="nodes_before_top_and_sections_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<h3 class="node-heading">first</h3>
+<h3 class="node">first</h3>
 <p>Text and then index entries
 <a class="index-entry-id" id="index-_0021-entry-in-node"></a>
 <a class="index-entry-id" id="index-fun-in-node"></a>
@@ -321,7 +321,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr>
-<a class="node" id="second"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="second"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#first" title="Previous section in 
reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#first" title="Up section"> Up 
</a>]</td>
@@ -336,7 +336,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a 
href="first-before-top.html#first-before-top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a 
href="nodes_before_top_and_sections_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<h3 class="node-heading">second</h3>
+<h3 class="node">second</h3>
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a href="#a-node" rel="index">a 
node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
@@ -375,7 +375,7 @@ span.program-in-footer {font-size: smaller}
 </div>
 
 <hr>
-<a class="node" id="another"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="another"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#second" title="Previous section in 
reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#second" title="Up section"> Up 
</a>]</td>
@@ -390,14 +390,14 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a 
href="first-before-top.html#first-before-top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a 
href="nodes_before_top_and_sections_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<h3 class="node-heading">another</h3>
+<h3 class="node">another</h3>
 
 <a class="index-entry-id" id="index-something"></a>
 <a class="index-entry-id" id="index-somewhere"></a>
 <a class="index-entry-id" id="index-another"></a>
 
 <hr>
-<a class="node" id="a-node"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
+<a class="node-id" id="a-node"></a><table class="nav-header" cellpadding="1" 
cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#another" title="Previous section 
in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#second" title="Up section"> Up 
</a>]</td>
@@ -412,7 +412,7 @@ span.program-in-footer {font-size: smaller}
 <td valign="middle" align="left">[<a 
href="first-before-top.html#first-before-top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a 
href="nodes_before_top_and_sections_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<h3 class="node-heading">a node</h3>
+<h3 class="node">a node</h3>
 <a class="index-entry-id" id="index-entry-after-printindex"></a>
 
 <div class="printindex cp-printindex">
diff --git 
a/tp/tests/indices/res_parser/printindex_between_node_section/printindex_between_node_section.html
 
b/tp/tests/indices/res_parser/printindex_between_node_section/printindex_between_node_section.html
index 21f391daf3..b81af7b54f 100644
--- 
a/tp/tests/indices/res_parser/printindex_between_node_section/printindex_between_node_section.html
+++ 
b/tp/tests/indices/res_parser/printindex_between_node_section/printindex_between_node_section.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#node-chap1" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -59,7 +59,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="node-chap1">
+<div class="chapter-level-extent" id="node-chap1">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -83,7 +83,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr>
-<div class="section" id="node-sec1">
+<div class="section-level-extent" id="node-sec1">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#node-chap1" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#node-chap1" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/indices/res_parser/printindex_between_part_chapter/printindex_between_part_chapter.html
 
b/tp/tests/indices/res_parser/printindex_between_part_chapter/printindex_between_part_chapter.html
index aedb049b72..c9405762da 100644
--- 
a/tp/tests/indices/res_parser/printindex_between_part_chapter/printindex_between_part_chapter.html
+++ 
b/tp/tests/indices/res_parser/printindex_between_part_chapter/printindex_between_part_chapter.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#node-chap1" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -62,7 +62,7 @@ span.program-in-footer {font-size: smaller}
 
 <hr style="height: 6px;">
 </div>
-<div class="part" id="Part-1">
+<div class="part-level-extent" id="Part-1">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -118,12 +118,12 @@ span.program-in-footer {font-size: smaller}
 </td></tr></table>
 </div>
 
-<div class="chapter" id="node-chap1">
+<div class="chapter-level-extent" id="node-chap1">
 <h1 class="chapter" id="chapter-1">1 chapter 1</h1>
 
 <hr>
 </div>
-<div class="chapter" id="node-chap2">
+<div class="chapter-level-extent" id="node-chap2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#node-chap1" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#node-chap1" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/indices/res_parser_info/index_special_region_html/Copying-and-indices.html
 
b/tp/tests/indices/res_parser_info/index_special_region_html/Copying-and-indices.html
index 494481791a..826cddfe9e 100644
--- 
a/tp/tests/indices/res_parser_info/index_special_region_html/Copying-and-indices.html
+++ 
b/tp/tests/indices/res_parser_info/index_special_region_html/Copying-and-indices.html
@@ -32,7 +32,7 @@ a.summary-letter-printindex {text-decoration: none}
 </head>
 
 <body lang="en">
-<div class="appendix" id="Copying-and-indices">
+<div class="appendix-level-extent" id="Copying-and-indices">
 <div class="nav-header">
 <p>
 Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; [<a 
href="index.html#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>][<a href="index.html" title="Index" 
rel="index">Index</a>]</p>
diff --git 
a/tp/tests/indices/res_parser_info/index_special_region_html/index.html 
b/tp/tests/indices/res_parser_info/index_special_region_html/index.html
index b3a4f303cd..62f9b138ef 100644
--- a/tp/tests/indices/res_parser_info/index_special_region_html/index.html
+++ b/tp/tests/indices/res_parser_info/index_special_region_html/index.html
@@ -37,7 +37,7 @@ ul.toc-numbered-mark {list-style: none}
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
  &nbsp; [<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>][<a href="#Top" title="Index" 
rel="index">Index</a>]</p>
@@ -54,7 +54,7 @@ ul.toc-numbered-mark {list-style: none}
 </ul>
 </div>
 </div>
-<div class="chapter" id="Chapter">
+<div class="chapter-level-extent" id="Chapter">
 <h2 class="chapter">1 Chapter</h2>
 
 
diff --git 
a/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/Copying-and-indices.html
 
b/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/Copying-and-indices.html
index 0e7945aedf..7600c35e38 100644
--- 
a/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/Copying-and-indices.html
+++ 
b/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/Copying-and-indices.html
@@ -31,7 +31,7 @@ a.summary-letter-printindex {text-decoration: none}
 </head>
 
 <body lang="en">
-<div class="appendix" id="Copying-and-indices">
+<div class="appendix-level-extent" id="Copying-and-indices">
 <div class="nav-header">
 <p>
 Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; [<a 
href="index.html#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
diff --git 
a/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/index.html
 
b/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/index.html
index c4e7e7027f..1ca1872a05 100644
--- 
a/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/index.html
+++ 
b/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/index.html
@@ -35,7 +35,7 @@ ul.toc-numbered-mark {list-style: none}
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
  &nbsp; [<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
@@ -52,7 +52,7 @@ ul.toc-numbered-mark {list-style: none}
 </ul>
 </div>
 </div>
-<div class="chapter" id="Chapter">
+<div class="chapter-level-extent" id="Chapter">
 <h2 class="chapter">1 Chapter</h2>
 
 
diff --git 
a/tp/tests/indices/res_parser_info/index_special_region_no_region_html/Copying-and-indices.html
 
b/tp/tests/indices/res_parser_info/index_special_region_no_region_html/Copying-and-indices.html
index 0e7945aedf..7600c35e38 100644
--- 
a/tp/tests/indices/res_parser_info/index_special_region_no_region_html/Copying-and-indices.html
+++ 
b/tp/tests/indices/res_parser_info/index_special_region_no_region_html/Copying-and-indices.html
@@ -31,7 +31,7 @@ a.summary-letter-printindex {text-decoration: none}
 </head>
 
 <body lang="en">
-<div class="appendix" id="Copying-and-indices">
+<div class="appendix-level-extent" id="Copying-and-indices">
 <div class="nav-header">
 <p>
 Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; [<a 
href="index.html#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
diff --git 
a/tp/tests/indices/res_parser_info/index_special_region_no_region_html/index.html
 
b/tp/tests/indices/res_parser_info/index_special_region_no_region_html/index.html
index ce9770b550..4dcf2e9ab9 100644
--- 
a/tp/tests/indices/res_parser_info/index_special_region_no_region_html/index.html
+++ 
b/tp/tests/indices/res_parser_info/index_special_region_no_region_html/index.html
@@ -35,7 +35,7 @@ ul.toc-numbered-mark {list-style: none}
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
  &nbsp; [<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
@@ -53,7 +53,7 @@ ul.toc-numbered-mark {list-style: none}
 </ul>
 </div>
 </div>
-<div class="chapter" id="Chapter">
+<div class="chapter-level-extent" id="Chapter">
 <h2 class="chapter">1 Chapter</h2>
 
 
diff --git 
a/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/chapter.html
 
b/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/chapter.html
index 56349b3341..98ca227136 100644
--- 
a/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/chapter.html
+++ 
b/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/chapter.html
@@ -26,7 +26,7 @@ a.summary-letter-printindex {text-decoration: none}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
 Next: <a href="#node-in-chapter" accesskey="n" rel="next">node in chapter</a>, 
Up: <a href="index.html#Top" accesskey="u" rel="up">top section</a> &nbsp; [<a 
href="first-before-top.html#first-before-top" title="Index" 
rel="index">Index</a>]</p>
@@ -105,11 +105,11 @@ Next: <a href="#node-in-chapter" accesskey="n" 
rel="next">node in chapter</a>, U
 </div>
 
 <hr>
-<a class="node" id="node-in-chapter"></a><div class="nav-header">
+<a class="node-id" id="node-in-chapter"></a><div class="nav-header">
 <p>
 Previous: <a href="#chapter" accesskey="p" rel="prev">A chapter</a>, Up: <a 
href="index.html#Top" accesskey="u" rel="up">top section</a> &nbsp; [<a 
href="first-before-top.html#first-before-top" title="Index" 
rel="index">Index</a>]</p>
 </div>
-<h4 class="node-heading">node in chapter</h4>
+<h4 class="node">node in chapter</h4>
 
 <a class="index-entry-id" id="index-node-in-chapter"></a>
 
diff --git 
a/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/first-before-top.html
 
b/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/first-before-top.html
index 9e97fe3362..dda1a50635 100644
--- 
a/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/first-before-top.html
+++ 
b/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/first-before-top.html
@@ -28,11 +28,11 @@ a.summary-letter-printindex {text-decoration: none}
 <body lang="en">
 
 
-<a class="node" id="first-before-top"></a><div class="nav-header">
+<a class="node-id" id="first-before-top"></a><div class="nav-header">
 <p>
 Next: <a href="index.html#Top" accesskey="n" rel="next">top section</a>, Up: 
<a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; [<a 
href="#first-before-top" title="Index" rel="index">Index</a>]</p>
 </div>
-<h4 class="node-heading">first before top</h4>
+<h4 class="node">first before top</h4>
 <a class="index-entry-id" id="index-first-before-top"></a>
 
 <p>in first node before printindex
@@ -180,11 +180,11 @@ Next: <a href="index.html#Top" accesskey="n" 
rel="next">top section</a>, Up: <a
 <p>after second printindex in first node
 </p>
 <hr>
-<a class="node" id="node-in-menu-before-top"></a><div class="nav-header">
+<a class="node-id" id="node-in-menu-before-top"></a><div class="nav-header">
 <p>
 Up: <a href="#first-before-top" accesskey="u" rel="up">first before top</a> 
&nbsp; [<a href="#first-before-top" title="Index" rel="index">Index</a>]</p>
 </div>
-<h4 class="node-heading">node in menu before top</h4>
+<h4 class="node">node in menu before top</h4>
 
 <a class="index-entry-id" id="index-node-in-menu-before-top"></a>
 <p>between node in menu before top and printindex
diff --git 
a/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/index.html
 
b/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/index.html
index 7ca24a2695..c54b159e60 100644
--- 
a/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/index.html
+++ 
b/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/index.html
@@ -25,7 +25,7 @@ a.summary-letter-printindex {text-decoration: none}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Previous: <a href="first-before-top.html#first-before-top" accesskey="p" 
rel="prev">first before top</a> &nbsp; [<a 
href="first-before-top.html#first-before-top" title="Index" 
rel="index">Index</a>]</p>
@@ -216,11 +216,11 @@ Previous: <a 
href="first-before-top.html#first-before-top" accesskey="p" rel="pr
 <li><a href="chapter.html#chapter" accesskey="1">A chapter</a></li>
 </ul>
 <hr>
-<a class="node" id="first"></a><div class="nav-header">
+<a class="node-id" id="first"></a><div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">top section</a>, Up: <a 
href="#Top" accesskey="u" rel="up">top section</a> &nbsp; [<a 
href="first-before-top.html#first-before-top" title="Index" 
rel="index">Index</a>]</p>
 </div>
-<h4 class="node-heading">first</h4>
+<h4 class="node">first</h4>
 <p>Text and then index entries
 <a class="index-entry-id" id="index-_0021-entry-in-node"></a>
 <a class="index-entry-id" id="index-fun-in-node"></a>
@@ -299,11 +299,11 @@ Previous: <a href="#Top" accesskey="p" rel="prev">top 
section</a>, Up: <a href="
 
 
 <hr>
-<a class="node" id="second"></a><div class="nav-header">
+<a class="node-id" id="second"></a><div class="nav-header">
 <p>
 Up: <a href="#first" accesskey="u" rel="up">first</a> &nbsp; [<a 
href="first-before-top.html#first-before-top" title="Index" 
rel="index">Index</a>]</p>
 </div>
-<h4 class="node-heading">second</h4>
+<h4 class="node">second</h4>
 
 <div class="printindex fn-printindex">
 <table class="fn-letters-header-printindex"><tr><th valign="top">Jump to: 
&nbsp; </th><td><a class="summary-letter-printindex" 
href="#second_fn_letter-A"><b>A</b></a>
@@ -336,22 +336,22 @@ Up: <a href="#first" accesskey="u" rel="up">first</a> 
&nbsp; [<a href="first-bef
 </div>
 
 <hr>
-<a class="node" id="another"></a><div class="nav-header">
+<a class="node-id" id="another"></a><div class="nav-header">
 <p>
 Previous: <a href="#a-node" accesskey="p" rel="prev">a node</a>, Up: <a 
href="#second" accesskey="u" rel="up">second</a> &nbsp; [<a 
href="first-before-top.html#first-before-top" title="Index" 
rel="index">Index</a>]</p>
 </div>
-<h4 class="node-heading">another</h4>
+<h4 class="node">another</h4>
 
 <a class="index-entry-id" id="index-something"></a>
 <a class="index-entry-id" id="index-somewhere"></a>
 <a class="index-entry-id" id="index-another"></a>
 
 <hr>
-<a class="node" id="a-node"></a><div class="nav-header">
+<a class="node-id" id="a-node"></a><div class="nav-header">
 <p>
 Next: <a href="#another" accesskey="n" rel="next">another</a>, Up: <a 
href="#second" accesskey="u" rel="up">second</a> &nbsp; [<a 
href="first-before-top.html#first-before-top" title="Index" 
rel="index">Index</a>]</p>
 </div>
-<h4 class="node-heading">a node</h4>
+<h4 class="node">a node</h4>
 <a class="index-entry-id" id="index-entry-after-printindex"></a>
 
 <div class="printindex cp-printindex">
diff --git 
a/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/chapter.html
 
b/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/chapter.html
index 56349b3341..98ca227136 100644
--- 
a/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/chapter.html
+++ 
b/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/chapter.html
@@ -26,7 +26,7 @@ a.summary-letter-printindex {text-decoration: none}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
 Next: <a href="#node-in-chapter" accesskey="n" rel="next">node in chapter</a>, 
Up: <a href="index.html#Top" accesskey="u" rel="up">top section</a> &nbsp; [<a 
href="first-before-top.html#first-before-top" title="Index" 
rel="index">Index</a>]</p>
@@ -105,11 +105,11 @@ Next: <a href="#node-in-chapter" accesskey="n" 
rel="next">node in chapter</a>, U
 </div>
 
 <hr>
-<a class="node" id="node-in-chapter"></a><div class="nav-header">
+<a class="node-id" id="node-in-chapter"></a><div class="nav-header">
 <p>
 Previous: <a href="#chapter" accesskey="p" rel="prev">A chapter</a>, Up: <a 
href="index.html#Top" accesskey="u" rel="up">top section</a> &nbsp; [<a 
href="first-before-top.html#first-before-top" title="Index" 
rel="index">Index</a>]</p>
 </div>
-<h4 class="node-heading">node in chapter</h4>
+<h4 class="node">node in chapter</h4>
 
 <a class="index-entry-id" id="index-node-in-chapter"></a>
 
diff --git 
a/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/first-before-top.html
 
b/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/first-before-top.html
index 9e97fe3362..dda1a50635 100644
--- 
a/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/first-before-top.html
+++ 
b/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/first-before-top.html
@@ -28,11 +28,11 @@ a.summary-letter-printindex {text-decoration: none}
 <body lang="en">
 
 
-<a class="node" id="first-before-top"></a><div class="nav-header">
+<a class="node-id" id="first-before-top"></a><div class="nav-header">
 <p>
 Next: <a href="index.html#Top" accesskey="n" rel="next">top section</a>, Up: 
<a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; [<a 
href="#first-before-top" title="Index" rel="index">Index</a>]</p>
 </div>
-<h4 class="node-heading">first before top</h4>
+<h4 class="node">first before top</h4>
 <a class="index-entry-id" id="index-first-before-top"></a>
 
 <p>in first node before printindex
@@ -180,11 +180,11 @@ Next: <a href="index.html#Top" accesskey="n" 
rel="next">top section</a>, Up: <a
 <p>after second printindex in first node
 </p>
 <hr>
-<a class="node" id="node-in-menu-before-top"></a><div class="nav-header">
+<a class="node-id" id="node-in-menu-before-top"></a><div class="nav-header">
 <p>
 Up: <a href="#first-before-top" accesskey="u" rel="up">first before top</a> 
&nbsp; [<a href="#first-before-top" title="Index" rel="index">Index</a>]</p>
 </div>
-<h4 class="node-heading">node in menu before top</h4>
+<h4 class="node">node in menu before top</h4>
 
 <a class="index-entry-id" id="index-node-in-menu-before-top"></a>
 <p>between node in menu before top and printindex
diff --git 
a/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/index.html
 
b/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/index.html
index 7ca24a2695..c54b159e60 100644
--- 
a/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/index.html
+++ 
b/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/index.html
@@ -25,7 +25,7 @@ a.summary-letter-printindex {text-decoration: none}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Previous: <a href="first-before-top.html#first-before-top" accesskey="p" 
rel="prev">first before top</a> &nbsp; [<a 
href="first-before-top.html#first-before-top" title="Index" 
rel="index">Index</a>]</p>
@@ -216,11 +216,11 @@ Previous: <a 
href="first-before-top.html#first-before-top" accesskey="p" rel="pr
 <li><a href="chapter.html#chapter" accesskey="1">A chapter</a></li>
 </ul>
 <hr>
-<a class="node" id="first"></a><div class="nav-header">
+<a class="node-id" id="first"></a><div class="nav-header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">top section</a>, Up: <a 
href="#Top" accesskey="u" rel="up">top section</a> &nbsp; [<a 
href="first-before-top.html#first-before-top" title="Index" 
rel="index">Index</a>]</p>
 </div>
-<h4 class="node-heading">first</h4>
+<h4 class="node">first</h4>
 <p>Text and then index entries
 <a class="index-entry-id" id="index-_0021-entry-in-node"></a>
 <a class="index-entry-id" id="index-fun-in-node"></a>
@@ -299,11 +299,11 @@ Previous: <a href="#Top" accesskey="p" rel="prev">top 
section</a>, Up: <a href="
 
 
 <hr>
-<a class="node" id="second"></a><div class="nav-header">
+<a class="node-id" id="second"></a><div class="nav-header">
 <p>
 Up: <a href="#first" accesskey="u" rel="up">first</a> &nbsp; [<a 
href="first-before-top.html#first-before-top" title="Index" 
rel="index">Index</a>]</p>
 </div>
-<h4 class="node-heading">second</h4>
+<h4 class="node">second</h4>
 
 <div class="printindex fn-printindex">
 <table class="fn-letters-header-printindex"><tr><th valign="top">Jump to: 
&nbsp; </th><td><a class="summary-letter-printindex" 
href="#second_fn_letter-A"><b>A</b></a>
@@ -336,22 +336,22 @@ Up: <a href="#first" accesskey="u" rel="up">first</a> 
&nbsp; [<a href="first-bef
 </div>
 
 <hr>
-<a class="node" id="another"></a><div class="nav-header">
+<a class="node-id" id="another"></a><div class="nav-header">
 <p>
 Previous: <a href="#a-node" accesskey="p" rel="prev">a node</a>, Up: <a 
href="#second" accesskey="u" rel="up">second</a> &nbsp; [<a 
href="first-before-top.html#first-before-top" title="Index" 
rel="index">Index</a>]</p>
 </div>
-<h4 class="node-heading">another</h4>
+<h4 class="node">another</h4>
 
 <a class="index-entry-id" id="index-something"></a>
 <a class="index-entry-id" id="index-somewhere"></a>
 <a class="index-entry-id" id="index-another"></a>
 
 <hr>
-<a class="node" id="a-node"></a><div class="nav-header">
+<a class="node-id" id="a-node"></a><div class="nav-header">
 <p>
 Next: <a href="#another" accesskey="n" rel="next">another</a>, Up: <a 
href="#second" accesskey="u" rel="up">second</a> &nbsp; [<a 
href="first-before-top.html#first-before-top" title="Index" 
rel="index">Index</a>]</p>
 </div>
-<h4 class="node-heading">a node</h4>
+<h4 class="node">a node</h4>
 <a class="index-entry-id" id="index-entry-after-printindex"></a>
 
 <div class="printindex cp-printindex">
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html 
b/tp/tests/layout/res_parser/formatting/formatting.html
index c6cb09660b..764bc11a3d 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -2872,7 +2872,7 @@ html ''
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -2895,7 +2895,7 @@ Menu comment
 
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -6760,7 +6760,7 @@ Menu comment
 </div>
 
 <hr>
-<div class="section" id="s_002d_002dect_002cion">
+<div class="section-level-extent" id="s_002d_002dect_002cion">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section 
in reading order"> &lt; </a>]</td>
@@ -6792,7 +6792,7 @@ Menu comment
 </table>
 
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#s_002d_002dect_002cion" 
title="Previous section in reading order"> &lt; </a>]</td>
@@ -6819,7 +6819,7 @@ Menu comment
 
 <a class="anchor" id="anchor"></a>
 <hr>
-<div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
+<div class="subsubsection-level-extent" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#subsection" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -6839,7 +6839,7 @@ Menu comment
 
 <hr>
 </div>
-<div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
+<div class="subsubsection-level-extent" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a 
href="#subsubsection-_0060_0060simple_002ddouble_002d_002d" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -6862,7 +6862,7 @@ Menu comment
 </div>
 </div>
 </div>
-<div class="centerchap" id="chapter2">
+<div class="centerchap-level-extent" id="chapter2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a 
href="#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" 
title="Previous section in reading order"> &lt; </a>]</td>
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter.html 
b/tp/tests/layout/res_parser/formatting_chm/chapter.html
index a57334e13f..bf22300974 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter.html
@@ -825,7 +825,7 @@ ul.mark-none {list-style-type: none}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <h1 class="chapter" id="chapter-1">1 chapter</h1>
 
 <p>First para
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter2.html 
b/tp/tests/layout/res_parser/formatting_chm/chapter2.html
index ad40d45641..a8882c29be 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter2.html
@@ -810,7 +810,7 @@ h1.centerchap {text-align:center}
 </head>
 
 <body lang="en">
-<div class="centerchap" id="chapter2">
+<div class="centerchap-level-extent" id="chapter2">
 <h1 class="centerchap" id="chapter-2">chapter 2</h1>
 
 <div class="printindex cp-printindex">
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.html 
b/tp/tests/layout/res_parser/formatting_chm/formatting.html
index 94eade9847..db8467ea81 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting.html
@@ -2866,7 +2866,7 @@ html ''
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="Top-section">Top section</h1>
 
 
diff --git 
a/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html 
b/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
index 68e32dd010..02e8c6cf15 100644
--- a/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
+++ b/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
@@ -808,7 +808,7 @@ truc: after a deff item
 </head>
 
 <body lang="en">
-<div class="section" id="s_002d_002dect_002cion">
+<div class="section-level-extent" id="s_002d_002dect_002cion">
 <h2 class="section" id="A-section">1.1 A section</h2>
 
 
diff --git a/tp/tests/layout/res_parser/formatting_chm/subsection.html 
b/tp/tests/layout/res_parser/formatting_chm/subsection.html
index abeb0f118e..b0e0bef6ea 100644
--- a/tp/tests/layout/res_parser/formatting_chm/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_chm/subsection.html
@@ -808,7 +808,7 @@ truc: after a deff item
 </head>
 
 <body lang="en">
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <h3 class="subsection" id="subsection-1">1.1.1 subsection</h3>
 
 
diff --git 
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
 
b/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index f1da8117d1..ab309c51d4 100644
--- 
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++ 
b/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -808,7 +808,7 @@ truc: after a deff item
 </head>
 
 <body lang="en">
-<div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
+<div class="subsubsection-level-extent" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
 <h4 class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1">1.1.1.1 
subsubsection &ldquo;simple-double&ndash;</h4>
 
 </div>
diff --git 
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
 
b/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index 93fee944da..ec88cbd1ed 100644
--- 
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++ 
b/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -808,7 +808,7 @@ truc: after a deff item
 </head>
 
 <body lang="en">
-<div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
+<div class="subsubsection-level-extent" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
 <h4 class="subsubsection" 
id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">1.1.1.2 
three&mdash;four&mdash;-&rdquo;</h4>
 
 </div>
diff --git 
a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html 
b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
index aacb6c7171..c9dd0f8577 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
@@ -2872,7 +2872,7 @@ html ''
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -2895,7 +2895,7 @@ Menu comment
 
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -6760,7 +6760,7 @@ Menu comment
 </div>
 
 <hr>
-<div class="section" id="s_002d_002dect_002cion">
+<div class="section-level-extent" id="s_002d_002dect_002cion">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section 
in reading order"> &lt; </a>]</td>
@@ -6792,7 +6792,7 @@ Menu comment
 </table>
 
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#s_002d_002dect_002cion" 
title="Previous section in reading order"> &lt; </a>]</td>
@@ -6819,7 +6819,7 @@ Menu comment
 
 <a class="anchor" id="anchor"></a>
 <hr>
-<div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
+<div class="subsubsection-level-extent" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#subsection" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -6839,7 +6839,7 @@ Menu comment
 
 <hr>
 </div>
-<div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
+<div class="subsubsection-level-extent" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a 
href="#subsubsection-_0060_0060simple_002ddouble_002d_002d" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -6862,7 +6862,7 @@ Menu comment
 </div>
 </div>
 </div>
-<div class="centerchap" id="chapter2">
+<div class="centerchap-level-extent" id="chapter2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a 
href="#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" 
title="Previous section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index 61aed659eb..add0068598 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
@@ -2871,7 +2871,7 @@ html ''
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="Top-section">Top section</h1>
 
 <table class="menu" border="0" cellspacing="0">
@@ -2885,7 +2885,7 @@ Menu comment
 </table>
 
 
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <h1 class="chapter" id="chapter-1">1 chapter</h1>
 
 <p>First para
@@ -6734,7 +6734,7 @@ Menu comment
 </pre></td></tr></table>
 </div>
 
-<div class="section" id="s_002d_002dect_002cion">
+<div class="section-level-extent" id="s_002d_002dect_002cion">
 <h2 class="section" id="A-section">1.1 A section</h2>
 
 <table class="menu" border="0" cellspacing="0">
@@ -6750,7 +6750,7 @@ Menu comment
 </td></tr>
 </table>
 
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <h3 class="subsection" id="subsection-1">1.1.1 subsection</h3>
 
 <table class="menu" border="0" cellspacing="0">
@@ -6761,18 +6761,18 @@ Menu comment
 </table>
 
 <a class="anchor" id="anchor"></a>
-<div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
+<div class="subsubsection-level-extent" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
 <h4 class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1">1.1.1.1 
subsubsection &#8220;simple-double&#8211;</h4>
 
 </div>
-<div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
+<div class="subsubsection-level-extent" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
 <h4 class="subsubsection" 
id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">1.1.1.2 
three&#8212;four&#8212;-&#8221;</h4>
 
 </div>
 </div>
 </div>
 </div>
-<div class="centerchap" id="chapter2">
+<div class="centerchap-level-extent" id="chapter2">
 <h1 class="centerchap" id="chapter-2">chapter 2</h1>
 
 <div class="printindex cp-printindex">
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
index 3d762ac7c9..dbf8dc8a6c 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
@@ -829,7 +829,7 @@ ul.mark-none {list-style-type: none}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <h1 class="chapter" id="chapter-1">1 chapter</h1>
 
 <p>First para
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
index a4b8b16cda..edba5743cb 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
@@ -814,7 +814,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="centerchap" id="chapter2">
+<div class="centerchap-level-extent" id="chapter2">
 <h1 class="centerchap" id="chapter-2">chapter 2</h1>
 
 <div class="printindex cp-printindex">
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index e9d9942c0c..2764b3742e 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
@@ -2869,7 +2869,7 @@ html ''
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="Top-section">Top section</h1>
 
 <table class="menu" border="0" cellspacing="0">
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
index dee2f9e65f..a9b830626d 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
@@ -813,7 +813,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="section" id="s_002d_002dect_002cion">
+<div class="section-level-extent" id="s_002d_002dect_002cion">
 <h2 class="section" id="A-section">1.1 A section</h2>
 
 <table class="menu" border="0" cellspacing="0">
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
index ae3aa041fb..70e36a3625 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
@@ -812,7 +812,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <h3 class="subsection" id="subsection-1">1.1.1 subsection</h3>
 
 <table class="menu" border="0" cellspacing="0">
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
index 25c4ff2086..001a2cf227 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
@@ -812,7 +812,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
+<div class="subsubsection-level-extent" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
 <h4 class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1">1.1.1.1 
subsubsection &#8220;simple-double&#8211;</h4>
 
 </div>
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml
index e3027c1c82..06edc7365c 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml
@@ -812,7 +812,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
+<div class="subsubsection-level-extent" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
 <h4 class="subsubsection" 
id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">1.1.1.2 
three&#8212;four&#8212;-&#8221;</h4>
 
 </div>
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter.html 
b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index cb0f46fcd1..ec47393e84 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
@@ -827,7 +827,7 @@ ul.mark-none {list-style-type: none}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter2.html 
b/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
index 9fa466ecb7..8ca2d46de0 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
@@ -812,7 +812,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="centerchap" id="chapter2">
+<div class="centerchap-level-extent" id="chapter2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a 
href="s_002d_002dect_002cion.html#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027"
 title="Previous section in reading order"> &lt; </a>]</td>
diff --git a/tp/tests/layout/res_parser/formatting_exotic/index.html 
b/tp/tests/layout/res_parser/formatting_exotic/index.html
index 9284f0c14d..952420ad62 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/index.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/index.html
@@ -816,7 +816,7 @@ span.program-in-footer {font-size: smaller}
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="chapter.html" title="Next section 
in reading order"> &gt; </a>]</td>
diff --git 
a/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html 
b/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
index 0ed1292a73..abfc880bdb 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
@@ -810,7 +810,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="section" id="s_002d_002dect_002cion">
+<div class="section-level-extent" id="s_002d_002dect_002cion">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="chapter.html" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -830,18 +830,18 @@ span.program-in-footer {font-size: smaller}
 
 
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <h3 class="subsection" id="subsection-1"><a 
href="formatting_toc.html#toc-subsection-1">subsection</a></h3>
 
 
 <a class="anchor" id="anchor"></a>
 <hr>
-<div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
+<div class="subsubsection-level-extent" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
 <h4 class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1"><a 
href="formatting_toc.html#toc-subsubsection-_0060_0060simple_002ddouble_002d_002d-1">subsubsection
 &ldquo;simple-double&ndash;</a></h4>
 
 <hr>
 </div>
-<div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
+<div class="subsubsection-level-extent" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
 <h4 class="subsubsection" 
id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027"><a 
href="formatting_toc.html#toc-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">three&mdash;four&mdash;-&rdquo;</a></h4>
 
 </div>
diff --git a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html 
b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
index a91b91d2cf..e63ce34ff3 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -2872,7 +2872,7 @@ html ''
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left"><img src="a_left_na.png" border="0" 
alt="Arri&egrave;re" align="middle"></td>
 <td valign="middle" align="left"><a href="#chapter" title="Section suivante 
dans l&rsquo;ordre de lecture"><img src="a_right.png" border="0" alt="Avant: 1 
chapter" align="middle"></a></td>
@@ -2895,7 +2895,7 @@ Menu comment
 
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left"><a href="#Top" title="D&eacute;but de ce 
chapitre ou chapitre pr&eacute;c&eacute;dent"><img src="a_leftdouble.png" 
border="0" alt="RetourRapide: Top section" align="middle"></a></td>
 <td valign="middle" align="left"><a href="#Top" title="Section 
pr&eacute;c&eacute;dente dans l&rsquo;ordre de lecture"><img src="a_left.png" 
border="0" alt="Arri&egrave;re: Top section" align="middle"></a></td>
@@ -6760,7 +6760,7 @@ Menu comment
 </div>
 
 <hr>
-<div class="section" id="s_002d_002dect_002cion">
+<div class="section-level-extent" id="s_002d_002dect_002cion">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left"><a href="#chapter" title="D&eacute;but de 
ce chapitre ou chapitre pr&eacute;c&eacute;dent"><img src="a_leftdouble.png" 
border="0" alt="RetourRapide: 1 chapter" align="middle"></a></td>
 <td valign="middle" align="left"><a href="#chapter" title="Section 
pr&eacute;c&eacute;dente dans l&rsquo;ordre de lecture"><img src="a_left.png" 
border="0" alt="Arri&egrave;re: 1 chapter" align="middle"></a></td>
@@ -6792,7 +6792,7 @@ Menu comment
 </table>
 
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left"><a href="#chapter" title="D&eacute;but de 
ce chapitre ou chapitre pr&eacute;c&eacute;dent"><img src="a_leftdouble.png" 
border="0" alt="RetourRapide: 1 chapter" align="middle"></a></td>
 <td valign="middle" align="left"><a href="#s_002d_002dect_002cion" 
title="Section pr&eacute;c&eacute;dente dans l&rsquo;ordre de lecture"><img 
src="a_left.png" border="0" alt="Arri&egrave;re: 1.1 A section" 
align="middle"></a></td>
@@ -6819,7 +6819,7 @@ Menu comment
 
 <a class="anchor" id="anchor"></a>
 <hr>
-<div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
+<div class="subsubsection-level-extent" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left"><a href="#chapter" title="D&eacute;but de 
ce chapitre ou chapitre pr&eacute;c&eacute;dent"><img src="a_leftdouble.png" 
border="0" alt="RetourRapide: 1 chapter" align="middle"></a></td>
 <td valign="middle" align="left"><a href="#subsection" title="Section 
pr&eacute;c&eacute;dente dans l&rsquo;ordre de lecture"><img src="a_left.png" 
border="0" alt="Arri&egrave;re: 1.1.1 subsection" align="middle"></a></td>
@@ -6839,7 +6839,7 @@ Menu comment
 
 <hr>
 </div>
-<div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
+<div class="subsubsection-level-extent" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left"><a href="#chapter" title="D&eacute;but de 
ce chapitre ou chapitre pr&eacute;c&eacute;dent"><img src="a_leftdouble.png" 
border="0" alt="RetourRapide: 1 chapter" align="middle"></a></td>
 <td valign="middle" align="left"><a 
href="#subsubsection-_0060_0060simple_002ddouble_002d_002d" title="Section 
pr&eacute;c&eacute;dente dans l&rsquo;ordre de lecture"><img src="a_left.png" 
border="0" alt="Arri&egrave;re: 1.1.1.1 subsubsection 
&ldquo;simple-double&ndash;" align="middle"></a></td>
@@ -6862,7 +6862,7 @@ Menu comment
 </div>
 </div>
 </div>
-<div class="centerchap" id="chapter2">
+<div class="centerchap-level-extent" id="chapter2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left"><a href="#chapter" title="D&eacute;but de 
ce chapitre ou chapitre pr&eacute;c&eacute;dent"><img src="a_leftdouble.png" 
border="0" alt="RetourRapide: 1 chapter" align="middle"></a></td>
 <td valign="middle" align="left"><a 
href="#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" 
title="Section pr&eacute;c&eacute;dente dans l&rsquo;ordre de lecture"><img 
src="a_left.png" border="0" alt="Arri&egrave;re: 1.1.1.2 
three&mdash;four&mdash;-&rdquo;" align="middle"></a></td>
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html 
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index c6cb09660b..764bc11a3d 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -2872,7 +2872,7 @@ html ''
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -2895,7 +2895,7 @@ Menu comment
 
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -6760,7 +6760,7 @@ Menu comment
 </div>
 
 <hr>
-<div class="section" id="s_002d_002dect_002cion">
+<div class="section-level-extent" id="s_002d_002dect_002cion">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section 
in reading order"> &lt; </a>]</td>
@@ -6792,7 +6792,7 @@ Menu comment
 </table>
 
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#s_002d_002dect_002cion" 
title="Previous section in reading order"> &lt; </a>]</td>
@@ -6819,7 +6819,7 @@ Menu comment
 
 <a class="anchor" id="anchor"></a>
 <hr>
-<div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
+<div class="subsubsection-level-extent" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#subsection" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -6839,7 +6839,7 @@ Menu comment
 
 <hr>
 </div>
-<div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
+<div class="subsubsection-level-extent" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a 
href="#subsubsection-_0060_0060simple_002ddouble_002d_002d" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -6862,7 +6862,7 @@ Menu comment
 </div>
 </div>
 </div>
-<div class="centerchap" id="chapter2">
+<div class="centerchap-level-extent" id="chapter2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a 
href="#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" 
title="Previous section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html 
b/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
index fd11225bf0..aec1123dbe 100644
--- a/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
@@ -837,7 +837,7 @@ ul.toc-numbered-mark {list-style: none}
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a 
href="#chapter" title="Index" rel="index">Index</a>]</p>
@@ -878,7 +878,7 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">chapter</a> &nbsp; [<a href="#
 </div>
 </div>
 <hr>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter2" accesskey="n" rel="next">chapter 2</a>, Previous: <a 
href="#Top" accesskey="p" rel="prev">Top section</a>, Up: <a href="#Top" 
accesskey="u" rel="up">Top section</a> &nbsp; [<a href="#SEC_Contents" 
title="Table of contents" rel="contents">Contents</a>][<a href="#chapter" 
title="Index" rel="index">Index</a>]</p>
@@ -4724,7 +4724,7 @@ Invalid use of @':
 <li><a href="#s_002d_002dect_002cion" accesskey="1">A section</a></li>
 </ul>
 <hr>
-<div class="section" id="s_002d_002dect_002cion">
+<div class="section-level-extent" id="s_002d_002dect_002cion">
 <div class="nav-header">
 <p>
 Up: <a href="#chapter" accesskey="u" rel="up">chapter</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a 
href="#chapter" title="Index" rel="index">Index</a>]</p>
@@ -4736,7 +4736,7 @@ Up: <a href="#chapter" accesskey="u" rel="up">chapter</a> 
&nbsp; [<a href="#SEC_
 <li><a href="#subsection" accesskey="1">subsection</a></li>
 </ul>
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <div class="nav-header">
 <p>
 Up: <a href="#s_002d_002dect_002cion" accesskey="u" rel="up">A section</a> 
&nbsp; [<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>][<a href="#chapter" title="Index" 
rel="index">Index</a>]</p>
@@ -4750,7 +4750,7 @@ Up: <a href="#s_002d_002dect_002cion" accesskey="u" 
rel="up">A section</a> &nbsp
 <li><a 
href="#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" 
accesskey="2">three&mdash;four&mdash;-&rdquo;</a></li>
 </ul>
 <hr>
-<div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
+<div class="subsubsection-level-extent" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
 <div class="nav-header">
 <p>
 Next: <a 
href="#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" 
accesskey="n" rel="next">three&mdash;four&mdash;-&rdquo;</a>, Up: <a 
href="#subsection" accesskey="u" rel="up">subsection</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a 
href="#chapter" title="Index" rel="index">Index</a>]</p>
@@ -4759,7 +4759,7 @@ Next: <a 
href="#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_
 
 <hr>
 </div>
-<div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
+<div class="subsubsection-level-extent" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
 <div class="nav-header">
 <p>
 Previous: <a href="#subsubsection-_0060_0060simple_002ddouble_002d_002d" 
accesskey="p" rel="prev">subsubsection &ldquo;simple-double&ndash;</a>, Up: <a 
href="#subsection" accesskey="u" rel="up">subsection</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a 
href="#chapter" title="Index" rel="index">Index</a>]</p>
@@ -4771,7 +4771,7 @@ Previous: <a 
href="#subsubsection-_0060_0060simple_002ddouble_002d_002d" accessk
 </div>
 </div>
 </div>
-<div class="centerchap" id="chapter2">
+<div class="centerchap-level-extent" id="chapter2">
 <div class="nav-header">
 <p>
 Previous: <a href="#chapter" accesskey="p" rel="prev">chapter</a>, Up: <a 
href="#Top" accesskey="u" rel="up">Top section</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a 
href="#chapter" title="Index" rel="index">Index</a>]</p>
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
index 1ae29ebf36..f102c738c7 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -828,7 +828,7 @@ ul.mark-none {list-style-type: none}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
index de99fd5e0f..082384b171 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
@@ -811,7 +811,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="centerchap" id="chapter2">
+<div class="centerchap-level-extent" id="chapter2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a 
href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html"
 title="Previous section in reading order"> &lt; </a>]</td>
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/index.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
index 83aa1bb72b..031182d048 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
@@ -2868,7 +2868,7 @@ html ''
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="chapter.html" title="Next section 
in reading order"> &gt; </a>]</td>
diff --git 
a/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
index c21589aa83..51e1b53cbc 100644
--- 
a/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
+++ 
b/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
@@ -810,7 +810,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="section" id="s_002d_002dect_002cion">
+<div class="section-level-extent" id="s_002d_002dect_002cion">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="chapter.html" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
index bfcb41b1d6..ee97fffd19 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
@@ -809,7 +809,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="s_002d_002dect_002cion.html" 
title="Previous section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
 
b/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index 00eb8e45ba..83b32d9e5e 100644
--- 
a/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++ 
b/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -809,7 +809,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
+<div class="subsubsection-level-extent" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="subsection.html" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
 
b/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index c83afceca4..ae6cc1d054 100644
--- 
a/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++ 
b/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -809,7 +809,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
+<div class="subsubsection-level-extent" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a 
href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html 
b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
index fb30536ddc..3758cd5fec 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
@@ -2849,7 +2849,7 @@ html ''
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -2872,7 +2872,7 @@ Menu comment
 
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -6737,7 +6737,7 @@ Menu comment
 </div>
 
 <hr>
-<div class="section" id="s_002d_002dect_002cion">
+<div class="section-level-extent" id="s_002d_002dect_002cion">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section 
in reading order"> &lt; </a>]</td>
@@ -6769,7 +6769,7 @@ Menu comment
 </table>
 
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#s_002d_002dect_002cion" 
title="Previous section in reading order"> &lt; </a>]</td>
@@ -6796,7 +6796,7 @@ Menu comment
 
 <a class="anchor" id="anchor"></a>
 <hr>
-<div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
+<div class="subsubsection-level-extent" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#subsection" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -6816,7 +6816,7 @@ Menu comment
 
 <hr>
 </div>
-<div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
+<div class="subsubsection-level-extent" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a 
href="#subsubsection-_0060_0060simple_002ddouble_002d_002d" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -6839,7 +6839,7 @@ Menu comment
 </div>
 </div>
 </div>
-<div class="centerchap" id="chapter2">
+<div class="centerchap-level-extent" id="chapter2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a 
href="#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" 
title="Previous section in reading order"> &lt; </a>]</td>
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html 
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index 2761256c86..d838e898c0 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -2882,7 +2882,7 @@ html ''
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -2905,7 +2905,7 @@ Menu comment
 
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -6770,7 +6770,7 @@ Menu comment
 </div>
 
 <hr>
-<div class="section" id="s_002d_002dect_002cion">
+<div class="section-level-extent" id="s_002d_002dect_002cion">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section 
in reading order"> &lt; </a>]</td>
@@ -6802,7 +6802,7 @@ Menu comment
 </table>
 
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#s_002d_002dect_002cion" 
title="Previous section in reading order"> &lt; </a>]</td>
@@ -6829,7 +6829,7 @@ Menu comment
 
 <a class="anchor" id="anchor"></a>
 <hr>
-<div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
+<div class="subsubsection-level-extent" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#subsection" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -6849,7 +6849,7 @@ Menu comment
 
 <hr>
 </div>
-<div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
+<div class="subsubsection-level-extent" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a 
href="#subsubsection-_0060_0060simple_002ddouble_002d_002d" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -6872,7 +6872,7 @@ Menu comment
 </div>
 </div>
 </div>
-<div class="centerchap" id="chapter2">
+<div class="centerchap-level-extent" id="chapter2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a 
href="#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" 
title="Previous section in reading order"> &lt; </a>]</td>
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter.html 
b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
index 1ae29ebf36..f102c738c7 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -828,7 +828,7 @@ ul.mark-none {list-style-type: none}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Previous section 
in reading order"> &lt; </a>]</td>
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter2.html 
b/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
index de99fd5e0f..082384b171 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
@@ -811,7 +811,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="centerchap" id="chapter2">
+<div class="centerchap-level-extent" id="chapter2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a 
href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html"
 title="Previous section in reading order"> &lt; </a>]</td>
diff --git a/tp/tests/layout/res_parser/formatting_nodes/index.html 
b/tp/tests/layout/res_parser/formatting_nodes/index.html
index 83aa1bb72b..031182d048 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/index.html
@@ -2868,7 +2868,7 @@ html ''
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="chapter.html" title="Next section 
in reading order"> &gt; </a>]</td>
diff --git 
a/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html 
b/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
index c21589aa83..51e1b53cbc 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
@@ -810,7 +810,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="section" id="s_002d_002dect_002cion">
+<div class="section-level-extent" id="s_002d_002dect_002cion">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="chapter.html" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git a/tp/tests/layout/res_parser/formatting_nodes/subsection.html 
b/tp/tests/layout/res_parser/formatting_nodes/subsection.html
index bfcb41b1d6..ee97fffd19 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/subsection.html
@@ -809,7 +809,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="s_002d_002dect_002cion.html" 
title="Previous section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
 
b/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index 00eb8e45ba..83b32d9e5e 100644
--- 
a/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++ 
b/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -809,7 +809,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
+<div class="subsubsection-level-extent" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="subsection.html" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
 
b/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index c83afceca4..ae6cc1d054 100644
--- 
a/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++ 
b/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -809,7 +809,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
+<div class="subsubsection-level-extent" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a 
href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html 
b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
index b9fbd00b69..cd32d882c2 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
@@ -2872,7 +2872,7 @@ html ''
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -2895,7 +2895,7 @@ Menu comment
 
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -6760,7 +6760,7 @@ Menu comment
 </div>
 
 <hr>
-<div class="section" id="s_002d_002dect_002cion">
+<div class="section-level-extent" id="s_002d_002dect_002cion">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section 
in reading order"> &lt; </a>]</td>
@@ -6792,7 +6792,7 @@ Menu comment
 </table>
 
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#s_002d_002dect_002cion" 
title="Previous section in reading order"> &lt; </a>]</td>
@@ -6819,7 +6819,7 @@ Menu comment
 
 <a class="anchor" id="anchor"></a>
 <hr>
-<div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
+<div class="subsubsection-level-extent" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#subsection" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -6839,7 +6839,7 @@ Menu comment
 
 <hr>
 </div>
-<div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
+<div class="subsubsection-level-extent" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a 
href="#subsubsection-_0060_0060simple_002ddouble_002d_002d" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -6862,7 +6862,7 @@ Menu comment
 </div>
 </div>
 </div>
-<div class="centerchap" id="chapter2">
+<div class="centerchap-level-extent" id="chapter2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a 
href="#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" 
title="Previous section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html 
b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
index 75ae801d30..ce2032eff0 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -2868,7 +2868,7 @@ html ''
 </p><hr>
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#constructs" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -2879,7 +2879,7 @@ html ''
 </tr></table>
 <h1 class="top" id="Top-section">Top section</h1>
 <hr style="height: 6px;">
-<div class="chapter" id="constructs">
+<div class="chapter-level-extent" id="constructs">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -6646,7 +6646,7 @@ html ''
 
 <hr>
 </div>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#constructs" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#constructs" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -6679,7 +6679,7 @@ Menu comment
 </div>
 
 <hr>
-<div class="section" id="s_002d_002dect_002cion">
+<div class="section-level-extent" id="s_002d_002dect_002cion">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section 
in reading order"> &lt; </a>]</td>
@@ -6703,7 +6703,7 @@ Menu comment
 </table>
 
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#s_002d_002dect_002cion" 
title="Previous section in reading order"> &lt; </a>]</td>
@@ -6728,7 +6728,7 @@ Menu comment
 
 <a class="anchor" id="anchor"></a>
 <hr>
-<div class="subsubsection" id="subsubsection">
+<div class="subsubsection-level-extent" id="subsubsection">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#subsection" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -6751,7 +6751,7 @@ Menu comment
 </div>
 </div>
 </div>
-<div class="centerchap" id="chapter2">
+<div class="centerchap-level-extent" id="chapter2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#subsubsection" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html 
b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
index 546f3a1c34..f52b3e044f 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -2872,7 +2872,7 @@ html ''
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -2895,7 +2895,7 @@ Menu comment
 
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -6760,7 +6760,7 @@ Menu comment
 </div>
 
 <hr>
-<div class="section" id="s_002d_002dect_002cion">
+<div class="section-level-extent" id="s_002d_002dect_002cion">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section 
in reading order"> &lt; </a>]</td>
@@ -6792,7 +6792,7 @@ Menu comment
 </table>
 
 <hr>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#s_002d_002dect_002cion" 
title="Previous section in reading order"> &lt; </a>]</td>
@@ -6819,7 +6819,7 @@ Menu comment
 
 <a class="anchor" id="anchor"></a>
 <hr>
-<div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
+<div class="subsubsection-level-extent" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#subsection" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -6839,7 +6839,7 @@ Menu comment
 
 <hr>
 </div>
-<div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
+<div class="subsubsection-level-extent" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a 
href="#subsubsection-_0060_0060simple_002ddouble_002d_002d" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -6862,7 +6862,7 @@ Menu comment
 </div>
 </div>
 </div>
-<div class="centerchap" id="chapter2">
+<div class="centerchap-level-extent" id="chapter2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a 
href="#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" 
title="Previous section in reading order"> &lt; </a>]</td>
diff --git a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html 
b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
index d34cbbd58c..ad3fb92c4b 100644
--- a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
@@ -2872,7 +2872,7 @@ html ''
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -2895,7 +2895,7 @@ Menu comment
 
 
 <hr style="height: 6px;"/>
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
@@ -6760,7 +6760,7 @@ Menu comment
 </div>
 
 <hr/>
-<div class="section" id="s_002d_002dect_002cion">
+<div class="section-level-extent" id="s_002d_002dect_002cion">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section 
in reading order"> &lt; </a>]</td>
@@ -6792,7 +6792,7 @@ Menu comment
 </table>
 
 <hr/>
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#s_002d_002dect_002cion" 
title="Previous section in reading order"> &lt; </a>]</td>
@@ -6819,7 +6819,7 @@ Menu comment
 
 <a class="anchor" id="anchor"></a>
 <hr/>
-<div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
+<div class="subsubsection-level-extent" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#subsection" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -6839,7 +6839,7 @@ Menu comment
 
 <hr/>
 </div>
-<div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
+<div class="subsubsection-level-extent" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a 
href="#subsubsection-_0060_0060simple_002ddouble_002d_002d" title="Previous 
section in reading order"> &lt; </a>]</td>
@@ -6862,7 +6862,7 @@ Menu comment
 </div>
 </div>
 </div>
-<div class="centerchap" id="chapter2">
+<div class="centerchap-level-extent" id="chapter2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="Beginning of 
this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a 
href="#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" 
title="Previous section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/layout/res_parser/navigation_test_misc_file_collision/chapter.html 
b/tp/tests/layout/res_parser/navigation_test_misc_file_collision/chapter.html
index d82267fa48..af0b6e7651 100644
--- 
a/tp/tests/layout/res_parser/navigation_test_misc_file_collision/chapter.html
+++ 
b/tp/tests/layout/res_parser/navigation_test_misc_file_collision/chapter.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="navigation_abt.html#Top" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="navigation_abt.html#Top" 
title="Previous section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation_abt.html
 
b/tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation_abt.html
index 076aab4912..d0096032a9 100644
--- 
a/tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation_abt.html
+++ 
b/tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation_abt.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="chapter.html" title="Next section 
in reading order"> &gt; </a>]</td>
@@ -41,7 +41,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr style="height: 6px;">
-<div class="section" id="section">
+<div class="section-level-extent" id="section">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="chapter.html" title="Previous 
section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/layout/res_parser/navigation_test_misc_file_collision/subsection.html
 
b/tp/tests/layout/res_parser/navigation_test_misc_file_collision/subsection.html
index e7661a1281..fe57afa4db 100644
--- 
a/tp/tests/layout/res_parser/navigation_test_misc_file_collision/subsection.html
+++ 
b/tp/tests/layout/res_parser/navigation_test_misc_file_collision/subsection.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="navigation_abt.html#section" 
title="Previous section in reading order"> &lt; </a>]</td>
diff --git 
a/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic.html 
b/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic.html
index fb2b34ad83..73a8ff35f6 100644
--- a/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic.html
+++ b/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic.html
@@ -25,7 +25,7 @@ ul.toc-numbered-mark {list-style: none}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -46,7 +46,7 @@ ul.toc-numbered-mark {list-style: none}
 </table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
diff --git a/tp/tests/many_input_files/tex_l2h_res/tex.html 
b/tp/tests/many_input_files/tex_l2h_res/tex.html
index a3479fe290..c9d247ed8f 100644
--- a/tp/tests/many_input_files/tex_l2h_res/tex.html
+++ b/tp/tests/many_input_files/tex_l2h_res/tex.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="Tests">Tests</h1>
 
 <p>Now tex on the same line 
diff --git a/tp/tests/many_input_files/tex_l2h_res/tex_complex.html 
b/tp/tests/many_input_files/tex_l2h_res/tex_complex.html
index 20424912e5..e4d64a3357 100644
--- a/tp/tests/many_input_files/tex_l2h_res/tex_complex.html
+++ b/tp/tests/many_input_files/tex_l2h_res/tex_complex.html
@@ -51,7 +51,7 @@ $">
 </p><hr>
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="The-title">The title</h1>
 
 <DIV CLASS="displaymath">
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex.html 
b/tp/tests/many_input_files/tex_t4ht_res/tex.html
index 50545ebf69..f6cc8b0f03 100644
--- a/tp/tests/many_input_files/tex_t4ht_res/tex.html
+++ b/tp/tests/many_input_files/tex_t4ht_res/tex.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="Tests">Tests</h1>
 
 <p>Now tex on the same line 
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_complex.html 
b/tp/tests/many_input_files/tex_t4ht_res/tex_complex.html
index b4f95515ef..8ab596df4e 100644
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_complex.html
+++ b/tp/tests/many_input_files/tex_t4ht_res/tex_complex.html
@@ -46,7 +46,7 @@ class="cmmi-10">t</span>)  math.
 </p><hr>
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="The-title">The title</h1>
 
 
diff --git 
a/tp/tests/nested_formats/res_parser/nested_cartouche/nested_formats.html 
b/tp/tests/nested_formats/res_parser/nested_cartouche/nested_formats.html
index f0ade26518..9d26cec984 100644
--- a/tp/tests/nested_formats/res_parser/nested_cartouche/nested_formats.html
+++ b/tp/tests/nested_formats/res_parser/nested_cartouche/nested_formats.html
@@ -43,7 +43,7 @@ ul.mark-bullet {list-style-type: disc}
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="Test-nested-cartouche">Test nested cartouche</h1>
 
 
diff --git 
a/tp/tests/nested_formats/res_parser/nested_deffn/nested_formats.html 
b/tp/tests/nested_formats/res_parser/nested_deffn/nested_formats.html
index 2f4614e0be..d5a6492d99 100644
--- a/tp/tests/nested_formats/res_parser/nested_deffn/nested_formats.html
+++ b/tp/tests/nested_formats/res_parser/nested_deffn/nested_formats.html
@@ -43,7 +43,7 @@ ul.mark-bullet {list-style-type: disc}
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="Test-nested-deffn">Test nested deffn</h1>
 
 
diff --git 
a/tp/tests/nested_formats/res_parser/nested_enumerate/nested_formats.html 
b/tp/tests/nested_formats/res_parser/nested_enumerate/nested_formats.html
index 9328a0dba6..47f3fe0c4c 100644
--- a/tp/tests/nested_formats/res_parser/nested_enumerate/nested_formats.html
+++ b/tp/tests/nested_formats/res_parser/nested_enumerate/nested_formats.html
@@ -43,7 +43,7 @@ ul.mark-bullet {list-style-type: disc}
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="Test-nested-enumerate">Test nested enumerate</h1>
 
 
diff --git 
a/tp/tests/nested_formats/res_parser/nested_example/nested_formats.html 
b/tp/tests/nested_formats/res_parser/nested_example/nested_formats.html
index 87951bee36..36f53b5e18 100644
--- a/tp/tests/nested_formats/res_parser/nested_example/nested_formats.html
+++ b/tp/tests/nested_formats/res_parser/nested_example/nested_formats.html
@@ -43,7 +43,7 @@ ul.mark-bullet {list-style-type: disc}
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="Test-nested-example">Test nested example</h1>
 
 
diff --git 
a/tp/tests/nested_formats/res_parser/nested_flushright/nested_formats.html 
b/tp/tests/nested_formats/res_parser/nested_flushright/nested_formats.html
index 551a6d15ab..0a98348624 100644
--- a/tp/tests/nested_formats/res_parser/nested_flushright/nested_formats.html
+++ b/tp/tests/nested_formats/res_parser/nested_flushright/nested_formats.html
@@ -43,7 +43,7 @@ ul.mark-bullet {list-style-type: disc}
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="Test-nested-flushright">Test nested flushright</h1>
 
 
diff --git 
a/tp/tests/nested_formats/res_parser/nested_group/nested_formats.html 
b/tp/tests/nested_formats/res_parser/nested_group/nested_formats.html
index e341972fd4..5a6e50990f 100644
--- a/tp/tests/nested_formats/res_parser/nested_group/nested_formats.html
+++ b/tp/tests/nested_formats/res_parser/nested_group/nested_formats.html
@@ -43,7 +43,7 @@ ul.mark-bullet {list-style-type: disc}
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="Test-nested-group">Test nested group</h1>
 
 
diff --git 
a/tp/tests/nested_formats/res_parser/nested_itemize/nested_formats.html 
b/tp/tests/nested_formats/res_parser/nested_itemize/nested_formats.html
index f05a3d56c9..363bd81db6 100644
--- a/tp/tests/nested_formats/res_parser/nested_itemize/nested_formats.html
+++ b/tp/tests/nested_formats/res_parser/nested_itemize/nested_formats.html
@@ -43,7 +43,7 @@ ul.mark-bullet {list-style-type: disc}
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="Test-nested-itemize">Test nested itemize</h1>
 
 
diff --git a/tp/tests/nested_formats/res_parser/nested_menu/nested_formats.html 
b/tp/tests/nested_formats/res_parser/nested_menu/nested_formats.html
index e52a731802..1da778b684 100644
--- a/tp/tests/nested_formats/res_parser/nested_menu/nested_formats.html
+++ b/tp/tests/nested_formats/res_parser/nested_menu/nested_formats.html
@@ -44,7 +44,7 @@ ul.mark-bullet {list-style-type: disc}
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="Test-nested-menu">Test nested menu</h1>
 
 
diff --git 
a/tp/tests/nested_formats/res_parser/nested_multitable/nested_formats.html 
b/tp/tests/nested_formats/res_parser/nested_multitable/nested_formats.html
index 36227788ac..a67edc3c67 100644
--- a/tp/tests/nested_formats/res_parser/nested_multitable/nested_formats.html
+++ b/tp/tests/nested_formats/res_parser/nested_multitable/nested_formats.html
@@ -43,7 +43,7 @@ ul.mark-bullet {list-style-type: disc}
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="Test-nested-multitable">Test nested multitable</h1>
 
 
diff --git 
a/tp/tests/nested_formats/res_parser/nested_quotation/nested_formats.html 
b/tp/tests/nested_formats/res_parser/nested_quotation/nested_formats.html
index 5aa360e1c0..9c5337e0af 100644
--- a/tp/tests/nested_formats/res_parser/nested_quotation/nested_formats.html
+++ b/tp/tests/nested_formats/res_parser/nested_quotation/nested_formats.html
@@ -43,7 +43,7 @@ ul.mark-bullet {list-style-type: disc}
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="Test-nested-quotation">Test nested quotation</h1>
 
 
diff --git 
a/tp/tests/nested_formats/res_parser/nested_table/nested_formats.html 
b/tp/tests/nested_formats/res_parser/nested_table/nested_formats.html
index f19291c887..c56518eb03 100644
--- a/tp/tests/nested_formats/res_parser/nested_table/nested_formats.html
+++ b/tp/tests/nested_formats/res_parser/nested_table/nested_formats.html
@@ -43,7 +43,7 @@ ul.mark-bullet {list-style-type: disc}
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="Test-nested-table">Test nested table</h1>
 
 
diff --git 
a/tp/tests/sectioning/res_parser/sectioning_directions/sectioning.html 
b/tp/tests/sectioning/res_parser/sectioning_directions/sectioning.html
index 9e3095e950..6827e5a863 100644
--- a/tp/tests/sectioning/res_parser/sectioning_directions/sectioning.html
+++ b/tp/tests/sectioning/res_parser/sectioning_directions/sectioning.html
@@ -24,7 +24,7 @@ ul.toc-numbered-mark {list-style: none}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Up</td>
@@ -165,7 +165,7 @@ description here
 </pre></th></tr></table>
 
 <hr style="height: 6px;">
-<div class="chapter" id="First-node">
+<div class="chapter-level-extent" id="First-node">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Up</td>
@@ -287,7 +287,7 @@ description here
 </pre></th></tr></table>
 
 <hr>
-<div class="unnumberedsec" id="unnumbered">
+<div class="unnumberedsec-level-extent" id="unnumbered">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Up</td>
@@ -408,7 +408,7 @@ description here
 </table>
 
 <hr>
-<div class="unnumberedsubsec" id="unnumbered-sub">
+<div class="unnumberedsubsec-level-extent" id="unnumbered-sub">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Up</td>
@@ -519,7 +519,7 @@ description here
 
 <hr>
 </div>
-<div class="subsection" id="numbered-sub">
+<div class="subsection-level-extent" id="numbered-sub">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Up</td>
@@ -630,7 +630,7 @@ description here
 
 <hr>
 </div>
-<div class="unnumberedsubsec" id="unnumbered-sub2">
+<div class="unnumberedsubsec-level-extent" id="unnumbered-sub2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Up</td>
@@ -741,7 +741,7 @@ description here
 
 <hr>
 </div>
-<div class="subsection" id="numbered-sub2">
+<div class="subsection-level-extent" id="numbered-sub2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Up</td>
@@ -853,7 +853,7 @@ description here
 <hr>
 </div>
 </div>
-<div class="unnumberedsec" id="unnumbered2">
+<div class="unnumberedsec-level-extent" id="unnumbered2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Up</td>
@@ -968,7 +968,7 @@ description here
 </table>
 
 <hr>
-<div class="subsection" id="numbered-sub3">
+<div class="subsection-level-extent" id="numbered-sub3">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Up</td>
@@ -1081,7 +1081,7 @@ description here
 <hr>
 </div>
 </div>
-<div class="section" id="numbered">
+<div class="section-level-extent" id="numbered">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Up</td>
@@ -1196,7 +1196,7 @@ description here
 <hr>
 </div>
 </div>
-<div class="chapter" id="Second-node">
+<div class="chapter-level-extent" id="Second-node">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Up</td>
@@ -1312,7 +1312,7 @@ description here
 </p>
 <hr>
 </div>
-<div class="unnumbered" id="Third-node-unnumbered">
+<div class="unnumbered-level-extent" id="Third-node-unnumbered">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Up</td>
diff --git 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/First-node.html
 
b/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/First-node.html
index c8847fbfaa..7ac55cb77c 100644
--- 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/First-node.html
+++ 
b/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/First-node.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="First-node">
+<div class="chapter-level-extent" id="First-node">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Up</td>
@@ -249,7 +249,7 @@ span.program-in-footer {font-size: smaller}
 </pre></th></tr></table>
 
 <hr>
-<div class="unnumberedsec" id="unnumbered">
+<div class="unnumberedsec-level-extent" id="unnumbered">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Up</td>
@@ -474,7 +474,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr>
-<div class="unnumberedsubsec" id="unnumbered-sub">
+<div class="unnumberedsubsec-level-extent" id="unnumbered-sub">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Up</td>
@@ -689,7 +689,7 @@ span.program-in-footer {font-size: smaller}
 
 <hr>
 </div>
-<div class="subsection" id="numbered-sub">
+<div class="subsection-level-extent" id="numbered-sub">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Up</td>
@@ -904,7 +904,7 @@ span.program-in-footer {font-size: smaller}
 
 <hr>
 </div>
-<div class="unnumberedsubsec" id="unnumbered-sub2">
+<div class="unnumberedsubsec-level-extent" id="unnumbered-sub2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Up</td>
@@ -1119,7 +1119,7 @@ span.program-in-footer {font-size: smaller}
 
 <hr>
 </div>
-<div class="subsection" id="numbered-sub2">
+<div class="subsection-level-extent" id="numbered-sub2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Up</td>
@@ -1335,7 +1335,7 @@ span.program-in-footer {font-size: smaller}
 <hr>
 </div>
 </div>
-<div class="unnumberedsec" id="unnumbered2">
+<div class="unnumberedsec-level-extent" id="unnumbered2">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Up</td>
@@ -1554,7 +1554,7 @@ span.program-in-footer {font-size: smaller}
 </table>
 
 <hr>
-<div class="subsection" id="numbered-sub3">
+<div class="subsection-level-extent" id="numbered-sub3">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Up</td>
@@ -1771,7 +1771,7 @@ span.program-in-footer {font-size: smaller}
 <hr>
 </div>
 </div>
-<div class="section" id="numbered">
+<div class="section-level-extent" id="numbered">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Up</td>
diff --git 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/Second-node.html
 
b/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/Second-node.html
index c14b709c16..d551413e8e 100644
--- 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/Second-node.html
+++ 
b/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/Second-node.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="chapter" id="Second-node">
+<div class="chapter-level-extent" id="Second-node">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Up</td>
diff --git 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/Third-node-unnumbered.html
 
b/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/Third-node-unnumbered.html
index 9c73f1767f..79742464dc 100644
--- 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/Third-node-unnumbered.html
+++ 
b/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/Third-node-unnumbered.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="unnumbered" id="Third-node-unnumbered">
+<div class="unnumbered-level-extent" id="Third-node-unnumbered">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Up</td>
diff --git 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/index.html 
b/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/index.html
index 13991d9c6f..08a0e4ff48 100644
--- 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/index.html
+++ 
b/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/index.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Up</td>
diff --git a/tp/tests/tex_html/res_parser/block_EOL_tex/block_EOL.html 
b/tp/tests/tex_html/res_parser/block_EOL_tex/block_EOL.html
index e4fde67fc6..403f30c51a 100644
--- a/tp/tests/tex_html/res_parser/block_EOL_tex/block_EOL.html
+++ b/tp/tests/tex_html/res_parser/block_EOL_tex/block_EOL.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="Test-for-end-of-lines-and-block-commands">Test for end of 
lines and block commands</h1>
 
 <h2 class="heading" id="html">html</h2>
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html 
b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
index b387567f54..442a980f45 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
@@ -829,7 +829,7 @@ ul.mark-none {list-style-type: none}
 
 <body lang="en"  background="../singular_images/Mybg.png">
 
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html 
b/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
index b7913082f8..44cce7362c 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
@@ -812,7 +812,7 @@ h1.centerchap {text-align:center}
 
 <body lang="en"  background="../singular_images/Mybg.png">
 
-<div class="centerchap" id="chapter2">
+<div class="centerchap-level-extent" id="chapter2">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/index.htm 
b/tp/tests/tex_html/res_parser/formatting_singular/index.htm
index 298ee56999..81f9214e45 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/index.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/index.htm
@@ -817,7 +817,7 @@ pre.menu-comment-preformatted {font-family: serif}
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git 
a/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html 
b/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html
index 16158a3c33..f6a16bfd01 100644
--- 
a/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html
+++ 
b/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html
@@ -811,7 +811,7 @@ pre.menu-comment-preformatted {font-family: serif}
 
 <body lang="en"  background="../singular_images/Mybg.png">
 
-<div class="section" id="s_002d_002dect_002cion">
+<div class="section-level-extent" id="s_002d_002dect_002cion">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/subsection.html 
b/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
index 95e2ca35e8..20f209a3a6 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
@@ -810,7 +810,7 @@ truc: after a deff item
 
 <body lang="en"  background="../singular_images/Mybg.png">
 
-<div class="subsection" id="subsection">
+<div class="subsection-level-extent" id="subsection">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git 
a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
 
b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index 4e37e10a2c..09c425b84e 100644
--- 
a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++ 
b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -810,7 +810,7 @@ truc: after a deff item
 
 <body lang="en"  background="../singular_images/Mybg.png">
 
-<div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
+<div class="subsubsection-level-extent" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git 
a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
 
b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index b6d899478d..5cb4361ecc 100644
--- 
a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++ 
b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -810,7 +810,7 @@ truc: after a deff item
 
 <body lang="en"  background="../singular_images/Mybg.png">
 
-<div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
+<div class="subsubsection-level-extent" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git a/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed.html 
b/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed.html
index 70e2328ab0..3181ceba2e 100644
--- a/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed.html
+++ b/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="chapter" id="Top">
+<div class="chapter-level-extent" id="Top">
 
 <p><SPAN CLASS="MATH"><IMG
  STYLE="height: 2.26ex; vertical-align: -0.31ex; " SRC="math_not_closed_1.svg"
diff --git a/tp/tests/tex_html/res_parser/simplest_httex/simplest.html 
b/tp/tests/tex_html/res_parser/simplest_httex/simplest.html
index 15abd6c801..f3163c6a59 100644
--- a/tp/tests/tex_html/res_parser/simplest_httex/simplest.html
+++ b/tp/tests/tex_html/res_parser/simplest_httex/simplest.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 
 <body lang="en">
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#Chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -35,7 +35,7 @@ span.program-in-footer {font-size: smaller}
 <h1 class="top" id="top-section">top section</h1>
 
 <hr style="height: 6px;">
-<div class="chapter" id="Chapter">
+<div class="chapter-level-extent" id="Chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
diff --git a/tp/tests/tex_html/res_parser/tex/tex.html 
b/tp/tests/tex_html/res_parser/tex/tex.html
index a3479fe290..c9d247ed8f 100644
--- a/tp/tests/tex_html/res_parser/tex/tex.html
+++ b/tp/tests/tex_html/res_parser/tex/tex.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="Tests">Tests</h1>
 
 <p>Now tex on the same line 
diff --git a/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex.html 
b/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex.html
index b4f95515ef..8ab596df4e 100644
--- a/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex.html
+++ b/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex.html
@@ -46,7 +46,7 @@ class="cmmi-10">t</span>)  math.
 </p><hr>
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="The-title">The title</h1>
 
 
diff --git a/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex.html 
b/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex.html
index 20424912e5..e4d64a3357 100644
--- a/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex.html
+++ b/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex.html
@@ -51,7 +51,7 @@ $">
 </p><hr>
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="The-title">The title</h1>
 
 <DIV CLASS="displaymath">
diff --git a/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign.html 
b/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign.html
index 419b66f3ef..0ed8e07c23 100644
--- a/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign.html
+++ b/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="Tests">Tests</h1>
 
 
diff --git a/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign.html 
b/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign.html
index 1a2c35ad19..d29d684803 100644
--- a/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign.html
+++ b/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="Tests">Tests</h1>
 
 <DIV CLASS="displaymath">
diff --git a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef.html 
b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef.html
index 450baef45d..056597b817 100644
--- a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef.html
+++ b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="Tests">Tests</h1>
 
    
diff --git a/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef.html 
b/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef.html
index 276eb34279..6c7b181fc0 100644
--- a/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef.html
+++ b/tp/tests/tex_html/res_parser/tex_gdef_l2h/tex_gdef.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="Tests">Tests</h1>
 
   
diff --git a/tp/tests/tex_html/res_parser/tex_gdef_mathjax/tex_gdef.html 
b/tp/tests/tex_html/res_parser/tex_gdef_mathjax/tex_gdef.html
index 8f616e66d5..9c75996a8b 100644
--- a/tp/tests/tex_html/res_parser/tex_gdef_mathjax/tex_gdef.html
+++ b/tp/tests/tex_html/res_parser/tex_gdef_mathjax/tex_gdef.html
@@ -32,7 +32,7 @@ MathJax = {
 </head>
 
 <body lang="en" class="tex2jax_ignore">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="Tests">Tests</h1>
 
   \gdef\Desig{\buildrel \rm def \over \equiv}
diff --git a/tp/tests/tex_html/res_parser/tex_httex/tex.html 
b/tp/tests/tex_html/res_parser/tex_httex/tex.html
index 50545ebf69..f6cc8b0f03 100644
--- a/tp/tests/tex_html/res_parser/tex_httex/tex.html
+++ b/tp/tests/tex_html/res_parser/tex_httex/tex.html
@@ -24,7 +24,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="Tests">Tests</h1>
 
 <p>Now tex on the same line 
diff --git a/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying.html 
b/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying.html
index 932b71e036..2d1fe181ee 100644
--- a/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying.html
+++ b/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying.html
@@ -32,7 +32,7 @@ span.program-in-footer {font-size: smaller}
 
 
 
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Next section in 
reading order"> &gt; </a>]</td>
@@ -85,7 +85,7 @@ $">
 </p>
 
 <hr style="height: 6px;">
-<div class="chapter" id="chapter">
+<div class="chapter-level-extent" id="chapter">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this 
chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Previous section in 
reading order"> &lt; </a>]</td>
diff --git a/tp/tests/tex_html/res_parser/tex_notex/tex.html 
b/tp/tests/tex_html/res_parser/tex_notex/tex.html
index 2f107102ab..61da4fd4c5 100644
--- a/tp/tests/tex_html/res_parser/tex_notex/tex.html
+++ b/tp/tests/tex_html/res_parser/tex_notex/tex.html
@@ -22,7 +22,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="top" id="Top">
+<div class="top-level-extent" id="Top">
 <h1 class="top" id="Tests">Tests</h1>
 
 <p>Now tex on the same line Some text one the line following @end tex



reply via email to

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