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: Gavin D. Smith
Subject: branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_heading_command): Only output a <div> for a @node with an associated section. Otherwise, output a <span> as an anchor.
Date: Sun, 14 Feb 2021 16:46:25 -0500

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

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 08523f5  * tp/Texinfo/Convert/HTML.pm (_convert_heading_command): Only 
output a <div> for a @node with an associated section. Otherwise, output a 
<span> as an anchor.
08523f5 is described below

commit 08523f56f22994307f59267035e4eaea520cd6b1
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Feb 14 21:45:05 2021 +0000

    * tp/Texinfo/Convert/HTML.pm (_convert_heading_command):
    Only output a <div> for a @node with an associated section.
    Otherwise, output a <span> as an anchor.
---
 ChangeLog                                          |   6 +
 tp/Texinfo/Convert/HTML.pm                         |  32 ++---
 tp/t/results/converters_tests/accent.pl            |   5 +-
 tp/t/results/converters_tests/accentenc.pl         |   5 +-
 .../converters_tests/accentenc_enable_encoding.pl  |   5 +-
 .../converters_tests/accentenc_no_entity.pl        |   5 +-
 .../results/converters_tests/at_commands_in_raw.pl |   5 +-
 .../converters_tests/at_commands_in_refs.pl        | 140 ++++++++----------
 .../----_0021---_002e--_002e-_003f-_0040.html      |   5 +-
 .../res_html/-_0040-_007b_007d-_002e-.html         |   5 +-
 .../res_html/-_007b-_007d.html                     |   5 +-
 .../res_html/8_002e27in.html                       |   5 +-
 .../AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html       |   5 +-
 .../res_html/AAA-AAA-BBB.html                      |   5 +-
 .../res_html/CCC-CCC-DDD.html                      |   5 +-
 ...eX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html |   5 +-
 .../res_html/_0040-_007b-_007d-_005c-_0023.html    |   5 +-
 ...027-_002d_002d_002d-_002d_002d-_0060-_0027.html |   5 +-
 .../_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html |   5 +-
 .../_00ab-_00bb-_00ab-_00bb-_2039-_203a.html       |   5 +-
 .../_201c-_201d-_2018-_2019-_201e-_201a.html       |   5 +-
 .../res_html/_21d2-_00b0-a-b--aa.html              |   5 +-
 ...ror_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html |   5 +-
 .../res_html/_2265-_2264-_2192.html                |   5 +-
 .../res_html/a-e-i-a-a-e-c-e-e-e-e.html            |   5 +-
 ...e-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html |   5 +-
 .../res_html/e-e-e-e-e-j-ee.html                   |   5 +-
 ...-code-option-samp-command-file-C_002dx-ESC.html |   5 +-
 .../res_html/f_002d_002dile1-f_002d_002dile.html   |   5 +-
 .../res_html/gH-3rd.html                           |   5 +-
 ..._005faaa-url-_002fman_002ecgi_002f1_002fls.html |   5 +-
 .../at_commands_in_refs_latin1/res_html/i-E-C.html |   5 +-
 .../at_commands_in_refs_latin1/res_html/index.html |   5 +-
 .../res_html/indicateurl.html                      |   5 +-
 .../res_html/sansserif-slanted.html                |   5 +-
 ...eone_0040somewher-no_005fexplain_0040there.html |   5 +-
 .../----_0021---_002e--_002e-_003f-_0040.html      |   5 +-
 .../res_html/-_0040-_007b_007d-_002e-.html         |   5 +-
 .../res_html/-_007b-_007d.html                     |   5 +-
 .../res_html/8_002e27in.html                       |   5 +-
 .../AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html       |   5 +-
 .../res_html/AAA-AAA-BBB.html                      |   5 +-
 .../res_html/CCC-CCC-DDD.html                      |   5 +-
 ...eX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html |   5 +-
 .../res_html/_0040-_007b-_007d-_005c-_0023.html    |   5 +-
 ...027-_002d_002d_002d-_002d_002d-_0060-_0027.html |   5 +-
 .../_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html |   5 +-
 .../_00ab-_00bb-_00ab-_00bb-_2039-_203a.html       |   5 +-
 .../_201c-_201d-_2018-_2019-_201e-_201a.html       |   5 +-
 .../res_html/_21d2-_00b0-a-b--aa.html              |   5 +-
 ...ror_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html |   5 +-
 .../res_html/_2265-_2264-_2192.html                |   5 +-
 .../res_html/a-e-i-a-a-e-c-e-e-e-e.html            |   5 +-
 ...e-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html |   5 +-
 .../res_html/e-e-e-e-e-j-ee.html                   |   5 +-
 ...-code-option-samp-command-file-C_002dx-ESC.html |   5 +-
 .../res_html/f_002d_002dile1-f_002d_002dile.html   |   5 +-
 .../at_commands_in_refs_utf8/res_html/gH-3rd.html  |   5 +-
 ..._005faaa-url-_002fman_002ecgi_002f1_002fls.html |   5 +-
 .../at_commands_in_refs_utf8/res_html/i-E-C.html   |   5 +-
 .../at_commands_in_refs_utf8/res_html/index.html   |   5 +-
 .../res_html/indicateurl.html                      |   5 +-
 .../res_html/sansserif-slanted.html                |   5 +-
 ...eone_0040somewher-no_005fexplain_0040there.html |   5 +-
 .../res_html/a-e-i-o-u-A-E-I-O-U.html              |   5 +-
 .../res_html/a-e-i-o-u-y-A-E-I-O-U.html            |   5 +-
 .../char_latin1_latin1_in_refs/res_html/a-e-u.html |   5 +-
 .../char_latin1_latin1_in_refs/res_html/c.html     |   5 +-
 .../char_latin1_latin1_in_refs/res_html/e.html     |   5 +-
 .../char_latin1_latin1_in_refs/res_html/index.html |   5 +-
 .../res_html/a-e-i-o-u-A-E-I-O-U.html              |   5 +-
 .../res_html/a-e-i-o-u-y-A-E-I-O-U.html            |   5 +-
 .../char_latin1_utf8_in_refs/res_html/a-e-u.html   |   5 +-
 .../char_latin1_utf8_in_refs/res_html/c.html       |   5 +-
 .../char_latin1_utf8_in_refs/res_html/e.html       |   5 +-
 .../char_latin1_utf8_in_refs/res_html/index.html   |   5 +-
 .../res_html/A-a-_002c-E-e.html                    |   5 +-
 .../char_latin2_latin2_in_refs/res_html/index.html |   5 +-
 tp/t/results/converters_tests/complex_nestings.pl  |   5 +-
 .../results/converters_tests/footnote_no_number.pl |   5 +-
 .../footnote_no_number_separate.pl                 |   5 +-
 tp/t/results/converters_tests/image_formatting.pl  |   5 +-
 .../index_entry_in_preformatted.pl                 |   5 +-
 .../japanese_shift_jis/res_html/Introduction.html  |   5 +-
 .../japanese_shift_jis/res_html/Preface.html       |   5 +-
 .../japanese_shift_jis/res_html/index.html         |   5 +-
 .../printindex_merged_indices_code_style.pl        |   5 +-
 tp/t/results/converters_tests/ref_in_sectioning.pl |  51 +++----
 tp/t/results/converters_tests/refs_formatting.pl   |   5 +-
 .../res_html/DiYiZhang_0028First-Chapter_0029.html |   5 +-
 .../sample_utf8/res_html/Index-node.html           |   5 +-
 .../res_html/Second-Chapter-AE-AE-ae-ae.html       |   5 +-
 .../sample_utf8/res_html/index.html                |   5 +-
 .../some_at_commands_in_ref_nodes.pl               |  10 +-
 .../converters_tests/spaces_in_empty_node_names.pl |  14 +-
 .../converters_tests/spaces_in_node_names.pl       |  20 ++-
 .../converters_tests/test_deftypefnnewline.pl      |   5 +-
 .../converters_tests/things_before_setfilename.pl  |   5 +-
 tp/t/results/converters_tests/top_in_ref.pl        |   5 +-
 .../converters_tests/top_in_ref_keep_top.pl        |   5 +-
 tp/t/results/converters_tests/weird_accents.pl     |   5 +-
 .../weird_accents_disable_encoding.pl              |   5 +-
 tp/t/results/coverage/commands.pl                  |   5 +-
 .../coverage/punctuation_in_line_commands.pl       |  10 +-
 tp/t/results/coverage_braces/footnote_no_node.pl   |   5 +-
 .../results/coverage_braces/heading_in_footnote.pl |   5 +-
 .../coverage_braces/inforef_too_much_args.pl       |   5 +-
 tp/t/results/coverage_braces/test_image.pl         |  10 +-
 .../coverage_braces/two_footnotes_in_nodes.pl      |  20 ++-
 .../two_footnotes_in_nodes_separate.pl             |  20 ++-
 tp/t/results/coverage_braces/verb_in_xref.pl       |   5 +-
 .../def/all_commands_delimiters_printindex.pl      |  20 ++-
 tp/t/results/def/all_commands_printindex.pl        |  20 ++-
 tp/t/results/def/space_in_def_for_index.pl         |   5 +-
 tp/t/results/float/anchor_in_caption.pl            |   5 +-
 tp/t/results/float/cindex_in_caption.pl            |   5 +-
 .../results/float/comment_space_comand_in_float.pl |   5 +-
 tp/t/results/float/complex_float.pl                |  10 +-
 tp/t/results/float/float_copying.pl                |  10 +-
 tp/t/results/float/footnote_in_caption.pl          |   5 +-
 .../results/float/footnote_in_caption_and_error.pl |   5 +-
 .../float/numbering_captions_listoffloats.pl       |  45 +++---
 tp/t/results/formatting/cond.pl                    |   5 +-
 .../results/formatting/cond_ifhtml_ifinfo_iftex.pl |   5 +-
 .../cond_no-ifhtml_no-ifinfo_no-iftex.pl           |   5 +-
 .../res_html/documentlanguage_set.html             |   5 +-
 .../res_html/documentlanguage_set.html             |   5 +-
 .../float_copying/res_html/Copying-and-floats.html |  15 +-
 .../formatting/float_copying/res_html/index.html   |   5 +-
 .../res_html/simplest.html                         |   5 +-
 .../simplest_test_prefix/res_html/truc.html        |   5 +-
 tp/t/results/formatting/texi_bib_example.pl        |  15 +-
 tp/t/results/formatting/texi_cond.pl               |   5 +-
 tp/t/results/formatting/texi_glossary.pl           |  10 +-
 tp/t/results/heading/heading_in_copying.pl         |  13 +-
 tp/t/results/heading/heading_in_example.pl         |   5 +-
 tp/t/results/heading/heading_in_quotation.pl       |   5 +-
 .../character_number_leading_toc_stoc.pl           |  14 +-
 tp/t/results/html_tests/check_htmlxref.pl          |  10 +-
 tp/t/results/html_tests/documentdescription.pl     |   5 +-
 .../empty_lines_at_beginning_no_setfilename.pl     |   5 +-
 tp/t/results/html_tests/html_in_copying.pl         |   5 +-
 .../results/html_tests/index_and_node_same_name.pl |   8 +-
 tp/t/results/html_tests/index_below.pl             |  15 +-
 .../res_html/circumflex.html                       |  10 +-
 .../redirection_same_labels/res_html/index.html    |   5 +-
 .../redirection_same_labels/res_html/umlaut.html   |  15 +-
 tp/t/results/html_tests/ref_in_preformatted.pl     |  10 +-
 tp/t/results/html_tests/shortcontents_no_top.pl    |  11 +-
 tp/t/results/html_tests/simple_menu.pl             |   5 +-
 .../html_tests/test_xrefautomaticsectiontitle.pl   |  10 +-
 .../text_before_top_and_contents_after_title.pl    |   8 +-
 tp/t/results/html_tests/titles.pl                  |   5 +-
 .../htmlxref/htmlxref/res_html/test_refs.html      |  34 ++---
 ...25_0026_0027_0028_0029_002a_002b_002d_002e.html |   5 +-
 ...3f_005b_005c_005d_005e_005f_0060_007c_007e.html |   5 +-
 .../htmlxref/htmlxref_nodes/res_html/index.html    |  20 ++-
 .../htmlxref_nodes/res_html/local-node.html        |   5 +-
 .../htmlxref_nodes/res_html/other-nodes.html       |   5 +-
 .../htmlxref_only_mono/res_html/test_refs.html     |  34 ++---
 ...25_0026_0027_0028_0029_002a_002b_002d_002e.html |   5 +-
 ...3f_005b_005c_005d_005e_005f_0060_007c_007e.html |   5 +-
 .../htmlxref_only_mono_nodes/res_html/index.html   |  20 ++-
 .../res_html/local-node.html                       |   5 +-
 .../res_html/other-nodes.html                      |   5 +-
 .../htmlxref_only_split/res_html/test_refs.html    |  34 ++---
 ...25_0026_0027_0028_0029_002a_002b_002d_002e.html |   5 +-
 ...3f_005b_005c_005d_005e_005f_0060_007c_007e.html |   5 +-
 .../htmlxref_only_split_nodes/res_html/index.html  |  20 ++-
 .../res_html/local-node.html                       |   5 +-
 .../res_html/other-nodes.html                      |   5 +-
 tp/t/results/indices/def_syn_indices.pl            |   5 +-
 ...default_cp_index_and_one_letter_syncodeindex.pl |   5 +-
 tp/t/results/indices/double_index_entry.pl         |  10 +-
 tp/t/results/indices/double_syncodeindex.pl        |   5 +-
 tp/t/results/indices/empty_cindex_entry.pl         |   5 +-
 tp/t/results/indices/empty_index_entry.pl          |   5 +-
 tp/t/results/indices/empty_string_index_entry.pl   |   5 +-
 .../encoding_index_ascii/res_html/index.html       |   5 +-
 .../res_html/index.html                            |   5 +-
 .../encoding_index_latin1/res_html/index.html      |   5 +-
 .../res_html/index.html                            |   5 +-
 .../encoding_index_utf8/res_html/index.html        |   5 +-
 .../res_html/index.html                            |   5 +-
 tp/t/results/indices/explicit_sort_key.pl          |   5 +-
 tp/t/results/indices/ftable_vtable.pl              |   5 +-
 tp/t/results/indices/image_lines_count.pl          |   5 +-
 tp/t/results/indices/image_text_lines_count.pl     |   5 +-
 tp/t/results/indices/index_entries_locations.pl    |   5 +-
 .../indices/index_entry_before_first_node.pl       | Bin 9431 -> 9419 bytes
 tp/t/results/indices/index_entry_before_node.pl    |  15 +-
 tp/t/results/indices/index_entry_in_footnote.pl    |   5 +-
 .../index_entry_in_footnote_different_node_end.pl  |  10 +-
 .../indices/index_entry_in_footnote_separate.pl    |  10 +-
 .../indices/printindex_index_entry_in_copying.pl   |  10 +-
 ...rintindex_index_entry_in_copying_in_footnote.pl |  10 +-
 ...ndex_index_entry_in_copying_no_insertcopying.pl |  10 +-
 .../indices/printindex_with_space_before.pl        | Bin 9000 -> 8988 bytes
 .../indices/same_index_entry_merged_indices.pl     |   5 +-
 tp/t/results/indices/seealso_duplicate.pl          |   5 +-
 tp/t/results/indices/seeentry.pl                   |   5 +-
 tp/t/results/indices/subentries.pl                 |   5 +-
 tp/t/results/indices/subentry_and_sortas.pl        |  10 +-
 tp/t/results/indices/syncode_index_print_both.pl   |   5 +-
 tp/t/results/indices/syncodeindex_to_plain.pl      |   5 +-
 tp/t/results/indices/transparent_sort_chars.pl     |   5 +-
 tp/t/results/indices/w_lines_count.pl              |   5 +-
 tp/t/results/languages/appendix_translated.pl      |   8 +-
 tp/t/results/languages/command_translated.pl       |   5 +-
 tp/t/results/languages/multiple.pl                 |   5 +-
 .../res_html/multiple_lang_chapters.html           |  30 ++--
 .../res_html/multiple_lang_chapters.html           |  30 ++--
 tp/t/results/languages/unknown_language.pl         |   5 +-
 tp/t/results/languages/unknown_region.pl           |   5 +-
 .../layout/navigation/res_html/navigation.html     |  20 ++-
 .../navigation_chapter/res_html/chapter.html       |  15 +-
 .../layout/navigation_chapter/res_html/index.html  |   5 +-
 .../res_html/chapter.html                          |  15 +-
 .../res_html/index.html                            |   5 +-
 .../res_html/chapter.html                          |  15 +-
 .../res_html/index.html                            |   5 +-
 .../res_html/chapter.html                          |  15 +-
 .../res_html/index.html                            |   5 +-
 .../navigation_no_header/res_html/navigation.html  |  20 ++-
 .../res_html/navigation.html                       |  20 ++-
 .../layout/navigation_node/res_html/chapter.html   |   5 +-
 .../layout/navigation_node/res_html/index.html     |   5 +-
 .../layout/navigation_node/res_html/section.html   |   5 +-
 .../navigation_node/res_html/subsection.html       |   5 +-
 .../res_html/chapter.html                          |   5 +-
 .../navigation_node_no_header/res_html/index.html  |   5 +-
 .../res_html/section.html                          |   5 +-
 .../res_html/subsection.html                       |   5 +-
 .../res_html/chapter.html                          |   5 +-
 .../res_html/index.html                            |   5 +-
 .../res_html/section.html                          |   5 +-
 .../res_html/subsection.html                       |   5 +-
 .../navigation_node_vertical/res_html/chapter.html |   5 +-
 .../navigation_node_vertical/res_html/index.html   |   5 +-
 .../navigation_node_vertical/res_html/section.html |   5 +-
 .../res_html/subsection.html                       |   5 +-
 .../navigation_section/res_html/chapter.html       |   5 +-
 .../layout/navigation_section/res_html/index.html  |   5 +-
 .../navigation_section/res_html/section.html       |  10 +-
 .../res_html/chapter.html                          |   5 +-
 .../res_html/index.html                            |   5 +-
 .../res_html/section.html                          |  10 +-
 .../res_html/chapter.html                          |   5 +-
 .../res_html/index.html                            |   5 +-
 .../res_html/section.html                          |  10 +-
 .../res_html/chapter.html                          |   5 +-
 .../res_html/index.html                            |   5 +-
 .../res_html/section.html                          |  10 +-
 .../navigation_vertical/res_html/navigation.html   |  20 ++-
 .../no_monolithic/res_html/no_monolithic.html      |  10 +-
 .../menu/block_commands_in_menu_description.pl     |   5 +-
 tp/t/results/menu/comment_on_menu_line.pl          |  10 +-
 tp/t/results/menu/detailmenu_on_subnodes.pl        |  30 ++--
 tp/t/results/menu/detailmenu_unknown_node.pl       |   5 +-
 tp/t/results/menu/entry_after_detailmenu.pl        |  15 +-
 tp/t/results/menu/example_in_menu_description.pl   |   5 +-
 tp/t/results/menu/formats_in_menu.pl               |   5 +-
 tp/t/results/menu/inlineraw_in_menu_description.pl |   5 +-
 tp/t/results/menu/invalid_info_menu_entry.pl       |   5 +-
 tp/t/results/menu/menu_in_example.pl               |   5 +-
 tp/t/results/menu/menu_pointing_to_anchor.pl       |   5 +-
 tp/t/results/menu/menu_title_before_entries.pl     |  10 +-
 tp/t/results/menu/no_colon_in_menu.pl              |   5 +-
 tp/t/results/menu/reference_to_external_manual.pl  |   5 +-
 tp/t/results/menu/sc_in_menu.pl                    |  10 +-
 tp/t/results/menu/verb_in_menu_description.pl      |   5 +-
 .../codequoteundirected_codequotebacktick.pl       |   5 +-
 .../misc_commands/comment_space_command_on_line.pl |  10 +-
 .../no_empty_line_between_headings.pl              |  16 +--
 tp/t/results/misc_commands/ref_in_center.pl        |   5 +-
 tp/t/results/misc_commands/test_allowcodebreaks.pl |   5 +-
 tp/t/results/morecoverage/formatting_fr.pl         |  35 ++---
 tp/t/results/morecoverage/texi_formatting.pl       |  35 ++---
 .../res_html/double_index_entry.html               |   8 +-
 .../index_no_node/res_html/Chapter-2.html          |   5 +-
 .../index_no_node/res_html/Chapter.html            |   5 +-
 .../moreindices/index_no_node/res_html/index.html  |  10 +-
 .../index_no_node/res_html/unnumbered.html         |   5 +-
 .../moreindices/index_split/res_html/first.html    |  39 ++---
 .../moreindices/index_split/res_html/index.html    |   5 +-
 .../index_split/res_html/second-chapter.html       |   5 +-
 .../index_split_nodes/res_html/first.html          |   5 +-
 .../index_split_nodes/res_html/index.html          |   5 +-
 .../res_html/node-2-in-section-3.html              |   5 +-
 .../res_html/node-3-in-section-3.html              |   5 +-
 .../res_html/node-in-section-3.html                |   5 +-
 .../index_split_nodes/res_html/second-chapter.html |   5 +-
 .../index_split_nodes/res_html/section-1.html      |   5 +-
 .../index_split_nodes/res_html/section-2.html      |   5 +-
 .../index_split_nodes/res_html/section-3.html      |   5 +-
 .../index_split_nodes/res_html/subsection-1.html   |   5 +-
 .../index_split_nodes/res_html/subsection-2.html   |   5 +-
 .../res_html/first-before-top.html                 |  30 ++--
 .../nodes_before_top/res_html/index.html           |   5 +-
 .../res_html/nodes_before_top_and_sections.html    |  33 ++---
 .../nodes_before_top_no_nodes/res_html/index.html  |  23 ++-
 .../nodes_before_top_nodes/res_html/a-node.html    |   5 +-
 .../nodes_before_top_nodes/res_html/another.html   |   5 +-
 .../res_html/first-before-top.html                 |   5 +-
 .../nodes_before_top_nodes/res_html/first.html     |   5 +-
 .../nodes_before_top_nodes/res_html/index.html     |   5 +-
 .../res_html/node-in-menu-before-top.html          |   5 +-
 .../nodes_before_top_nodes/res_html/second.html    |   5 +-
 .../split_chapter_index/res_html/first.html        |  15 +-
 .../split_chapter_index/res_html/index.html        |   5 +-
 .../res_html/equivalent_nodes.html                 |  15 +-
 .../res_html/equivalent_nodes.html                 |  11 +-
 .../res_html/more_sections_than_nodes.html         |  65 ++++-----
 .../node_footnote_end/res_html/node_footnote.html  |  19 +--
 .../res_html/node_footnote.html                    |  19 +--
 .../node_footnote_use_node/res_html/a.html         |  15 +-
 .../node_footnote_use_node/res_html/chapter.html   |   5 +-
 .../node_footnote_use_node/res_html/index.html     |   5 +-
 .../res_html/nodes_after_top_before_chapter.html   |  13 +-
 .../res_html/index.html                            |  10 +-
 .../res_html/third-node.html                       |   5 +-
 .../res_html/index.html                            |  13 +-
 .../res_html/nodes_after_top_before_section.html   |  15 +-
 .../res_html/index.html                            |  15 +-
 .../res_html/placed_things_before_element.html     |   5 +-
 .../sectioning_frames/res_html/First-node.html     |  48 +++----
 .../sectioning_frames/res_html/Second-node.html    |   5 +-
 .../res_html/Third-node-unnumbered.html            |   8 +-
 .../sectioning_frames/res_html/index.html          |   5 +-
 .../res_html/top_node_up_explicit.html             |  10 +-
 .../res_html/top_node_up_implicit.html             |  10 +-
 .../res_html/two_footnotes_in_nodes.html           |  10 +-
 .../res_html/two_footnotes_in_nodes.html           |  10 +-
 tp/t/results/regions/anchor_in_copying.pl          |   5 +-
 .../regions/anchor_in_copying_in_footnote.pl       |   5 +-
 tp/t/results/regions/anchor_in_titlepage.pl        |   8 +-
 .../regions/anchor_in_titlepage_titlepage.pl       |   8 +-
 tp/t/results/regions/format_in_titlepage.pl        |   5 +-
 .../regions/format_in_titlepage_titlepage.pl       |   5 +-
 tp/t/results/regions/ref_in_copying.pl             |  10 +-
 tp/t/results/regions/today_in_copying.pl           |   5 +-
 tp/t/results/sectioning/anchor_in_footnote.pl      |  10 +-
 .../sectioning/anchor_in_footnote_separate.pl      |  10 +-
 tp/t/results/sectioning/anchor_zero.pl             |   5 +-
 .../sectioning/chapter_before_and_after_part.pl    |  11 +-
 tp/t/results/sectioning/chapter_before_part.pl     |   8 +-
 tp/t/results/sectioning/chapter_between_nodes.pl   |  13 +-
 .../chapter_node_before_and_after_part.pl          |  15 +-
 .../sectioning/character_and_spaces_in_node.pl     |  25 ++--
 .../sectioning/character_and_spaces_in_refs.pl     |  35 ++---
 ...25_0026_0027_0028_0029_002a_002b_002d_002e.html |   5 +-
 ...3f_005b_005c_005d_005e_005f_0060_007c_007e.html |   5 +-
 .../res_html/index.html                            |  15 +-
 .../res_html/local-node.html                       |   5 +-
 .../res_html/other-nodes.html                      |   5 +-
 tp/t/results/sectioning/contents.pl                |  35 ++---
 .../sectioning/contents_and_shortcontents.pl       |  35 ++---
 tp/t/results/sectioning/contents_in_html_text.pl   |  14 +-
 .../sectioning/contents_with_only_top_node.pl      |   5 +-
 .../results/sectioning/double_node_anchor_float.pl |  14 +-
 tp/t/results/sectioning/double_part.pl             |  18 +--
 tp/t/results/sectioning/double_top.pl              |   8 +-
 tp/t/results/sectioning/empty_top_node_up.pl       |  10 +-
 tp/t/results/sectioning/equivalent_labels.pl       |   5 +-
 tp/t/results/sectioning/equivalent_nodes.pl        |  10 +-
 .../results/sectioning/explicit_node_directions.pl |  15 +-
 tp/t/results/sectioning/external_node_in_menu.pl   |  15 +-
 tp/t/results/sectioning/internal_top_node_up.pl    |  10 +-
 tp/t/results/sectioning/next_in_menu_is_below.pl   |  20 ++-
 .../results/sectioning/no_argument_and_contents.pl |   6 +-
 tp/t/results/sectioning/no_menu.pl                 |  20 ++-
 .../sectioning/node_part_chapter_after_chapter.pl  |  18 +--
 .../sectioning/node_part_chapter_after_top.pl      |  13 +-
 .../node_up_direction_for_top_with_manual.pl       |   5 +-
 tp/t/results/sectioning/node_up_external_node.pl   |  10 +-
 .../nodes_after_top_before_chapter_nodes.pl        |  15 +-
 .../nodes_after_top_before_chapter_not_split.pl    |  15 +-
 ...ore_chapter_not_split_no_use_node_directions.pl |  15 +-
 .../nodes_after_top_before_chapter_sections.pl     |  15 +-
 .../nodes_after_top_before_section_nodes.pl        |  15 +-
 .../nodes_after_top_before_section_sections.pl     |  15 +-
 .../nodes_no_node_top_explicit_directions.pl       |  10 +-
 .../non_automatic_internal_top_node_up.pl          |  10 +-
 .../non_automatic_top_node_up_and_url.pl           |  10 +-
 .../sectioning/non_automatic_top_node_up_url.pl    |  10 +-
 .../one_node_explicit_directions_anchor.pl         |   5 +-
 tp/t/results/sectioning/one_subsection.pl          |   5 +-
 tp/t/results/sectioning/one_subsection_and_node.pl |   5 +-
 tp/t/results/sectioning/part_before_chapter.pl     |   8 +-
 tp/t/results/sectioning/part_before_section.pl     |   8 +-
 tp/t/results/sectioning/part_before_top.pl         |   8 +-
 tp/t/results/sectioning/part_chapter_after_top.pl  |  15 +-
 tp/t/results/sectioning/part_node_after_top.pl     |  13 +-
 tp/t/results/sectioning/part_node_before_top.pl    |  15 +-
 .../sectioning/part_node_chapter_after_top.pl      |  18 +--
 .../sectioning/part_node_chapter_appendix.pl       |  18 +--
 .../sectioning/part_node_chapter_node_appendix.pl  |  20 ++-
 .../sectioning/part_node_node_part_appendix.pl     |  23 ++-
 tp/t/results/sectioning/part_node_part_appendix.pl |  21 ++-
 .../sectioning/part_node_part_node_appendix.pl     |  25 ++--
 .../sectioning/placed_things_before_element.pl     |   5 +-
 .../sectioning/placed_things_before_node.pl        |   5 +-
 .../sectioning/protected_node_parentheses.pl       |  10 +-
 tp/t/results/sectioning/ref_to_top.pl              |   5 +-
 tp/t/results/sectioning/section_before_part.pl     |   8 +-
 tp/t/results/sectioning/section_before_top.pl      |  10 +-
 .../results/sectioning/section_below_unnumbered.pl |  15 +-
 .../sectioning/section_below_unnumbered_no_top.pl  |   8 +-
 .../sectioning/section_chapter_before_top_nodes.pl |  15 +-
 .../sectioning/section_in_unnumbered_info.pl       | 160 +++++++++------------
 .../sectioning/section_in_unnumbered_plaintext.pl  | 160 +++++++++------------
 .../results/sectioning/section_node_before_part.pl |   8 +-
 tp/t/results/sectioning/sections_test.pl           |  35 ++---
 .../sectioning/sections_test_no_use_nodes.pl       |  53 +++----
 ...ctions_test_no_use_nodes_use_node_directions.pl |  53 +++----
 .../setfilename_on_top_and_after_node.pl           |   5 +-
 tp/t/results/sectioning/shortcontents.pl           |  35 ++---
 tp/t/results/sectioning/space_in_node.pl           |  20 ++-
 .../sectioning/top_no_argument_and_content.pl      |   5 +-
 .../results/sectioning/top_no_argument_and_node.pl |   3 +-
 .../sectioning/top_no_argument_and_top_node.pl     |   3 +-
 .../sectioning/top_node_no_menu_direction.pl       |  10 +-
 tp/t/results/sectioning/top_node_part_top.pl       |   8 +-
 tp/t/results/sectioning/top_node_up_url.pl         |  10 +-
 tp/t/results/sectioning/top_without_node_nodes.pl  |  10 +-
 .../sectioning/top_without_node_sections.pl        |  10 +-
 .../res_html/a.html                                |   8 +-
 .../res_html/index.html                            |   5 +-
 .../res_html/n.html                                |   5 +-
 tp/t/results/sectioning/two_nodes_at_the_end.pl    |  20 ++-
 .../sectioning/two_nodes_between_chapters.pl       |  20 ++-
 .../sectioning/unnumbered_before_node_top_top.pl   |  10 +-
 .../sectioning/unnumbered_before_top_node.pl       |   8 +-
 .../unnumbered_top_without_node_nodes.pl           |  13 +-
 .../unnumbered_top_without_node_sections.pl        |  13 +-
 tp/t/results/xtable/block_commands_in_table.pl     |   5 +-
 .../contents_and_parts/contents_and_parts.html     |  30 ++--
 .../contents_at_begin/contents_at_begin.html       |  10 +-
 .../contents_at_begin.html                         |  10 +-
 .../contents_at_end/contents_at_end.html           |  10 +-
 .../contents_at_end_inline/contents_at_end.html    |  10 +-
 .../contents_in_middle_chapter.html                |  15 +-
 .../contents_in_middle_chapter.html                |  15 +-
 .../contents_in_middle_section.html                |  20 ++-
 .../contents_in_middle_section.html                |  20 ++-
 .../double_contents/double_contents.html           |  15 +-
 .../double_contents.html                           |  15 +-
 .../double_contents.html                           |  15 +-
 .../chapter.html                                   |  10 +-
 .../index.html                                     |   5 +-
 .../chapter.html                                   |   5 +-
 .../index.html                                     |   5 +-
 .../section.html                                   |   5 +-
 .../double_contents_chapter/chapter.html           |  10 +-
 .../res_parser/double_contents_chapter/index.html  |   5 +-
 .../double_contents_inline/double_contents.html    |  15 +-
 .../double_contents_inline_chapter/chapter.html    |  10 +-
 .../double_contents_inline_chapter/index.html      |   5 +-
 .../double_contents_inline_nodes/chapter.html      |   5 +-
 .../double_contents_inline_nodes/index.html        |   5 +-
 .../double_contents_inline_nodes/section.html      |   5 +-
 .../double_contents_inline_section/chapter.html    |   5 +-
 .../double_contents_inline_section/index.html      |   5 +-
 .../double_contents_inline_section/section.html    |   5 +-
 .../res_parser/double_contents_nodes/chapter.html  |   5 +-
 .../res_parser/double_contents_nodes/index.html    |   5 +-
 .../res_parser/double_contents_nodes/section.html  |   5 +-
 .../double_contents_section/chapter.html           |   5 +-
 .../res_parser/double_contents_section/index.html  |   5 +-
 .../double_contents_section/section.html           |   5 +-
 .../contents/res_parser/no_content/no_content.html |  10 +-
 .../no_content_do_contents/no_content.html         |  10 +-
 .../no_content_do_contents_inline/no_content.html  |  10 +-
 .../res_parser/no_content_inline/no_content.html   |  10 +-
 .../no_content_setcatpage.html                     |  10 +-
 .../no_content_setcatpage.html                     |  10 +-
 .../no_content_setcatpage.html                     |  10 +-
 .../no_content_setcatpage.html                     |  10 +-
 .../res_parser/simplest_test_css/simplest.html     |   5 +-
 .../res_parser/test_redefine_need/test_need.html   |   5 +-
 .../index_and_node_same_name.html                  |  10 +-
 .../index_entry_in_footnote.html                   |  10 +-
 .../index_no_node_no_top/index_no_node_no_top.html |  25 ++--
 .../res_parser/index_nodes/index_nodes.html        |  17 +--
 .../res_parser/index_nodes_nodes/a-node.html       |   5 +-
 .../res_parser/index_nodes_nodes/another.html      |   5 +-
 .../res_parser/index_nodes_nodes/first.html        |   5 +-
 .../res_parser/index_nodes_nodes/index.html        |   5 +-
 .../res_parser/index_nodes_nodes/second.html       |   5 +-
 .../res_parser/index_one_node/index_one_node.html  |   5 +-
 .../res_parser/index_special_region/Chapter.html   |   5 +-
 .../index_special_region/Copying-and-indices.html  |   5 +-
 .../res_parser/index_special_region/index.html     |   5 +-
 .../index_special_region_html/Chapter.html         |   5 +-
 .../Copying-and-indices.html                       |   5 +-
 .../index_special_region_html/index.html           |   5 +-
 .../Chapter.html                                   |   5 +-
 .../Copying-and-indices.html                       |   5 +-
 .../index.html                                     |   5 +-
 .../Chapter.html                                   |   5 +-
 .../Copying-and-indices.html                       |   5 +-
 .../index.html                                     |   5 +-
 .../index_special_region_no_region/Chapter.html    |   5 +-
 .../Copying-and-indices.html                       |   5 +-
 .../index_special_region_no_region/index.html      |   5 +-
 .../Chapter.html                                   |   5 +-
 .../Copying-and-indices.html                       |   5 +-
 .../index_special_region_no_region_html/index.html |   5 +-
 tp/tests/indices/res_parser/index_table/index.html |   5 +-
 .../res_parser/index_table/indices-refs.html       |  10 +-
 .../index_table/node-with-ftable-and-vtable.html   |   5 +-
 .../index_table/node-with-printindex.html          |   5 +-
 .../chapter.html                                   |   8 +-
 .../index.html                                     |  25 ++--
 .../chapter.html                                   |  10 +-
 .../first-before-top.html                          |  10 +-
 .../index.html                                     |  25 ++--
 .../printindex_between_node_section.html           |  15 +-
 .../printindex_between_part_chapter.html           |  20 ++-
 .../Copying-and-indices.html                       |   5 +-
 .../index_special_region_html/index.html           |   8 +-
 .../Copying-and-indices.html                       |   5 +-
 .../index.html                                     |   8 +-
 .../Copying-and-indices.html                       |   5 +-
 .../index_special_region_no_region_html/index.html |   8 +-
 .../chapter.html                                   |  10 +-
 .../first-before-top.html                          |  10 +-
 .../index.html                                     |  25 ++--
 .../chapter.html                                   |  10 +-
 .../first-before-top.html                          |  10 +-
 .../index.html                                     |  25 ++--
 .../layout/res_parser/formatting/formatting.html   | 160 +++++++++------------
 .../layout/res_parser/formatting_chm/chapter.html  |   5 +-
 .../layout/res_parser/formatting_chm/chapter2.html |   5 +-
 .../res_parser/formatting_chm/formatting.html      | 130 +++++++----------
 .../formatting_chm/s_002d_002dect_002cion.html     |   5 +-
 .../res_parser/formatting_chm/subsection.html      |   5 +-
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |   5 +-
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |   5 +-
 .../res_parser/formatting_exotic/chapter.html      |   5 +-
 .../res_parser/formatting_exotic/chapter2.html     |   5 +-
 .../layout/res_parser/formatting_exotic/index.html |  80 +++++------
 .../formatting_exotic/s_002d_002dect_002cion.html  |  20 ++-
 .../res_parser/formatting_fr_icons/formatting.html | 160 +++++++++------------
 .../res_parser/formatting_html/formatting.html     | 160 +++++++++------------
 .../res_parser/formatting_html32/formatting.html   | 160 +++++++++------------
 .../res_parser/formatting_html_nodes/chapter.html  |   5 +-
 .../res_parser/formatting_html_nodes/chapter2.html |   5 +-
 .../res_parser/formatting_html_nodes/index.html    | 130 +++++++----------
 .../s_002d_002dect_002cion.html                    |   5 +-
 .../formatting_html_nodes/subsection.html          |   5 +-
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |   5 +-
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |   5 +-
 .../res_parser/formatting_mathjax/formatting.html  | 160 +++++++++------------
 .../res_parser/formatting_nodes/chapter.html       |   5 +-
 .../res_parser/formatting_nodes/chapter2.html      |   5 +-
 .../layout/res_parser/formatting_nodes/index.html  | 130 +++++++----------
 .../formatting_nodes/s_002d_002dect_002cion.html   |   5 +-
 .../res_parser/formatting_nodes/subsection.html    |   5 +-
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |   5 +-
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |   5 +-
 .../formatting_regions/formatting_regions.html     | 160 +++++++++------------
 .../formatting_weird_quotes/formatting.html        | 160 +++++++++------------
 .../chapter.html                                   |   5 +-
 .../navigation_abt.html                            |  10 +-
 .../subsection.html                                |   5 +-
 .../no_monolithic_only_toc_out/no_monolithic.html  |  10 +-
 .../nested_cartouche/nested_formats.html           | 140 ++++++++----------
 .../res_parser/nested_deffn/nested_formats.html    | 140 ++++++++----------
 .../nested_enumerate/nested_formats.html           | 140 ++++++++----------
 .../res_parser/nested_example/nested_formats.html  | 140 ++++++++----------
 .../nested_flushright/nested_formats.html          | 140 ++++++++----------
 .../res_parser/nested_group/nested_formats.html    | 140 ++++++++----------
 .../res_parser/nested_itemize/nested_formats.html  | 140 ++++++++----------
 .../res_parser/nested_menu/nested_formats.html     | 140 ++++++++----------
 .../nested_multitable/nested_formats.html          | 140 ++++++++----------
 .../nested_quotation/nested_formats.html           | 140 ++++++++----------
 .../res_parser/nested_table/nested_formats.html    | 140 ++++++++----------
 .../sectioning_directions/sectioning.html          |  66 ++++-----
 579 files changed, 3474 insertions(+), 5280 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 68038d2..023fd8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2021-02-14  Gavin Smith  <gavinsmith0123@gmail.com>
 
+       * tp/Texinfo/Convert/HTML.pm (_convert_heading_command):
+       Only output a <div> for a @node with an associated section.
+       Otherwise, output a <span> as an anchor.
+
+2021-02-14  Gavin Smith  <gavinsmith0123@gmail.com>
+
        * tp/tests/run_parser_all.sh: Print stderr for test error.
        * TODO: Remove item.
 
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 1fe5ce4..eb289dc 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -2444,27 +2444,22 @@ sub _convert_heading_command($$$$$)
     return $result;
   }
 
+  my $element_id = $self->command_id($command);
   my $section = $command->{'extra'}->{'associated_section'};
-  my $node;
-  if ($section) {
-      my $level = $section->{'level'};
-      $result .= join('', $self->close_registered_sections_level($level));
-      $self->register_opened_section_level($level, "</div>\n");
-  } else {
-      $node = $command->{'extra'}->{'associated_node'};
-  }
-  $result .= '<div';
-  if ($section) {
-      $result .= ' class="'.$section->{'cmdname'}.'"';
-  } elsif ($node) {
-      $result .= ' class="node"';
+  if ($cmdname eq 'node' and $section) {
+    my $level = $section->{'level'};
+    $result .= join('', $self->close_registered_sections_level($level));
+    $self->register_opened_section_level($level, "</div>\n");
+
+    $result .= '<div class="' . $section->{'cmdname'} . '"';
+
+    $result .= " id=\"$element_id\""
+        if (defined($element_id) and $element_id ne '');
+    $result .= ">\n";
   } else {
-      $result .= " class=\"$cmdname\"";
+    $result .= "<span id=\"$element_id\"></span>"
+        if (defined($element_id) and $element_id ne '');
   }
-  my $element_id = $self->command_id($command);
-  $result .= " id=\"$element_id\""
-      if (defined($element_id) and $element_id ne '');
-  $result .= ">\n";
 
   print STDERR "Process $command "
         .Texinfo::Structuring::_print_root_command_texi($command)."\n"
@@ -2557,7 +2552,6 @@ sub _convert_heading_command($$$$$)
                        eq 'inline')))) {
     $result .= _mini_toc($self, $command);
   }
-  $result .= '</div>' if (! $section);
   return $result;
 }
 
diff --git a/tp/t/results/converters_tests/accent.pl 
b/tp/t/results/converters_tests/accent.pl
index 2ab5676..ed669de 100644
--- a/tp/t/results/converters_tests/accent.pl
+++ b/tp/t/results/converters_tests/accent.pl
@@ -3251,8 +3251,7 @@ should be e\': è è
 
 
 $result_converted{'html_text'}->{'accent'} = '<div class="top" id="Top">
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <p>should be e&lsquo;: &egrave; &egrave;
 </p>
@@ -3327,7 +3326,7 @@ $result_converted{'html_text'}->{'accent'} = '<div 
class="top" id="Top">
 <p>should be dotless j^: &#309;
 </p>
 <p>should be dotless j&quot;: j"
-</p></div><hr></div>
+</p><hr></div>
 ';
 
 
diff --git a/tp/t/results/converters_tests/accentenc.pl 
b/tp/t/results/converters_tests/accentenc.pl
index 65f67d3..e8a75ee 100644
--- a/tp/t/results/converters_tests/accentenc.pl
+++ b/tp/t/results/converters_tests/accentenc.pl
@@ -3297,8 +3297,7 @@ should be e\': è è
 
 $result_converted{'html_text'}->{'accentenc'} = '
 <div class="top" id="Top">
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <p>should be e&lsquo;: &egrave; &egrave;
 </p>
@@ -3373,7 +3372,7 @@ $result_converted{'html_text'}->{'accentenc'} = '
 <p>should be dotless j^: &#309;
 </p>
 <p>should be dotless j&quot;: j"
-</p></div><hr></div>
+</p><hr></div>
 ';
 
 
diff --git a/tp/t/results/converters_tests/accentenc_enable_encoding.pl 
b/tp/t/results/converters_tests/accentenc_enable_encoding.pl
index d872ce6..8053881 100644
--- a/tp/t/results/converters_tests/accentenc_enable_encoding.pl
+++ b/tp/t/results/converters_tests/accentenc_enable_encoding.pl
@@ -3218,8 +3218,7 @@ $result_floats{'accentenc_enable_encoding'} = {};
 
 $result_converted{'html_text'}->{'accentenc_enable_encoding'} = '
 <div class="top" id="Top">
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <p>should be e&lsquo;: è è
 </p>
@@ -3294,7 +3293,7 @@ 
$result_converted{'html_text'}->{'accentenc_enable_encoding'} = '
 <p>should be dotless j^: &#309;
 </p>
 <p>should be dotless j&quot;: j"
-</p></div><hr></div>
+</p><hr></div>
 ';
 
 1;
diff --git a/tp/t/results/converters_tests/accentenc_no_entity.pl 
b/tp/t/results/converters_tests/accentenc_no_entity.pl
index a811761..62ac8bc 100644
--- a/tp/t/results/converters_tests/accentenc_no_entity.pl
+++ b/tp/t/results/converters_tests/accentenc_no_entity.pl
@@ -3218,8 +3218,7 @@ $result_floats{'accentenc_no_entity'} = {};
 
 $result_converted{'html_text'}->{'accentenc_no_entity'} = '
 <div class="top" id="Top">
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <p>should be e&lsquo;: è è
 </p>
@@ -3294,7 +3293,7 @@ $result_converted{'html_text'}->{'accentenc_no_entity'} = 
'
 <p>should be dotless j^: &#309;
 </p>
 <p>should be dotless j&quot;: j"
-</p></div><hr></div>
+</p><hr></div>
 ';
 
 1;
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 31e8ad7..f509d86 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -1202,8 +1202,7 @@ $result_converted{'plaintext'}->{'at_commands_in_raw'} = 
'<b>in b(1).</b>
 ';
 
 
-$result_converted{'html_text'}->{'at_commands_in_raw'} = '<div class="node" 
id="Top">
-<h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'at_commands_in_raw'} = '<span 
id="Top"></span><h1 class="node-heading">Top</h1>
 
 
 <b>in b<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>.</b>
@@ -1248,7 +1247,7 @@ $result_converted{'html_text'}->{'at_commands_in_raw'} = 
'<div class="node" id="
 </p>
 <p>Macros that should not be defined: . with arg.
 </p>
-</div><div class="footnote">
+<div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
diff --git a/tp/t/results/converters_tests/at_commands_in_refs.pl 
b/tp/t/results/converters_tests/at_commands_in_refs.pl
index 193788b..de3a580 100644
--- a/tp/t/results/converters_tests/at_commands_in_refs.pl
+++ b/tp/t/results/converters_tests/at_commands_in_refs.pl
@@ -22898,8 +22898,7 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="#-_007b-_007d" accesskey="n" rel="next"> { }</a> &nbsp; </p>
 </div>
-<div class="node" id="Top-1">
-<h1 class="top">Top</h1>
+<span id="Top-1"></span><h1 class="top">Top</h1>
 
 
 <ul class="section-toc">
@@ -22931,274 +22930,247 @@ Next: <a href="#-_007b-_007d" accesskey="n" 
rel="next"> { }</a> &nbsp; </p>
 <li><a href="#gH-3rd"><sub>g</sub>H 3<sup>rd</sup></a></li>
 <li><a 
href="#http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls"><a
 href="http://somewhere_aaa";>http://somewhere_aaa</a> <a href="url">text</a> <a 
href="/man.cgi/1/ls">ls</a></a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="chapter" id="-_007b-_007d">
 <div class="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>
 </div>
-<div class="node" id="-_007b-_007d-1">
-<h2 class="chapter">1  { }</h2>
+<span id="-_007b-_007d-1"></span><h2 class="chapter">1  { }</h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="----_0021---_002e--_002e-_003f-_0040">
 <div class="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>
 </div>
-<div class="node" id="----_0021---_002e--_002e-_003f-_0040-1">
-<h2 class="chapter">2 &nbsp; &nbsp; ! <br> .  . ? @</h2>
+<span id="----_0021---_002e--_002e-_003f-_0040-1"></span><h2 class="chapter">2 
&nbsp; &nbsp; ! <br> .  . ? @</h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="g_t_0040-_007b-_007d-_005c-_0023">
 <div class="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>
 </div>
-<div class="node" id="g_t_0040-_007b-_007d-_005c-_0023-1">
-<h2 class="chapter">3 @ { } \\ #</h2>
+<span id="g_t_0040-_007b-_007d-_005c-_0023-1"></span><h2 class="chapter">3 @ { 
} \\ #</h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e">
 <div class="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>
 </div>
-<div class="node" id="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e-1">
-<h2 class="chapter">4 LaTeX TeX &bull; , &copy; &hellip; <small 
class="enddots">...</small></h2>
+<span id="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e-1"></span><h2 
class="chapter">4 LaTeX TeX &bull; , &copy; &hellip; <small 
class="enddots">...</small></h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" 
id="g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212">
 <div class="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>
 </div>
-<div class="node" id="g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212-1">
-<h2 class="chapter">5 &equiv; error&rarr; &euro; &iexcl; &rarr; -</h2>
+<span id="g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212-1"></span><h2 
class="chapter">5 &equiv; error&rarr; &euro; &iexcl; &rarr; -</h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="g_t_2265-_2264-_2192">
 <div class="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>
 </div>
-<div class="node" id="g_t_2265-_2264-_2192-1">
-<h2 class="chapter">6 &ge; &le; &rarr;</h2>
+<span id="g_t_2265-_2264-_2192-1"></span><h2 class="chapter">6 &ge; &le; 
&rarr;</h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae">
 <div class="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>
 </div>
-<div class="node" id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae-1">
-<h2 class="chapter">7 &ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</h2>
+<span id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae-1"></span><h2 
class="chapter">7 &ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="g_t_21d2-_00b0-a-b--_00e5">
 <div class="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>
 </div>
-<div class="node" id="g_t_21d2-_00b0-a-b--aa">
-<h2 class="chapter">8 &rArr; &deg; a&nbsp;b a sunny day &aring;</h2>
+<span id="g_t_21d2-_00b0-a-b--aa"></span><h2 class="chapter">8 &rArr; &deg; 
a&nbsp;b a sunny day &aring;</h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" 
id="g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe">
 <div class="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* e\'\' &#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>
 </div>
-<div class="node" id="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th">
-<h2 class="chapter">9 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; 
&Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</h2>
+<span id="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th"></span><h2 class="chapter">9 
&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; 
&ETH; &eth; &THORN; &thorn;</h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" 
id="g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">
 <div class="header">
 <p>
 Next: <a href="#g_t_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361" accesskey="n" 
rel="next">&#279; &#277; e_ &#7865; &#283; j ee[</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>
 </div>
-<div class="node" id="a-e-i-a-a-e-c-e-e-e-e">
-<h2 class="chapter">10 &auml; &#7869; &icirc; &acirc; &agrave; &eacute; 
&ccedil; &#275; e* e\'\' &#281;</h2>
+<span id="a-e-i-a-a-e-c-e-e-e-e"></span><h2 class="chapter">10 &auml; &#7869; 
&icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e\'\' &#281;</h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="g_t_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361">
 <div class="header">
 <p>
 Next: <a href="#g_t_0131-_1e14-_1e08" accesskey="n" rel="next">i &#274;` 
&#262;,</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* e\'\' &#281;</a>, Up: <a href="#Top" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
-<div class="node" id="e-e-e-e-e-j-ee">
-<h2 class="chapter">11 &#279; &#277; e_ &#7865; &#283; j ee[</h2>
+<span id="e-e-e-e-e-j-ee"></span><h2 class="chapter">11 &#279; &#277; e_ 
&#7865; &#283; j ee[</h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="g_t_0131-_1e14-_1e08">
 <div class="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-ee_0361" accesskey="p" 
rel="prev">&#279; &#277; e_ &#7865; &#283; j ee[</a>, Up: <a href="#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
-<div class="node" id="i-E-C">
-<h2 class="chapter">12 i &#274;` &#262;,</h2>
+<span id="i-E-C"></span><h2 class="chapter">12 i &#274;` &#262;,</h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="g_t_201c-_201d-_2018-_2019-_201e-_201a">
 <div class="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;` &#262;,</a>, 
Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
-<div class="node" id="g_t_201c-_201d-_2018-_2019-_201e-_201a-1">
-<h2 class="chapter">13 &ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</h2>
+<span id="g_t_201c-_201d-_2018-_2019-_201e-_201a-1"></span><h2 
class="chapter">13 &ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a">
 <div class="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>
 </div>
-<div class="node" id="g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a-1">
-<h2 class="chapter">14 &laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</h2>
+<span id="g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a-1"></span><h2 
class="chapter">14 &laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" 
id="g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027">
 <div class="header">
 <p>
 Next: <a href="#AAA-AAA-BBB" accesskey="n" rel="next"><acronym 
title="fff">AAA</acronym> (fff) <acronym title="fff">AAA</acronym> 
<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>
 </div>
-<div class="node" 
id="g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027-1">
-<h2 class="chapter">15 &ldquo; &rdquo; &mdash; &ndash; &lsquo; &rsquo;</h2>
+<span 
id="g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027-1"></span><h2
 class="chapter">15 &ldquo; &rdquo; &mdash; &ndash; &lsquo; &rsquo;</h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="AAA-AAA-BBB">
 <div class="header">
 <p>
 Next: <a href="#CCC-CCC-DDD" accesskey="n" rel="next"><abbr 
title="rrr">CCC</abbr> (rrr) <abbr title="rrr">CCC</abbr> <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>
 </div>
-<div class="node" id="AAA-AAA-BBB-1">
-<h2 class="chapter">16 <acronym title="fff">AAA</acronym> (fff) <acronym 
title="fff">AAA</acronym> <acronym>BBB</acronym></h2>
+<span id="AAA-AAA-BBB-1"></span><h2 class="chapter">16 <acronym 
title="fff">AAA</acronym> (fff) <acronym title="fff">AAA</acronym> 
<acronym>BBB</acronym></h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="CCC-CCC-DDD">
 <div class="header">
 <p>
 Next: <a href="#someone_0040somewher-no_005fexplain_0040there" accesskey="n" 
rel="next"><a href="mailto:someone@somewher";>the someone</a> <a 
href="mailto:no_explain@there";>no_explain@there</a></a>, Previous: <a 
href="#AAA-AAA-BBB" accesskey="p" rel="prev"><acronym title="fff">AAA</acronym> 
(fff) <acronym title="fff">AAA</acronym> <acronym>BBB</acronym></a>, Up: <a 
href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
-<div class="node" id="CCC-CCC-DDD-1">
-<h2 class="chapter">17 <abbr title="rrr">CCC</abbr> (rrr) <abbr 
title="rrr">CCC</abbr> <abbr>DDD</abbr></h2>
+<span id="CCC-CCC-DDD-1"></span><h2 class="chapter">17 <abbr 
title="rrr">CCC</abbr> (rrr) <abbr title="rrr">CCC</abbr> <abbr>DDD</abbr></h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="someone_0040somewher-no_005fexplain_0040there">
 <div class="header">
 <p>
 Next: <a href="#f_002d_002dile1-f_002d_002dile" accesskey="n" rel="next"><img 
src="f--ile1.jpg" alt="f--ile1">  <img src="f--ile.png" alt="alt"></a>, 
Previous: <a href="#CCC-CCC-DDD" accesskey="p" rel="prev"><abbr 
title="rrr">CCC</abbr> (rrr) <abbr title="rrr">CCC</abbr> <abbr>DDD</abbr></a>, 
Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
-<div class="node" id="someone_0040somewher-no_005fexplain_0040there-1">
-<h2 class="chapter">18 <a href="mailto:someone@somewher";>the someone</a> <a 
href="mailto:no_explain@there";>no_explain@there</a></h2>
+<span id="someone_0040somewher-no_005fexplain_0040there-1"></span><h2 
class="chapter">18 <a href="mailto:someone@somewher";>the someone</a> <a 
href="mailto:no_explain@there";>no_explain@there</a></h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="f_002d_002dile1-f_002d_002dile">
 <div class="header">
 <p>
 Next: <a href="#-_0040-_007b_007d-_002e-" accesskey="n" rel="next"><tt> @ {} . 
</tt></a>, Previous: <a href="#someone_0040somewher-no_005fexplain_0040there" 
accesskey="p" rel="prev"><a href="mailto:someone@somewher";>the someone</a> <a 
href="mailto:no_explain@there";>no_explain@there</a></a>, Up: <a href="#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
-<div class="node" id="f_002d_002dile1-f_002d_002dile-1">
-<h2 class="chapter">19 <img src="f--ile1.jpg" alt="f--ile1">  <img 
src="f--ile.png" alt="alt"></h2>
+<span id="f_002d_002dile1-f_002d_002dile-1"></span><h2 class="chapter">19 <img 
src="f--ile1.jpg" alt="f--ile1">  <img src="f--ile.png" alt="alt"></h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="-_0040-_007b_007d-_002e-">
 <div class="header">
 <p>
 Next: <a href="#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i" accesskey="n" 
rel="next"><cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span 
class="roman">in r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> 
<var>var</var> <em>dfn</em> <i>i</i></a>, Previous: <a 
href="#f_002d_002dile1-f_002d_002dile" accesskey="p" rel="prev"><img 
src="f--ile1.jpg" alt="f--ile1">  <img src="f--ile.png" alt="alt"></a>, Up: <a 
href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
-<div class="node" id="-_0040-_007b_007d-_002e--1">
-<h2 class="chapter">20 <tt> @ {} . </tt></h2>
+<span id="-_0040-_007b_007d-_002e--1"></span><h2 class="chapter">20 <tt> @ {} 
. </tt></h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i">
 <div class="header">
 <p>
 Next: <a href="#env-code-option-samp-command-file-C_002dx-ESC" accesskey="n" 
rel="next"><code>env</code> <code>code</code> <samp>option</samp> 
&lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x 
<span class="key">ESC</span></kbd></a>, Previous: <a 
href="#-_0040-_007b_007d-_002e-" accesskey="p" rel="prev"><tt> @ {} . 
</tt></a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
-<div class="node" id="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i-1">
-<h2 class="chapter">21 <cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w 
--> <span class="roman">in r</span> <small>SC</small> <strong>str</strong> 
<tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></h2>
+<span id="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i-1"></span><h2 
class="chapter">21 <cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> 
<span class="roman">in r</span> <small>SC</small> <strong>str</strong> 
<tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="env-code-option-samp-command-file-C_002dx-ESC">
 <div class="header">
 <p>
 Next: <a href="#g_t8_002e27in" accesskey="n" rel="next">8.27in</a>, Previous: 
<a href="#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i" accesskey="p" 
rel="prev"><cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span 
class="roman">in r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> 
<var>var</var> <em>dfn</em> <i>i</i></a>, Up: <a href="#Top" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
-<div class="node" id="env-code-option-samp-command-file-C_002dx-ESC-1">
-<h2 class="chapter">22 <code>env</code> <code>code</code> <samp>option</samp> 
&lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x 
<span class="key">ESC</span></kbd></h2>
+<span id="env-code-option-samp-command-file-C_002dx-ESC-1"></span><h2 
class="chapter">22 <code>env</code> <code>code</code> <samp>option</samp> 
&lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x 
<span class="key">ESC</span></kbd></h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="g_t8_002e27in">
 <div class="header">
 <p>
 Next: <a href="#sansserif-slanted" accesskey="n" rel="next"><span 
class="sansserif">sansserif</span> <i>slanted</i></a>, Previous: <a 
href="#env-code-option-samp-command-file-C_002dx-ESC" accesskey="p" 
rel="prev"><code>env</code> <code>code</code> <samp>option</samp> 
&lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x 
<span class="key">ESC</span></kbd></a>, Up: <a href="#Top" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
-<div class="node" id="g_t8_002e27in-1">
-<h2 class="chapter">23 8.27in</h2>
+<span id="g_t8_002e27in-1"></span><h2 class="chapter">23 8.27in</h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="sansserif-slanted">
 <div class="header">
 <p>
 Next: <a href="#indicateurl" accesskey="n" 
rel="next">&lsquo;<code>indicateurl</code>&rsquo;</a>, Previous: <a 
href="#g_t8_002e27in" accesskey="p" rel="prev">8.27in</a>, Up: <a href="#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
-<div class="node" id="sansserif-slanted-1">
-<h2 class="chapter">24 <span class="sansserif">sansserif</span> 
<i>slanted</i></h2>
+<span id="sansserif-slanted-1"></span><h2 class="chapter">24 <span 
class="sansserif">sansserif</span> <i>slanted</i></h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="indicateurl">
 <div class="header">
 <p>
 Next: <a href="#gH-3rd" accesskey="n" rel="next"><sub>g</sub>H 
3<sup>rd</sup></a>, Previous: <a href="#sansserif-slanted" accesskey="p" 
rel="prev"><span class="sansserif">sansserif</span> <i>slanted</i></a>, Up: <a 
href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
-<div class="node" id="indicateurl-1">
-<h2 class="chapter">25 &lsquo;<code>indicateurl</code>&rsquo;</h2>
+<span id="indicateurl-1"></span><h2 class="chapter">25 
&lsquo;<code>indicateurl</code>&rsquo;</h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="gH-3rd">
 <div class="header">
 <p>
 Next: <a 
href="#http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls" 
accesskey="n" rel="next"><a 
href="http://somewhere_aaa";>http://somewhere_aaa</a> <a href="url">text</a> <a 
href="/man.cgi/1/ls">ls</a></a>, Previous: <a href="#indicateurl" accesskey="p" 
rel="prev">&lsquo;<code>indicateurl</code>&rsquo;</a>, Up: <a href="#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
-<div class="node" id="gH-3rd-1">
-<h2 class="chapter">26 <sub>g</sub>H 3<sup>rd</sup></h2>
+<span id="gH-3rd-1"></span><h2 class="chapter">26 <sub>g</sub>H 
3<sup>rd</sup></h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" 
id="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls">
 <div class="header">
 <p>
 Previous: <a href="#gH-3rd" accesskey="p" rel="prev"><sub>g</sub>H 
3<sup>rd</sup></a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; 
</p>
 </div>
-<div class="node" 
id="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls-1">
-<h2 class="chapter">27 <a href="http://somewhere_aaa";>http://somewhere_aaa</a> 
<a href="url">text</a> <a href="/man.cgi/1/ls">ls</a></h2>
+<span 
id="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls-1"></span><h2
 class="chapter">27 <a href="http://somewhere_aaa";>http://somewhere_aaa</a> <a 
href="url">text</a> <a href="/man.cgi/1/ls">ls</a></h2>
 
 <p><a href="#-_007b-_007d"> { }</a>
 </p>
@@ -23254,7 +23226,7 @@ Previous: <a href="#gH-3rd" accesskey="p" 
rel="prev"><sub>g</sub>H 3<sup>rd</sup
 </p>
 <p><a 
href="#http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls"><a
 href="http://somewhere_aaa";>http://somewhere_aaa</a> <a href="url">text</a> <a 
href="/man.cgi/1/ls">ls</a></a>
 </p>
-</div><hr>
+<hr>
 </div>
 </div>
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/----_0021---_002e--_002e-_003f-_0040.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/----_0021---_002e--_002e-_003f-_0040.html
index 726807d..1074941 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/----_0021---_002e--_002e-_003f-_0040.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/----_0021---_002e--_002e-_003f-_0040.html
@@ -46,10 +46,9 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="----_0021---_002e--_002e-_003f-_0040-1">
-<h2 class="chapter">2 &nbsp; &nbsp; ! <br> .  . ? @</h2>
+<span id="----_0021---_002e--_002e-_003f-_0040-1"></span><h2 class="chapter">2 
&nbsp; &nbsp; ! <br> .  . ? @</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/-_0040-_007b_007d-_002e-.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/-_0040-_007b_007d-_002e-.html
index b00f528..c5c0751 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/-_0040-_007b_007d-_002e-.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/-_0040-_007b_007d-_002e-.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 Next: <a href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html" 
accesskey="n" rel="next"><cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- 
/@w --> <span class="roman">in r</span> <small>SC</small> <strong>str</strong> 
<tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></a>, Previous: <a 
href="f_002d_002dile1-f_002d_002dile.html" accesskey="p" rel="prev"><img 
src="f--ile1.jpg" alt="f--ile1">  <img src="f--ile.png" alt="alt"></a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &n [...]
 </div>
 <hr>
-<div class="node" id="-_0040-_007b_007d-_002e--1">
-<h2 class="chapter">20 <tt> @ {} . </tt></h2>
+<span id="-_0040-_007b_007d-_002e--1"></span><h2 class="chapter">20 <tt> @ {} 
. </tt></h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/-_007b-_007d.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/-_007b-_007d.html
index 2c1530d..97ec42d 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/-_007b-_007d.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/-_007b-_007d.html
@@ -44,10 +44,9 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="-_007b-_007d-1">
-<h2 class="chapter">1  { }</h2>
+<span id="-_007b-_007d-1"></span><h2 class="chapter">1  { }</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/8_002e27in.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/8_002e27in.html
index d90e0e5..8574e2d 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/8_002e27in.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/8_002e27in.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 Next: <a href="sansserif-slanted.html" accesskey="n" rel="next"><span 
class="sansserif">sansserif</span> <i>slanted</i></a>, Previous: <a 
href="env-code-option-samp-command-file-C_002dx-ESC.html" accesskey="p" 
rel="prev"><code>env</code> <code>code</code> <samp>option</samp> 
&lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x 
<span class="key">ESC</span></kbd></a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<div class="node" id="g_t8_002e27in-1">
-<h2 class="chapter">23 8.27in</h2>
+<span id="g_t8_002e27in-1"></span><h2 class="chapter">23 8.27in</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/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/converters_tests/at_commands_in_refs_latin1/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
index 009cbac..896f67a 100644
--- 
a/tp/t/results/converters_tests/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/converters_tests/at_commands_in_refs_latin1/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 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* e'' &#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>
 </div>
 <hr>
-<div class="node" id="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th">
-<h2 class="chapter">9 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; 
&Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</h2>
+<span id="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th"></span><h2 class="chapter">9 
&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; 
&ETH; &eth; &THORN; &thorn;</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/AAA-AAA-BBB.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/AAA-AAA-BBB.html
index 8173ced..cdfc0f8 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/AAA-AAA-BBB.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/AAA-AAA-BBB.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 Next: <a href="CCC-CCC-DDD.html" accesskey="n" rel="next"><abbr 
title="rrr">CCC</abbr> (rrr) <abbr title="rrr">CCC</abbr> <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>
 </div>
 <hr>
-<div class="node" id="AAA-AAA-BBB-1">
-<h2 class="chapter">16 <acronym title="fff">AAA</acronym> (fff) <acronym 
title="fff">AAA</acronym> <acronym>BBB</acronym></h2>
+<span id="AAA-AAA-BBB-1"></span><h2 class="chapter">16 <acronym 
title="fff">AAA</acronym> (fff) <acronym title="fff">AAA</acronym> 
<acronym>BBB</acronym></h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/CCC-CCC-DDD.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/CCC-CCC-DDD.html
index e18a5a2..65ce6a4 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/CCC-CCC-DDD.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/CCC-CCC-DDD.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 Next: <a href="someone_0040somewher-no_005fexplain_0040there.html" 
accesskey="n" rel="next"><a href="mailto:someone@somewher";>the someone</a> <a 
href="mailto:no_explain@there";>no_explain@there</a></a>, Previous: <a 
href="AAA-AAA-BBB.html" accesskey="p" rel="prev"><acronym 
title="fff">AAA</acronym> (fff) <acronym title="fff">AAA</acronym> 
<acronym>BBB</acronym></a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<div class="node" id="CCC-CCC-DDD-1">
-<h2 class="chapter">17 <abbr title="rrr">CCC</abbr> (rrr) <abbr 
title="rrr">CCC</abbr> <abbr>DDD</abbr></h2>
+<span id="CCC-CCC-DDD-1"></span><h2 class="chapter">17 <abbr 
title="rrr">CCC</abbr> (rrr) <abbr title="rrr">CCC</abbr> <abbr>DDD</abbr></h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
index c967c0a..d237194 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e-1">
-<h2 class="chapter">4 LaTeX TeX &bull; , &copy; &hellip; <small 
class="enddots">...</small></h2>
+<span id="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e-1"></span><h2 
class="chapter">4 LaTeX TeX &bull; , &copy; &hellip; <small 
class="enddots">...</small></h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_0040-_007b-_007d-_005c-_0023.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_0040-_007b-_007d-_005c-_0023.html
index 600ddca..3280a11 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_0040-_007b-_007d-_005c-_0023.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_0040-_007b-_007d-_005c-_0023.html
@@ -44,10 +44,9 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="g_t_0040-_007b-_007d-_005c-_0023-1">
-<h2 class="chapter">3 @ { } \ #</h2>
+<span id="g_t_0040-_007b-_007d-_005c-_0023-1"></span><h2 class="chapter">3 @ { 
} \ #</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html
index a2c4ad7..3203b33 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 Next: <a href="AAA-AAA-BBB.html" accesskey="n" rel="next"><acronym 
title="fff">AAA</acronym> (fff) <acronym title="fff">AAA</acronym> 
<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>
 </div>
 <hr>
-<div class="node" 
id="g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027-1">
-<h2 class="chapter">15 &ldquo; &rdquo; &mdash; &ndash; &lsquo; &rsquo;</h2>
+<span 
id="g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027-1"></span><h2
 class="chapter">15 &ldquo; &rdquo; &mdash; &ndash; &lsquo; &rsquo;</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
index 8014f98..9fa44fb 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae-1">
-<h2 class="chapter">7 &ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</h2>
+<span id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae-1"></span><h2 
class="chapter">7 &ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_00ab-_00bb-_00ab-_00bb-_2039-_203a.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_00ab-_00bb-_00ab-_00bb-_2039-_203a.html
index d7a4a5e..607ce94 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_00ab-_00bb-_00ab-_00bb-_2039-_203a.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_00ab-_00bb-_00ab-_00bb-_2039-_203a.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a-1">
-<h2 class="chapter">14 &laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</h2>
+<span id="g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a-1"></span><h2 
class="chapter">14 &laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
index 98d943d..b6e3bd9 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 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;` &#262;,</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<div class="node" id="g_t_201c-_201d-_2018-_2019-_201e-_201a-1">
-<h2 class="chapter">13 &ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</h2>
+<span id="g_t_201c-_201d-_2018-_2019-_201e-_201a-1"></span><h2 
class="chapter">13 &ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_21d2-_00b0-a-b--aa.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_21d2-_00b0-a-b--aa.html
index ca8642b..9956318 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_21d2-_00b0-a-b--aa.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_21d2-_00b0-a-b--aa.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="g_t_21d2-_00b0-a-b--aa">
-<h2 class="chapter">8 &rArr; &deg; a&nbsp;b a sunny day &aring;</h2>
+<span id="g_t_21d2-_00b0-a-b--aa"></span><h2 class="chapter">8 &rArr; &deg; 
a&nbsp;b a sunny day &aring;</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html
index ceeb6dc..98c8698 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212-1">
-<h2 class="chapter">5 &equiv; error&rarr; &euro; &iexcl; &rarr; -</h2>
+<span id="g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212-1"></span><h2 
class="chapter">5 &equiv; error&rarr; &euro; &iexcl; &rarr; -</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_2265-_2264-_2192.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_2265-_2264-_2192.html
index db9cad4..48cbaab 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_2265-_2264-_2192.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_2265-_2264-_2192.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="g_t_2265-_2264-_2192-1">
-<h2 class="chapter">6 &ge; &le; &rarr;</h2>
+<span id="g_t_2265-_2264-_2192-1"></span><h2 class="chapter">6 &ge; &le; 
&rarr;</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/a-e-i-a-a-e-c-e-e-e-e.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/a-e-i-a-a-e-c-e-e-e-e.html
index ab891dd..1721af0 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/a-e-i-a-a-e-c-e-e-e-e.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/a-e-i-a-a-e-c-e-e-e-e.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 Next: <a href="e-e-e-e-e-j-ee.html" accesskey="n" rel="next">&#279; &#277; e_ 
&#7865; &#283; j ee[</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>
 </div>
 <hr>
-<div class="node" id="a-e-i-a-a-e-c-e-e-e-e">
-<h2 class="chapter">10 &auml; &#7869; &icirc; &acirc; &agrave; &eacute; 
&ccedil; &#275; e* e'' &#281;</h2>
+<span id="a-e-i-a-a-e-c-e-e-e-e"></span><h2 class="chapter">10 &auml; &#7869; 
&icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/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/converters_tests/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
index aa3d49f..fe40a50 100644
--- 
a/tp/t/results/converters_tests/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/converters_tests/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 Next: <a href="env-code-option-samp-command-file-C_002dx-ESC.html" 
accesskey="n" rel="next"><code>env</code> <code>code</code> <samp>option</samp> 
&lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x 
<span class="key">ESC</span></kbd></a>, Previous: <a 
href="-_0040-_007b_007d-_002e-.html" accesskey="p" rel="prev"><tt> @ {} . 
</tt></a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<div class="node" id="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i-1">
-<h2 class="chapter">21 <cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w 
--> <span class="roman">in r</span> <small>SC</small> <strong>str</strong> 
<tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></h2>
+<span id="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i-1"></span><h2 
class="chapter">21 <cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> 
<span class="roman">in r</span> <small>SC</small> <strong>str</strong> 
<tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/e-e-e-e-e-j-ee.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/e-e-e-e-e-j-ee.html
index 666242e..7238441 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/e-e-e-e-e-j-ee.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/e-e-e-e-e-j-ee.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 Next: <a href="i-E-C.html" accesskey="n" rel="next">i &#274;` &#262;,</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* e'' &#281;</a>, 
Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<div class="node" id="e-e-e-e-e-j-ee">
-<h2 class="chapter">11 &#279; &#277; e_ &#7865; &#283; j ee[</h2>
+<span id="e-e-e-e-e-j-ee"></span><h2 class="chapter">11 &#279; &#277; e_ 
&#7865; &#283; j ee[</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
index 8a3dda3..9db4ef6 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 Next: <a href="8_002e27in.html" accesskey="n" rel="next">8.27in</a>, Previous: 
<a href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html" accesskey="p" 
rel="prev"><cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span 
class="roman">in r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> 
<var>var</var> <em>dfn</em> <i>i</i></a>, Up: <a href="index.html" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<div class="node" id="env-code-option-samp-command-file-C_002dx-ESC-1">
-<h2 class="chapter">22 <code>env</code> <code>code</code> <samp>option</samp> 
&lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x 
<span class="key">ESC</span></kbd></h2>
+<span id="env-code-option-samp-command-file-C_002dx-ESC-1"></span><h2 
class="chapter">22 <code>env</code> <code>code</code> <samp>option</samp> 
&lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x 
<span class="key">ESC</span></kbd></h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/f_002d_002dile1-f_002d_002dile.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/f_002d_002dile1-f_002d_002dile.html
index 2ca300b..040e0a1 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/f_002d_002dile1-f_002d_002dile.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/f_002d_002dile1-f_002d_002dile.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 Next: <a href="-_0040-_007b_007d-_002e-.html" accesskey="n" rel="next"><tt> @ 
{} . </tt></a>, Previous: <a 
href="someone_0040somewher-no_005fexplain_0040there.html" accesskey="p" 
rel="prev"><a href="mailto:someone@somewher";>the someone</a> <a 
href="mailto:no_explain@there";>no_explain@there</a></a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<div class="node" id="f_002d_002dile1-f_002d_002dile-1">
-<h2 class="chapter">19 <img src="f--ile1.jpg" alt="f--ile1">  <img 
src="f--ile.png" alt="alt"></h2>
+<span id="f_002d_002dile1-f_002d_002dile-1"></span><h2 class="chapter">19 <img 
src="f--ile1.jpg" alt="f--ile1">  <img src="f--ile.png" alt="alt"></h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/gH-3rd.html 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/gH-3rd.html
index d781b35..049010d 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/gH-3rd.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/gH-3rd.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 Next: <a 
href="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html"
 accesskey="n" rel="next"><a 
href="http://somewhere_aaa";>http://somewhere_aaa</a> <a href="url">text</a> <a 
href="/man.cgi/1/ls">ls</a></a>, Previous: <a href="indicateurl.html" 
accesskey="p" rel="prev">&lsquo;<code>indicateurl</code>&rsquo;</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<div class="node" id="gH-3rd-1">
-<h2 class="chapter">26 <sub>g</sub>H 3<sup>rd</sup></h2>
+<span id="gH-3rd-1"></span><h2 class="chapter">26 <sub>g</sub>H 
3<sup>rd</sup></h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
index a14b1cd..4a21cbc 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
@@ -42,8 +42,7 @@ ul.no-bullet {list-style: none}
 Previous: <a href="gH-3rd.html" accesskey="p" rel="prev"><sub>g</sub>H 
3<sup>rd</sup></a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> 
&nbsp; </p>
 </div>
 <hr>
-<div class="node" 
id="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls-1">
-<h2 class="chapter">27 <a href="http://somewhere_aaa";>http://somewhere_aaa</a> 
<a href="url">text</a> <a href="/man.cgi/1/ls">ls</a></h2>
+<span 
id="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls-1"></span><h2
 class="chapter">27 <a href="http://somewhere_aaa";>http://somewhere_aaa</a> <a 
href="url">text</a> <a href="/man.cgi/1/ls">ls</a></h2>
 
 <p><a href="-_007b-_007d.html"> { }</a>
 </p>
@@ -99,7 +98,7 @@ Previous: <a href="gH-3rd.html" accesskey="p" 
rel="prev"><sub>g</sub>H 3<sup>rd<
 </p>
 <p><a 
href="#http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls"><a
 href="http://somewhere_aaa";>http://somewhere_aaa</a> <a href="url">text</a> <a 
href="/man.cgi/1/ls">ls</a></a>
 </p>
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/i-E-C.html 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/i-E-C.html
index 9bb71cf..a22757a 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/i-E-C.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/i-E-C.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 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_ &#7865; 
&#283; j ee[</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> 
&nbsp; </p>
 </div>
 <hr>
-<div class="node" id="i-E-C">
-<h2 class="chapter">12 i &#274;` &#262;,</h2>
+<span id="i-E-C"></span><h2 class="chapter">12 i &#274;` &#262;,</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/index.html 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/index.html
index 82ab02a..96119f0 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/index.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/index.html
@@ -42,8 +42,7 @@ ul.no-bullet {list-style: none}
 Next: <a href="-_007b-_007d.html" accesskey="n" rel="next"> { }</a> &nbsp; </p>
 </div>
 <hr>
-<div class="node" id="Top-1">
-<h1 class="top">Top</h1>
+<span id="Top-1"></span><h1 class="top">Top</h1>
 
 
 <ul class="section-toc">
@@ -75,7 +74,7 @@ Next: <a href="-_007b-_007d.html" accesskey="n" rel="next"> { 
}</a> &nbsp; </p>
 <li><a href="gH-3rd.html"><sub>g</sub>H 3<sup>rd</sup></a></li>
 <li><a 
href="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html"><a
 href="http://somewhere_aaa";>http://somewhere_aaa</a> <a href="url">text</a> <a 
href="/man.cgi/1/ls">ls</a></a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="header">
 <p>
 Next: <a href="-_007b-_007d.html" accesskey="n" rel="next"> { }</a> &nbsp; </p>
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/indicateurl.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/indicateurl.html
index 0c8f97c..54b5a8f 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/indicateurl.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/indicateurl.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 Next: <a href="gH-3rd.html" accesskey="n" rel="next"><sub>g</sub>H 
3<sup>rd</sup></a>, Previous: <a href="sansserif-slanted.html" accesskey="p" 
rel="prev"><span class="sansserif">sansserif</span> <i>slanted</i></a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<div class="node" id="indicateurl-1">
-<h2 class="chapter">25 &lsquo;<code>indicateurl</code>&rsquo;</h2>
+<span id="indicateurl-1"></span><h2 class="chapter">25 
&lsquo;<code>indicateurl</code>&rsquo;</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/sansserif-slanted.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/sansserif-slanted.html
index 33523b4..bfb78f3 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/sansserif-slanted.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/sansserif-slanted.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 Next: <a href="indicateurl.html" accesskey="n" 
rel="next">&lsquo;<code>indicateurl</code>&rsquo;</a>, Previous: <a 
href="8_002e27in.html" accesskey="p" rel="prev">8.27in</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<div class="node" id="sansserif-slanted-1">
-<h2 class="chapter">24 <span class="sansserif">sansserif</span> 
<i>slanted</i></h2>
+<span id="sansserif-slanted-1"></span><h2 class="chapter">24 <span 
class="sansserif">sansserif</span> <i>slanted</i></h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/someone_0040somewher-no_005fexplain_0040there.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/someone_0040somewher-no_005fexplain_0040there.html
index 832873b..0d72aca 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/someone_0040somewher-no_005fexplain_0040there.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/someone_0040somewher-no_005fexplain_0040there.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 Next: <a href="f_002d_002dile1-f_002d_002dile.html" accesskey="n" 
rel="next"><img src="f--ile1.jpg" alt="f--ile1">  <img src="f--ile.png" 
alt="alt"></a>, Previous: <a href="CCC-CCC-DDD.html" accesskey="p" 
rel="prev"><abbr title="rrr">CCC</abbr> (rrr) <abbr title="rrr">CCC</abbr> 
<abbr>DDD</abbr></a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> 
&nbsp; </p>
 </div>
 <hr>
-<div class="node" id="someone_0040somewher-no_005fexplain_0040there-1">
-<h2 class="chapter">18 <a href="mailto:someone@somewher";>the someone</a> <a 
href="mailto:no_explain@there";>no_explain@there</a></h2>
+<span id="someone_0040somewher-no_005fexplain_0040there-1"></span><h2 
class="chapter">18 <a href="mailto:someone@somewher";>the someone</a> <a 
href="mailto:no_explain@there";>no_explain@there</a></h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/----_0021---_002e--_002e-_003f-_0040.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/----_0021---_002e--_002e-_003f-_0040.html
index 67ce180..567d4a3 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/----_0021---_002e--_002e-_003f-_0040.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/----_0021---_002e--_002e-_003f-_0040.html
@@ -46,10 +46,9 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="----_0021---_002e--_002e-_003f-_0040-1">
-<h2 class="chapter">2 &nbsp; &nbsp; ! <br> .  . ? @</h2>
+<span id="----_0021---_002e--_002e-_003f-_0040-1"></span><h2 class="chapter">2 
&nbsp; &nbsp; ! <br> .  . ? @</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/-_0040-_007b_007d-_002e-.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/-_0040-_007b_007d-_002e-.html
index bfb3462..dcc589b 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/-_0040-_007b_007d-_002e-.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/-_0040-_007b_007d-_002e-.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 Next: <a href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html" 
accesskey="n" rel="next"><cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- 
/@w --> <span class="roman">in r</span> <small>SC</small> <strong>str</strong> 
<tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></a>, Previous: <a 
href="f_002d_002dile1-f_002d_002dile.html" accesskey="p" rel="prev"><img 
src="f--ile1.jpg" alt="f--ile1">  <img src="f--ile.png" alt="alt"></a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &n [...]
 </div>
 <hr>
-<div class="node" id="-_0040-_007b_007d-_002e--1">
-<h2 class="chapter">20 <tt> @ {} . </tt></h2>
+<span id="-_0040-_007b_007d-_002e--1"></span><h2 class="chapter">20 <tt> @ {} 
. </tt></h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/-_007b-_007d.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/-_007b-_007d.html
index 584592d..bcad346 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/-_007b-_007d.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/-_007b-_007d.html
@@ -44,10 +44,9 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="-_007b-_007d-1">
-<h2 class="chapter">1  { }</h2>
+<span id="-_007b-_007d-1"></span><h2 class="chapter">1  { }</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/8_002e27in.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/8_002e27in.html
index db7e900..49a861a 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/8_002e27in.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/8_002e27in.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 Next: <a href="sansserif-slanted.html" accesskey="n" rel="next"><span 
class="sansserif">sansserif</span> <i>slanted</i></a>, Previous: <a 
href="env-code-option-samp-command-file-C_002dx-ESC.html" accesskey="p" 
rel="prev"><code>env</code> <code>code</code> <samp>option</samp> 
&lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x 
<span class="key">ESC</span></kbd></a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<div class="node" id="g_t8_002e27in-1">
-<h2 class="chapter">23 8.27in</h2>
+<span id="g_t8_002e27in-1"></span><h2 class="chapter">23 8.27in</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/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/converters_tests/at_commands_in_refs_utf8/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
index 1fcc33c..2c68f9d 100644
--- 
a/tp/t/results/converters_tests/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/converters_tests/at_commands_in_refs_utf8/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 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* e'' &#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>
 </div>
 <hr>
-<div class="node" id="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th">
-<h2 class="chapter">9 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; 
&Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</h2>
+<span id="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th"></span><h2 class="chapter">9 
&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; 
&ETH; &eth; &THORN; &thorn;</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/AAA-AAA-BBB.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/AAA-AAA-BBB.html
index d6cc6e1..528c309 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/AAA-AAA-BBB.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/AAA-AAA-BBB.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 Next: <a href="CCC-CCC-DDD.html" accesskey="n" rel="next"><abbr 
title="rrr">CCC</abbr> (rrr) <abbr title="rrr">CCC</abbr> <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>
 </div>
 <hr>
-<div class="node" id="AAA-AAA-BBB-1">
-<h2 class="chapter">16 <acronym title="fff">AAA</acronym> (fff) <acronym 
title="fff">AAA</acronym> <acronym>BBB</acronym></h2>
+<span id="AAA-AAA-BBB-1"></span><h2 class="chapter">16 <acronym 
title="fff">AAA</acronym> (fff) <acronym title="fff">AAA</acronym> 
<acronym>BBB</acronym></h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/CCC-CCC-DDD.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/CCC-CCC-DDD.html
index 4325eb4..17eca79 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/CCC-CCC-DDD.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/CCC-CCC-DDD.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 Next: <a href="someone_0040somewher-no_005fexplain_0040there.html" 
accesskey="n" rel="next"><a href="mailto:someone@somewher";>the someone</a> <a 
href="mailto:no_explain@there";>no_explain@there</a></a>, Previous: <a 
href="AAA-AAA-BBB.html" accesskey="p" rel="prev"><acronym 
title="fff">AAA</acronym> (fff) <acronym title="fff">AAA</acronym> 
<acronym>BBB</acronym></a>, Up: <a href="index.html" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<div class="node" id="CCC-CCC-DDD-1">
-<h2 class="chapter">17 <abbr title="rrr">CCC</abbr> (rrr) <abbr 
title="rrr">CCC</abbr> <abbr>DDD</abbr></h2>
+<span id="CCC-CCC-DDD-1"></span><h2 class="chapter">17 <abbr 
title="rrr">CCC</abbr> (rrr) <abbr title="rrr">CCC</abbr> <abbr>DDD</abbr></h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
index 46341ab..94f9af4 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e-1">
-<h2 class="chapter">4 LaTeX TeX &bull; , &copy; &hellip; <small 
class="enddots">...</small></h2>
+<span id="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e-1"></span><h2 
class="chapter">4 LaTeX TeX &bull; , &copy; &hellip; <small 
class="enddots">...</small></h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_0040-_007b-_007d-_005c-_0023.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_0040-_007b-_007d-_005c-_0023.html
index cdc3537..d80b467 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_0040-_007b-_007d-_005c-_0023.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_0040-_007b-_007d-_005c-_0023.html
@@ -44,10 +44,9 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="g_t_0040-_007b-_007d-_005c-_0023-1">
-<h2 class="chapter">3 @ { } \ #</h2>
+<span id="g_t_0040-_007b-_007d-_005c-_0023-1"></span><h2 class="chapter">3 @ { 
} \ #</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html
index f5bd543..ae94e06 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 Next: <a href="AAA-AAA-BBB.html" accesskey="n" rel="next"><acronym 
title="fff">AAA</acronym> (fff) <acronym title="fff">AAA</acronym> 
<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>
 </div>
 <hr>
-<div class="node" 
id="g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027-1">
-<h2 class="chapter">15 &ldquo; &rdquo; &mdash; &ndash; &lsquo; &rsquo;</h2>
+<span 
id="g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027-1"></span><h2
 class="chapter">15 &ldquo; &rdquo; &mdash; &ndash; &lsquo; &rsquo;</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
index 4ecca42..ed977c8 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae-1">
-<h2 class="chapter">7 &ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</h2>
+<span id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae-1"></span><h2 
class="chapter">7 &ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_00ab-_00bb-_00ab-_00bb-_2039-_203a.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_00ab-_00bb-_00ab-_00bb-_2039-_203a.html
index 77f0f33..c04db55 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_00ab-_00bb-_00ab-_00bb-_2039-_203a.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_00ab-_00bb-_00ab-_00bb-_2039-_203a.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a-1">
-<h2 class="chapter">14 &laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</h2>
+<span id="g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a-1"></span><h2 
class="chapter">14 &laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
index d334d9f..00adbad 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 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;` &#262;,</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<div class="node" id="g_t_201c-_201d-_2018-_2019-_201e-_201a-1">
-<h2 class="chapter">13 &ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</h2>
+<span id="g_t_201c-_201d-_2018-_2019-_201e-_201a-1"></span><h2 
class="chapter">13 &ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_21d2-_00b0-a-b--aa.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_21d2-_00b0-a-b--aa.html
index b5bde1d..e624fdc 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_21d2-_00b0-a-b--aa.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_21d2-_00b0-a-b--aa.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="g_t_21d2-_00b0-a-b--aa">
-<h2 class="chapter">8 &rArr; &deg; a&nbsp;b a sunny day &aring;</h2>
+<span id="g_t_21d2-_00b0-a-b--aa"></span><h2 class="chapter">8 &rArr; &deg; 
a&nbsp;b a sunny day &aring;</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html
index ba6b4f5..89b9c17 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212-1">
-<h2 class="chapter">5 &equiv; error&rarr; &euro; &iexcl; &rarr; -</h2>
+<span id="g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212-1"></span><h2 
class="chapter">5 &equiv; error&rarr; &euro; &iexcl; &rarr; -</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_2265-_2264-_2192.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_2265-_2264-_2192.html
index f87374f..eeeb84e 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_2265-_2264-_2192.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_2265-_2264-_2192.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="g_t_2265-_2264-_2192-1">
-<h2 class="chapter">6 &ge; &le; &rarr;</h2>
+<span id="g_t_2265-_2264-_2192-1"></span><h2 class="chapter">6 &ge; &le; 
&rarr;</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/a-e-i-a-a-e-c-e-e-e-e.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/a-e-i-a-a-e-c-e-e-e-e.html
index c2a4d9c..5772abb 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/a-e-i-a-a-e-c-e-e-e-e.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/a-e-i-a-a-e-c-e-e-e-e.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 Next: <a href="e-e-e-e-e-j-ee.html" accesskey="n" rel="next">&#279; &#277; e_ 
&#7865; &#283; j ee[</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>
 </div>
 <hr>
-<div class="node" id="a-e-i-a-a-e-c-e-e-e-e">
-<h2 class="chapter">10 &auml; &#7869; &icirc; &acirc; &agrave; &eacute; 
&ccedil; &#275; e* e'' &#281;</h2>
+<span id="a-e-i-a-a-e-c-e-e-e-e"></span><h2 class="chapter">10 &auml; &#7869; 
&icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/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/converters_tests/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
index caf5960..3fb98a8 100644
--- 
a/tp/t/results/converters_tests/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/converters_tests/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 Next: <a href="env-code-option-samp-command-file-C_002dx-ESC.html" 
accesskey="n" rel="next"><code>env</code> <code>code</code> <samp>option</samp> 
&lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x 
<span class="key">ESC</span></kbd></a>, Previous: <a 
href="-_0040-_007b_007d-_002e-.html" accesskey="p" rel="prev"><tt> @ {} . 
</tt></a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<div class="node" id="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i-1">
-<h2 class="chapter">21 <cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w 
--> <span class="roman">in r</span> <small>SC</small> <strong>str</strong> 
<tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></h2>
+<span id="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i-1"></span><h2 
class="chapter">21 <cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> 
<span class="roman">in r</span> <small>SC</small> <strong>str</strong> 
<tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/e-e-e-e-e-j-ee.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/e-e-e-e-e-j-ee.html
index 352f6a8..204fc15 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/e-e-e-e-e-j-ee.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/e-e-e-e-e-j-ee.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 Next: <a href="i-E-C.html" accesskey="n" rel="next">i &#274;` &#262;,</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* e'' &#281;</a>, 
Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<div class="node" id="e-e-e-e-e-j-ee">
-<h2 class="chapter">11 &#279; &#277; e_ &#7865; &#283; j ee[</h2>
+<span id="e-e-e-e-e-j-ee"></span><h2 class="chapter">11 &#279; &#277; e_ 
&#7865; &#283; j ee[</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
index 9ce7223..487e90c 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 Next: <a href="8_002e27in.html" accesskey="n" rel="next">8.27in</a>, Previous: 
<a href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html" accesskey="p" 
rel="prev"><cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span 
class="roman">in r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> 
<var>var</var> <em>dfn</em> <i>i</i></a>, Up: <a href="index.html" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<div class="node" id="env-code-option-samp-command-file-C_002dx-ESC-1">
-<h2 class="chapter">22 <code>env</code> <code>code</code> <samp>option</samp> 
&lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x 
<span class="key">ESC</span></kbd></h2>
+<span id="env-code-option-samp-command-file-C_002dx-ESC-1"></span><h2 
class="chapter">22 <code>env</code> <code>code</code> <samp>option</samp> 
&lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x 
<span class="key">ESC</span></kbd></h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/f_002d_002dile1-f_002d_002dile.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/f_002d_002dile1-f_002d_002dile.html
index dd800cc..461e916 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/f_002d_002dile1-f_002d_002dile.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/f_002d_002dile1-f_002d_002dile.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 Next: <a href="-_0040-_007b_007d-_002e-.html" accesskey="n" rel="next"><tt> @ 
{} . </tt></a>, Previous: <a 
href="someone_0040somewher-no_005fexplain_0040there.html" accesskey="p" 
rel="prev"><a href="mailto:someone@somewher";>the someone</a> <a 
href="mailto:no_explain@there";>no_explain@there</a></a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<div class="node" id="f_002d_002dile1-f_002d_002dile-1">
-<h2 class="chapter">19 <img src="f--ile1.jpg" alt="f--ile1">  <img 
src="f--ile.png" alt="alt"></h2>
+<span id="f_002d_002dile1-f_002d_002dile-1"></span><h2 class="chapter">19 <img 
src="f--ile1.jpg" alt="f--ile1">  <img src="f--ile.png" alt="alt"></h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/gH-3rd.html 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/gH-3rd.html
index b275384..924b9f7 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/gH-3rd.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/gH-3rd.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 Next: <a 
href="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html"
 accesskey="n" rel="next"><a 
href="http://somewhere_aaa";>http://somewhere_aaa</a> <a href="url">text</a> <a 
href="/man.cgi/1/ls">ls</a></a>, Previous: <a href="indicateurl.html" 
accesskey="p" rel="prev">&lsquo;<code>indicateurl</code>&rsquo;</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<div class="node" id="gH-3rd-1">
-<h2 class="chapter">26 <sub>g</sub>H 3<sup>rd</sup></h2>
+<span id="gH-3rd-1"></span><h2 class="chapter">26 <sub>g</sub>H 
3<sup>rd</sup></h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
index 7377a11..b6b4684 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
@@ -42,8 +42,7 @@ ul.no-bullet {list-style: none}
 Previous: <a href="gH-3rd.html" accesskey="p" rel="prev"><sub>g</sub>H 
3<sup>rd</sup></a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> 
&nbsp; </p>
 </div>
 <hr>
-<div class="node" 
id="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls-1">
-<h2 class="chapter">27 <a href="http://somewhere_aaa";>http://somewhere_aaa</a> 
<a href="url">text</a> <a href="/man.cgi/1/ls">ls</a></h2>
+<span 
id="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls-1"></span><h2
 class="chapter">27 <a href="http://somewhere_aaa";>http://somewhere_aaa</a> <a 
href="url">text</a> <a href="/man.cgi/1/ls">ls</a></h2>
 
 <p><a href="-_007b-_007d.html"> { }</a>
 </p>
@@ -99,7 +98,7 @@ Previous: <a href="gH-3rd.html" accesskey="p" 
rel="prev"><sub>g</sub>H 3<sup>rd<
 </p>
 <p><a 
href="#http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls"><a
 href="http://somewhere_aaa";>http://somewhere_aaa</a> <a href="url">text</a> <a 
href="/man.cgi/1/ls">ls</a></a>
 </p>
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/i-E-C.html 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/i-E-C.html
index daf98da..c535be5 100644
--- a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/i-E-C.html
+++ b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/i-E-C.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 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_ &#7865; 
&#283; j ee[</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> 
&nbsp; </p>
 </div>
 <hr>
-<div class="node" id="i-E-C">
-<h2 class="chapter">12 i &#274;` &#262;,</h2>
+<span id="i-E-C"></span><h2 class="chapter">12 i &#274;` &#262;,</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/index.html 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/index.html
index 44685a9..3ffa162 100644
--- a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/index.html
+++ b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/index.html
@@ -42,8 +42,7 @@ ul.no-bullet {list-style: none}
 Next: <a href="-_007b-_007d.html" accesskey="n" rel="next"> { }</a> &nbsp; </p>
 </div>
 <hr>
-<div class="node" id="Top-1">
-<h1 class="top">Top</h1>
+<span id="Top-1"></span><h1 class="top">Top</h1>
 
 
 <ul class="section-toc">
@@ -75,7 +74,7 @@ Next: <a href="-_007b-_007d.html" accesskey="n" rel="next"> { 
}</a> &nbsp; </p>
 <li><a href="gH-3rd.html"><sub>g</sub>H 3<sup>rd</sup></a></li>
 <li><a 
href="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html"><a
 href="http://somewhere_aaa";>http://somewhere_aaa</a> <a href="url">text</a> <a 
href="/man.cgi/1/ls">ls</a></a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="header">
 <p>
 Next: <a href="-_007b-_007d.html" accesskey="n" rel="next"> { }</a> &nbsp; </p>
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/indicateurl.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/indicateurl.html
index 0427fb5..eb37c87 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/indicateurl.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/indicateurl.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 Next: <a href="gH-3rd.html" accesskey="n" rel="next"><sub>g</sub>H 
3<sup>rd</sup></a>, Previous: <a href="sansserif-slanted.html" accesskey="p" 
rel="prev"><span class="sansserif">sansserif</span> <i>slanted</i></a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<div class="node" id="indicateurl-1">
-<h2 class="chapter">25 &lsquo;<code>indicateurl</code>&rsquo;</h2>
+<span id="indicateurl-1"></span><h2 class="chapter">25 
&lsquo;<code>indicateurl</code>&rsquo;</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/sansserif-slanted.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/sansserif-slanted.html
index 68f4a85..58c8297 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/sansserif-slanted.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/sansserif-slanted.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 Next: <a href="indicateurl.html" accesskey="n" 
rel="next">&lsquo;<code>indicateurl</code>&rsquo;</a>, Previous: <a 
href="8_002e27in.html" accesskey="p" rel="prev">8.27in</a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<div class="node" id="sansserif-slanted-1">
-<h2 class="chapter">24 <span class="sansserif">sansserif</span> 
<i>slanted</i></h2>
+<span id="sansserif-slanted-1"></span><h2 class="chapter">24 <span 
class="sansserif">sansserif</span> <i>slanted</i></h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/someone_0040somewher-no_005fexplain_0040there.html
 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/someone_0040somewher-no_005fexplain_0040there.html
index b6468d5..f35aed5 100644
--- 
a/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/someone_0040somewher-no_005fexplain_0040there.html
+++ 
b/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/someone_0040somewher-no_005fexplain_0040there.html
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 Next: <a href="f_002d_002dile1-f_002d_002dile.html" accesskey="n" 
rel="next"><img src="f--ile1.jpg" alt="f--ile1">  <img src="f--ile.png" 
alt="alt"></a>, Previous: <a href="CCC-CCC-DDD.html" accesskey="p" 
rel="prev"><abbr title="rrr">CCC</abbr> (rrr) <abbr title="rrr">CCC</abbr> 
<abbr>DDD</abbr></a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> 
&nbsp; </p>
 </div>
 <hr>
-<div class="node" id="someone_0040somewher-no_005fexplain_0040there-1">
-<h2 class="chapter">18 <a href="mailto:someone@somewher";>the someone</a> <a 
href="mailto:no_explain@there";>no_explain@there</a></h2>
+<span id="someone_0040somewher-no_005fexplain_0040there-1"></span><h2 
class="chapter">18 <a href="mailto:someone@somewher";>the someone</a> <a 
href="mailto:no_explain@there";>no_explain@there</a></h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
 
b/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
index 0bdccc8..2762007 100644
--- 
a/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
+++ 
b/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
@@ -44,10 +44,9 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="a-e-i-o-u-A-E-I-O-U">
-<h2 class="chapter">4 � � � � � � � � � �</h2>
+<span id="a-e-i-o-u-A-E-I-O-U"></span><h2 class="chapter">4 � � � � � � � � � 
�</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
 
b/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
index 51c5121c..a65cd43 100644
--- 
a/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
+++ 
b/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
@@ -44,10 +44,9 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="a-e-i-o-u-y-A-E-I-O-U">
-<h2 class="chapter">1 � � � � � � � � � � �</h2>
+<span id="a-e-i-o-u-y-A-E-I-O-U"></span><h2 class="chapter">1 � � � � � � � � 
� � �</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/a-e-u.html 
b/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/a-e-u.html
index d22c8f5..445797d 100644
--- 
a/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/a-e-u.html
+++ 
b/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/a-e-u.html
@@ -44,10 +44,9 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="a-e-u">
-<h2 class="chapter">3 � � �</h2>
+<span id="a-e-u"></span><h2 class="chapter">3 � � �</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/c.html 
b/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/c.html
index a6173e5..39f17c2 100644
--- a/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/c.html
+++ b/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/c.html
@@ -43,8 +43,7 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="c">
-<h2 class="chapter">5 �</h2>
+<span id="c"></span><h2 class="chapter">5 �</h2>
 
 <p><a href="a-e-i-o-u-y-A-E-I-O-U.html">� � � � � � � � � � �</a>
 <a href="e.html">�</a>
@@ -59,7 +58,7 @@ Previous: <a href="a-e-i-o-u-A-E-I-O-U.html" accesskey="p" 
rel="prev">
 <span id="index-a-e-i-o-u-A-E-I-O-U"></span>
 <span id="index-c"></span>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/e.html 
b/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/e.html
index 5d8ef33..495af9a 100644
--- a/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/e.html
+++ b/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/e.html
@@ -44,10 +44,9 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="e">
-<h2 class="chapter">2 �</h2>
+<span id="e"></span><h2 class="chapter">2 �</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/index.html 
b/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/index.html
index f17d9f5..9a1269e 100644
--- 
a/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/index.html
+++ 
b/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/index.html
@@ -44,8 +44,7 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#Top_cp_letter-�"><b>�</b></a>
  &nbsp; 
@@ -98,7 +97,7 @@ Next: <a href="a-e-i-o-u-y-A-E-I-O-U.html" accesskey="n" 
rel="next">
 <li><a href="a-e-i-o-u-A-E-I-O-U.html" accesskey="4">� � � � � � � � � 
�</a></li>
 <li><a href="c.html" accesskey="5">�</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="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/converters_tests/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
 
b/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
index c1ad041..188cc9b 100644
--- 
a/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
+++ 
b/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
@@ -44,10 +44,9 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="a-e-i-o-u-A-E-I-O-U">
-<h2 class="chapter">4 â ê î ô û Â Ê Î Ô Û</h2>
+<span id="a-e-i-o-u-A-E-I-O-U"></span><h2 class="chapter">4 â ê î ô û Â Ê Î Ô 
Û</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
 
b/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
index 66ecca6..47db5fd 100644
--- 
a/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
+++ 
b/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
@@ -44,10 +44,9 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="a-e-i-o-u-y-A-E-I-O-U">
-<h2 class="chapter">1 ä ë ï ö ü ÿ Ä Ë Ï Ö Ü</h2>
+<span id="a-e-i-o-u-y-A-E-I-O-U"></span><h2 class="chapter">1 ä ë ï ö ü ÿ Ä Ë 
Ï Ö Ü</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/a-e-u.html 
b/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/a-e-u.html
index 3624188..fc0afe3 100644
--- a/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/a-e-u.html
+++ b/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/a-e-u.html
@@ -44,10 +44,9 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="a-e-u">
-<h2 class="chapter">3 à è ù</h2>
+<span id="a-e-u"></span><h2 class="chapter">3 à è ù</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/c.html 
b/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/c.html
index 8608a4e..e0155e3 100644
--- a/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/c.html
+++ b/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/c.html
@@ -43,8 +43,7 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="c">
-<h2 class="chapter">5 ç</h2>
+<span id="c"></span><h2 class="chapter">5 ç</h2>
 
 <p><a href="a-e-i-o-u-y-A-E-I-O-U.html">ä ë ï ö ü ÿ Ä Ë Ï Ö Ü</a>
 <a href="e.html">é</a>
@@ -59,7 +58,7 @@ Previous: <a href="a-e-i-o-u-A-E-I-O-U.html" accesskey="p" 
rel="prev">â ê î 
 <span id="index-a-e-i-o-u-A-E-I-O-U"></span>
 <span id="index-c"></span>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/e.html 
b/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/e.html
index 567f683..9113196 100644
--- a/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/e.html
+++ b/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/e.html
@@ -44,10 +44,9 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="e">
-<h2 class="chapter">2 é</h2>
+<span id="e"></span><h2 class="chapter">2 é</h2>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/index.html 
b/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/index.html
index 4925179..8f79571 100644
--- a/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/index.html
+++ b/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/index.html
@@ -44,8 +44,7 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#Top_cp_letter-Â"><b>Â</b></a>
  &nbsp; 
@@ -98,7 +97,7 @@ Next: <a href="a-e-i-o-u-y-A-E-I-O-U.html" accesskey="n" 
rel="next">ä ë ï ö
 <li><a href="a-e-i-o-u-A-E-I-O-U.html" accesskey="4">â ê î ô û Â Ê Î Ô 
Û</a></li>
 <li><a href="c.html" accesskey="5">ç</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="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/converters_tests/char_latin2_latin2_in_refs/res_html/A-a-_002c-E-e.html
 
b/tp/t/results/converters_tests/char_latin2_latin2_in_refs/res_html/A-a-_002c-E-e.html
index 3491511..73db1eb 100644
--- 
a/tp/t/results/converters_tests/char_latin2_latin2_in_refs/res_html/A-a-_002c-E-e.html
+++ 
b/tp/t/results/converters_tests/char_latin2_latin2_in_refs/res_html/A-a-_002c-E-e.html
@@ -43,12 +43,11 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="A-a-_002c-E-e">
-<h2 class="chapter">1 � � � � �</h2>
+<span id="A-a-_002c-E-e"></span><h2 class="chapter">1 � � � � �</h2>
 
 <span id="index-A-a-_002c-E-e"></span>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/char_latin2_latin2_in_refs/res_html/index.html 
b/tp/t/results/converters_tests/char_latin2_latin2_in_refs/res_html/index.html
index 8b55cd6..a51439c 100644
--- 
a/tp/t/results/converters_tests/char_latin2_latin2_in_refs/res_html/index.html
+++ 
b/tp/t/results/converters_tests/char_latin2_latin2_in_refs/res_html/index.html
@@ -44,8 +44,7 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <p><a href="A-a-_002c-E-e.html">� � � � �</a>.
 </p>
@@ -67,7 +66,7 @@ Next: <a href="A-a-_002c-E-e.html" accesskey="n" rel="next">
 <ul class="section-toc">
 <li><a href="A-a-_002c-E-e.html" accesskey="1">� � � � �</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="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/converters_tests/complex_nestings.pl 
b/tp/t/results/converters_tests/complex_nestings.pl
index 1e9a993..2cc882d 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -1438,8 +1438,7 @@ $result_converted{'plaintext'}->{'complex_nestings'} = '  
   deffs
 ';
 
 
-$result_converted{'html_text'}->{'complex_nestings'} = '<div class="node" 
id="Top">
-<h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'complex_nestings'} = '<span 
id="Top"></span><h1 class="node-heading">Top</h1>
 
 <div class="example">
 <pre class="example">deffs
@@ -1473,7 +1472,7 @@ explanation
 <pre class="example">
 
 </pre></div>
-</div><hr></div>
+<hr></div>
 ';
 
 
diff --git a/tp/t/results/converters_tests/footnote_no_number.pl 
b/tp/t/results/converters_tests/footnote_no_number.pl
index d29a72b..8c33c0b 100644
--- a/tp/t/results/converters_tests/footnote_no_number.pl
+++ b/tp/t/results/converters_tests/footnote_no_number.pl
@@ -230,13 +230,12 @@ $result_converted{'plaintext'}->{'footnote_no_number'} = 
'Para(*).
 ';
 
 
-$result_converted{'html_text'}->{'footnote_no_number'} = '<div class="node" 
id="Top">
-<h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'footnote_no_number'} = '<span 
id="Top"></span><h1 class="node-heading">Top</h1>
 
 <p>Para<a id="DOCF1" href="#FOOT1"><sup>*</sup></a>.
 </p>
 <p>Para2<a id="DOCF2" href="#FOOT2"><sup>*</sup></a>.
-</p></div><div class="footnote">
+</p><div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
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 c5a1381..e2bfa7f 100644
--- a/tp/t/results/converters_tests/footnote_no_number_separate.pl
+++ b/tp/t/results/converters_tests/footnote_no_number_separate.pl
@@ -228,13 +228,12 @@ 
$result_converted{'plaintext'}->{'footnote_no_number_separate'} = 'Para(*) (*not
 ';
 
 
-$result_converted{'html_text'}->{'footnote_no_number_separate'} = '<div 
class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'footnote_no_number_separate'} = '<span 
id="Top"></span><h1 class="node-heading">Top</h1>
 
 <p>Para<a id="DOCF1" href="#FOOT1"><sup>*</sup></a>.
 </p>
 <p>Para2<a id="DOCF2" href="#FOOT2"><sup>*</sup></a>.
-</p></div><div class="footnote">
+</p><div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
diff --git a/tp/t/results/converters_tests/image_formatting.pl 
b/tp/t/results/converters_tests/image_formatting.pl
index 66ede27..f6b54d2 100644
--- a/tp/t/results/converters_tests/image_formatting.pl
+++ b/tp/t/results/converters_tests/image_formatting.pl
@@ -2574,8 +2574,7 @@ Image description""\\.
 ';
 
 
-$result_converted{'html_text'}->{'image_formatting'} = '<div class="node" 
id="Top">
-<h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'image_formatting'} = '<span 
id="Top"></span><h1 class="node-heading">Top</h1>
 
 <p><code>@image{f--ile}</code> <img src="f--ile.png" alt="f--ile">
 <code>@image{f--ile,l--i}</code> <img src="f--ile.png" alt="f--ile">
@@ -2603,7 +2602,7 @@ $result_converted{'html_text'}->{'image_formatting'} = 
'<div class="node" id="To
 
 <p>in para
 <img src="f--ile.png" alt="a very long alt argument that could span more than 
one line who knows">.
-</p></div><hr></div>
+</p><hr></div>
 ';
 
 $result_converted_errors{'html_text'}->{'image_formatting'} = [
diff --git a/tp/t/results/converters_tests/index_entry_in_preformatted.pl 
b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
index 356370f..c303ff5 100644
--- a/tp/t/results/converters_tests/index_entry_in_preformatted.pl
+++ b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
@@ -370,15 +370,14 @@ 
$result_converted{'plaintext'}->{'index_entry_in_preformatted'} = '     text
 ';
 
 
-$result_converted{'html_text'}->{'index_entry_in_preformatted'} = '<div 
class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'index_entry_in_preformatted'} = '<span 
id="Top"></span><h1 class="node-heading">Top</h1>
 
 <div class="example">
 <pre class="example"><span id="index-first"></span>text
 
 <span id="index-other"></span>text2
 <span id="index-last"></span></pre></div>
-</div><hr></div>
+<hr></div>
 ';
 
 
diff --git 
a/tp/t/results/converters_tests/japanese_shift_jis/res_html/Introduction.html 
b/tp/t/results/converters_tests/japanese_shift_jis/res_html/Introduction.html
index 6a1f8b8..b1af7fa 100644
--- 
a/tp/t/results/converters_tests/japanese_shift_jis/res_html/Introduction.html
+++ 
b/tp/t/results/converters_tests/japanese_shift_jis/res_html/Introduction.html
@@ -50,12 +50,11 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="Introduction-1">
-<h2 class="chapter">2 Introduction</h2>
+<span id="Introduction-1"></span><h2 class="chapter">2 Introduction</h2>
 
 <p>���̏͂ł͓ǎ҂� LilyPond �Ƃ��̃h�L�������g�ɂ‚��Ă̏Љ��s���܂��B
 </p>
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/japanese_shift_jis/res_html/Preface.html 
b/tp/t/results/converters_tests/japanese_shift_jis/res_html/Preface.html
index 58383e3..9d24bb9 100644
--- a/tp/t/results/converters_tests/japanese_shift_jis/res_html/Preface.html
+++ b/tp/t/results/converters_tests/japanese_shift_jis/res_html/Preface.html
@@ -51,13 +51,12 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="Preface-1">
-<h2 class="chapter">1 Preface</h2>
+<span id="Preface-1"></span><h2 class="chapter">1 Preface</h2>
 
 <p>����� 1995 �N�̂������ EJE (Eindhoven Youth Orchestra) 
�̃��n�[�T�����̂ł����Ƃł��� �| 
����ς��҂̃o�C�I�����t�҂ł���W�����͓������ς��҂̃t�����`�z�����t�҂̃n��-�E�F���ɔނ���������Ă���V�����傫�ȃv���W�F�N�g�̂��Ƃ�b���܂����B����͉��y��o�ł��邽�߂̎��������ꂽ�V�X�e���ł�
 (���m�ɂ́A����� MPP �| MusiXTeX 
�̃v���v���Z�b�T�ł�)�B����𕷂��ăn��-�E�F���͂����Ɋy�����炢���‚��̕�����v�����g�A�E�g�������Ǝv���A�ނ͂��̂��߂̃\�t�g�E�F�A��T���n�߁A�����ɂ��̗��ɂȂ��Ă��܂��܂����B��
 �ꂪ MPP �̏I������t���܂����B�����̓N�w�I�l�@��܂ݔ��M���� email � [...]
 </p>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/japanese_shift_jis/res_html/index.html 
b/tp/t/results/converters_tests/japanese_shift_jis/res_html/index.html
index cffc4e4..19eed56 100644
--- a/tp/t/results/converters_tests/japanese_shift_jis/res_html/index.html
+++ b/tp/t/results/converters_tests/japanese_shift_jis/res_html/index.html
@@ -52,8 +52,7 @@ ul.no-bullet {list-style: none}
 Next: <a href="Preface.html" accesskey="n" rel="next">Preface</a> &nbsp; </p>
 </div>
 <hr>
-<div class="node" id="GNU-LilyPond-_002d_002d_002d-XueXimaniyuaru">
-<h1 class="top">GNU LilyPond &mdash; �w�K�}�j���A��</h1>
+<span id="GNU-LilyPond-_002d_002d_002d-XueXimaniyuaru"></span><h1 
class="top">GNU LilyPond &mdash; �w�K�}�j���A��</h1>
 
 
 
@@ -64,7 +63,7 @@ Next: <a href="Preface.html" accesskey="n" 
rel="next">Preface</a> &nbsp; </p>
 <li><a href="Preface.html" accesskey="1">Preface</a></li>
 <li><a href="Introduction.html" accesskey="2">Introduction</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="header">
 <p>
 Next: <a href="Preface.html" accesskey="n" rel="next">Preface</a> &nbsp; </p>
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 abb5c7c..f63f36e 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
@@ -769,8 +769,7 @@ 
$result_converted{'plaintext'}->{'printindex_merged_indices_code_style'} = '* Me
 ';
 
 
-$result_converted{'html_text'}->{'printindex_merged_indices_code_style'} = 
'<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'printindex_merged_indices_code_style'} = 
'<span id="Top"></span><h1 class="node-heading">Top</h1>
 
 
 
@@ -823,7 +822,7 @@ 
$result_converted{'html_text'}->{'printindex_merged_indices_code_style'} = '<div
 <a class="summary-letter" href="#t_h_fn_letter-V"><b>V</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr></div>
+<hr></div>
 ';
 
 
diff --git a/tp/t/results/converters_tests/ref_in_sectioning.pl 
b/tp/t/results/converters_tests/ref_in_sectioning.pl
index 02f6f22..dc0100f 100644
--- a/tp/t/results/converters_tests/ref_in_sectioning.pl
+++ b/tp/t/results/converters_tests/ref_in_sectioning.pl
@@ -2546,8 +2546,7 @@ $result_converted{'html_text'}->{'ref_in_sectioning'} = '
 <p>
  &nbsp; </p>
 </div>
-<div class="node" id="for-example-node-_0028node_0029-_0028Top_0029">
-<h1 class="top">for example <a href="#node">See <a data-manual="file name" 
href="file name.html#node">title</a> in <cite>Manual</cite>.</a> (see <a 
href="#node">See <a data-manual="file name" href="file 
name.html#node">title</a> in <cite>Manual</cite>.</a>) (see <cite><a 
data-manual="file" href="file.html#Top">Manual</a></cite>)</h1>
+<span id="for-example-node-_0028node_0029-_0028Top_0029"></span><h1 
class="top">for example <a href="#node">See <a data-manual="file name" 
href="file name.html#node">title</a> in <cite>Manual</cite>.</a> (see <a 
href="#node">See <a data-manual="file name" href="file 
name.html#node">title</a> in <cite>Manual</cite>.</a>) (see <cite><a 
data-manual="file" href="file.html#Top">Manual</a></cite>)</h1>
 
 
 <div class="Contents_element">
@@ -2575,24 +2574,22 @@ $result_converted{'html_text'}->{'ref_in_sectioning'} = 
'
 </ul>
 </div>
 </div>
-</div><hr>
+<hr>
 <div class="chapter" id="node">
 <div class="header">
 <p>
  &nbsp; </p>
 </div>
-<div class="node" id="node_002e">
-<h2 class="chapter">1 See <a data-manual="file name" href="file 
name.html#node">title</a> in <cite>Manual</cite>.</h2>
+<span id="node_002e"></span><h2 class="chapter">1 See <a data-manual="file 
name" href="file name.html#node">title</a> in <cite>Manual</cite>.</h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="chap">
 <div class="header">
 <p>
  &nbsp; </p>
 </div>
-<div class="node" id="node-just-node">
-<h2 class="chapter">2 <a href="#node">See <a data-manual="file name" 
href="file name.html#node">title</a> in <cite>Manual</cite>.</a> just node</h2>
+<span id="node-just-node"></span><h2 class="chapter">2 <a href="#node">See <a 
data-manual="file name" href="file name.html#node">title</a> in 
<cite>Manual</cite>.</a> just node</h2>
 
 <ul class="section-toc">
 <li><a href="#node-node_002c-crossref-arg2" accesskey="1"><a 
href="#node">cross ref name</a>  node, crossref arg2</a></li>
@@ -2608,43 +2605,31 @@ $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><div class="section" id="node-node_002c-crossref-arg2">
-<h3 class="section">2.1 <a href="#node">cross ref name</a>  node, crossref 
arg2</h3>
+<span id="node-node_002c-crossref-arg2"></span><h3 class="section">2.1 <a 
href="#node">cross ref name</a>  node, crossref arg2</h3>
 
-</div><div class="section" id="node-code-node_002c-samptitle-arg3">
-<h3 class="section">2.2 <a href="#node">&lsquo;<samp>title</samp>&rsquo;</a>  
code node, samptitle arg3</h3>
+<span id="node-code-node_002c-samptitle-arg3"></span><h3 class="section">2.2 
<a href="#node">&lsquo;<samp>title</samp>&rsquo;</a>  code node, samptitle 
arg3</h3>
 
-</div><div class="section" 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>node</code></a> code node, file name</h3>
+<span id="node-code-node_002c-file-name"></span><h3 class="section">2.3 <a 
data-manual="file name" href="file name.html#node">(file 
name)<code>node</code></a> code node, file name</h3>
 
-</div><div class="section" id="node-node-and-manual">
-<h3 class="section">2.4 &lsquo;node&rsquo; in <cite>Manual</cite> node and 
manual</h3>
+<span id="node-node-and-manual"></span><h3 class="section">2.4 
&lsquo;node&rsquo; in <cite>Manual</cite> node and manual</h3>
 
-</div><div class="section" id="Top-Top-and-manual">
-<h3 class="section">2.5 <cite>Manual</cite> Top and manual</h3>
+<span id="Top-Top-and-manual"></span><h3 class="section">2.5 
<cite>Manual</cite> Top and manual</h3>
 
-</div><div class="section" id="Manual-no-node-just-manual">
-<h3 class="section">2.6 <cite>Manual</cite> no node just manual</h3>
+<span id="Manual-no-node-just-manual"></span><h3 class="section">2.6 
<cite>Manual</cite> no node just manual</h3>
 
-</div><div class="section" 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>
+<span id="file-name-no-node-just-file-name"></span><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">
-<h3 class="section">2.8 See <a data-manual="c" href="c.html#a">(c)b</a> 
inforef a b c</h3>
+<span id="a-inforef-a-b-c"></span><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">
-<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>
+<span id="g_t_0028Top_0029-pxref-Top-file-name_002c-spaces"></span><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">
-<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>
+<span id="g_t_0028file-name_0029-pxref-file-name-only_002c-spaces"></span><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">
-<h3 class="section">2.11 See <a data-manual="filename" 
href="filename.html#Top">(filename)Top</a>, xref Top filename only, no 
spaces</h3>
+<span id="Top_002c-xref-Top-filename-only_002c-no-spaces"></span><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">
-<h3 class="section">2.12 See <a data-manual="filename" 
href="filename.html#Top">(filename)</a>. xref filename only, no spaces</h3>
+<span id="filename_002e-xref-filename-only_002c-no-spaces"></span><h3 
class="section">2.12 See <a data-manual="filename" 
href="filename.html#Top">(filename)</a>. xref filename only, no spaces</h3>
 
-</div><hr>
+<hr>
 ';
 
 
diff --git a/tp/t/results/converters_tests/refs_formatting.pl 
b/tp/t/results/converters_tests/refs_formatting.pl
index 0cfaefb..bdb619f 100644
--- a/tp/t/results/converters_tests/refs_formatting.pl
+++ b/tp/t/results/converters_tests/refs_formatting.pl
@@ -4465,8 +4465,7 @@ title: (file name)(pman)anode. \'@ref{(pman)anode,,,file 
name,manual}\'
 
 
 $result_converted{'html_text'}->{'refs_formatting'} = '<div class="chapter" 
id="chapter">
-<div class="node" id="chapter-1">
-<h2 class="chapter">1 chapter</h2>
+<span id="chapter-1"></span><h2 class="chapter">1 chapter</h2>
 
 <p><code>@ref{chapter,cross ref name}</code> <a href="#chapter">cross ref 
name</a>
 <code>@ref{chapter,,title}</code> <a href="#chapter">title</a>
@@ -4502,7 +4501,7 @@ $result_converted{'html_text'}->{'refs_formatting'} = 
'<div class="chapter" id="
 <code>@inforef{chapter}</code> See &lsquo;chapter&rsquo;
 <code>@inforef{chapter, cross ref name}</code> See &lsquo;cross ref name&rsquo;
 <code>@inforef{chapter,,file name}</code> See <a data-manual="file name" 
href="file name.html#chapter">(file name)chapter</a>
-</p></div><hr></div>
+</p><hr></div>
 ';
 
 
diff --git 
a/tp/t/results/converters_tests/sample_utf8/res_html/DiYiZhang_0028First-Chapter_0029.html
 
b/tp/t/results/converters_tests/sample_utf8/res_html/DiYiZhang_0028First-Chapter_0029.html
index e3f592d..9f61ebb 100644
--- 
a/tp/t/results/converters_tests/sample_utf8/res_html/DiYiZhang_0028First-Chapter_0029.html
+++ 
b/tp/t/results/converters_tests/sample_utf8/res_html/DiYiZhang_0028First-Chapter_0029.html
@@ -49,8 +49,7 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="DiYiZhang_0028First-Chapter_0029">
-<h2 class="chapter">1 第一章(First Chapter)</h2>
+<span id="DiYiZhang_0028First-Chapter_0029"></span><h2 class="chapter">1 
第一章(First Chapter)</h2>
 
 <span id="index-chapter_002c-first"></span>
 
@@ -69,7 +68,7 @@ This is the first item.
 This is the second item.
 </li></ol>
 
-</div></div>
+</div>
 
 
 
diff --git a/tp/t/results/converters_tests/sample_utf8/res_html/Index-node.html 
b/tp/t/results/converters_tests/sample_utf8/res_html/Index-node.html
index 0dab147..9cdbe5f 100644
--- a/tp/t/results/converters_tests/sample_utf8/res_html/Index-node.html
+++ b/tp/t/results/converters_tests/sample_utf8/res_html/Index-node.html
@@ -48,8 +48,7 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="Index">
-<h2 class="unnumbered">Index</h2>
+<span id="Index"></span><h2 class="unnumbered">Index</h2>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#Index-node_cp_letter-C"><b>C</b></a>
  &nbsp; 
@@ -86,7 +85,7 @@ Previous: <a href="Second-Chapter-AE-AE-ae-ae.html" 
accesskey="p" rel="prev">Cha
  &nbsp; 
 </td></tr></table>
 
-</div></div>
+</div>
 
 
 
diff --git 
a/tp/t/results/converters_tests/sample_utf8/res_html/Second-Chapter-AE-AE-ae-ae.html
 
b/tp/t/results/converters_tests/sample_utf8/res_html/Second-Chapter-AE-AE-ae-ae.html
index f69bcdb..8fc1ad0 100644
--- 
a/tp/t/results/converters_tests/sample_utf8/res_html/Second-Chapter-AE-AE-ae-ae.html
+++ 
b/tp/t/results/converters_tests/sample_utf8/res_html/Second-Chapter-AE-AE-ae-ae.html
@@ -49,12 +49,11 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="Chapter-2-AE-AE-ae-ae">
-<h2 class="chapter">2 Chapter 2 AE ĄĘ ae ąę</h2>
+<span id="Chapter-2-AE-AE-ae-ae"></span><h2 class="chapter">2 Chapter 2 AE ĄĘ 
ae ąę</h2>
 
 <p>Zażółć gęślą jaźń!
 </p>
-</div></div>
+</div>
 
 
 
diff --git a/tp/t/results/converters_tests/sample_utf8/res_html/index.html 
b/tp/t/results/converters_tests/sample_utf8/res_html/index.html
index 8849b44..ee1ad00 100644
--- a/tp/t/results/converters_tests/sample_utf8/res_html/index.html
+++ b/tp/t/results/converters_tests/sample_utf8/res_html/index.html
@@ -52,8 +52,7 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="TexinfoZhongWenShiLi">
-<h1 class="top">Texinfo中文示例</h1>
+<span id="TexinfoZhongWenShiLi"></span><h1 class="top">Texinfo中文示例</h1>
 
 <p>This is a short example of a complete Texinfo file.
 </p>
@@ -74,7 +73,7 @@ Texinfo中文示例
 </ul>
 </div>
 </div>
-</div><hr>
+<hr>
 <div class="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/converters_tests/some_at_commands_in_ref_nodes.pl 
b/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
index 76194a4..bb24866 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
@@ -1832,24 +1832,22 @@ 
$result_converted{'html_text'}->{'some_at_commands_in_ref_nodes'} = '
 <p>
  &nbsp; </p>
 </div>
-<div class="node" id="Top-1">
-<h1 class="top">Top</h1>
+<span id="Top-1"></span><h1 class="top">Top</h1>
 
 
 <ul class="section-toc">
 <li><a href="#A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1" 
accesskey="1">A <small>SC</small> node &iuml; &iuml; &#274;` &#322; &#262;, 
&iexcl;</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="chapter" 
id="A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1">
 <div class="header">
 <p>
  &nbsp; </p>
 </div>
-<div class="node" id="A-SC-node-i-i-E-l-C-_00a1">
-<h2 class="chapter">1 A <small>SC</small> node &iuml; &iuml; &#274;` &#322; 
&#262;, &iexcl;</h2>
+<span id="A-SC-node-i-i-E-l-C-_00a1"></span><h2 class="chapter">1 A 
<small>SC</small> node &iuml; &iuml; &#274;` &#322; &#262;, &iexcl;</h2>
 
 <p>see <a data-manual="manual" 
href="manual.html#a-strong-ref-with-SC_002c-a-i-trema-_00ef_002c-a-dotless-i-trema-_00ef-_1e14-and-exclamdown-_00a1">(manual)a
 <strong>strong</strong> ref with <small>SC</small>, a i trema &iuml;, a 
dotless i trema &iuml; &#274;` and exclamdown &iexcl;</a>.
-</p></div><hr>
+</p><hr>
 ';
 
 
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 3f75832..ac76712 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
@@ -959,30 +959,26 @@ 
$result_converted{'plaintext'}->{'spaces_in_empty_node_names'} = '*note   ::
 ';
 
 
-$result_converted{'html_text'}->{'spaces_in_empty_node_names'} = '<div 
class="node" id="Top">
-<div class="header">
+$result_converted{'html_text'}->{'spaces_in_empty_node_names'} = '<span 
id="Top"></span><div class="header">
 <p>
  &nbsp; </p>
 </div>
 <h1 class="node-heading">Top</h1>
 
 
-</div><hr>
-<div class="node">
+<hr>
 <div class="header">
 <p>
  &nbsp; </p>
 </div>
 
-</div><hr>
-<div class="node">
+<hr>
 <div class="header">
 <p>
  &nbsp; </p>
 </div>
 
-</div><hr>
-<div class="node">
+<hr>
 <div class="header">
 <p>
  &nbsp; </p>
@@ -993,7 +989,7 @@ 
$result_converted{'html_text'}->{'spaces_in_empty_node_names'} = '<div class="no
 <p>&lsquo;<tt>  </tt>&rsquo;
 </p>
 <p>&lsquo;&nbsp;&nbsp;<!-- /@w -->&rsquo;
-</p></div><hr>
+</p><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 d6a7063..ab4b518 100644
--- a/tp/t/results/converters_tests/spaces_in_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_node_names.pl
@@ -1054,33 +1054,29 @@ 
$result_converted{'plaintext'}->{'spaces_in_node_names'} = '*note a  ::
 ';
 
 
-$result_converted{'html_text'}->{'spaces_in_node_names'} = '<div class="node" 
id="Top">
-<div class="header">
+$result_converted{'html_text'}->{'spaces_in_node_names'} = '<span 
id="Top"></span><div class="header">
 <p>
  &nbsp; </p>
 </div>
 <h1 class="node-heading">Top</h1>
 
 
-</div><hr>
-<div class="node" id="a--">
-<div class="header">
+<hr>
+<span id="a--"></span><div class="header">
 <p>
  &nbsp; </p>
 </div>
 <h4 class="node-heading">a&nbsp;&nbsp;</h4>
 
-</div><hr>
-<div class="node" id="b-">
-<div class="header">
+<hr>
+<span id="b-"></span><div class="header">
 <p>
  &nbsp; </p>
 </div>
 <h4 class="node-heading">b<tt>  </tt></h4>
 
-</div><hr>
-<div class="node" id="c-">
-<div class="header">
+<hr>
+<span id="c-"></span><div class="header">
 <p>
  &nbsp; </p>
 </div>
@@ -1091,7 +1087,7 @@ $result_converted{'html_text'}->{'spaces_in_node_names'} 
= '<div class="node" id
 <p><a href="#b-">b<tt>  </tt></a>
 </p>
 <p><a href="#c-">c&nbsp;&nbsp;<!-- /@w --></a>
-</p></div><hr>
+</p><hr>
 ';
 
 
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl 
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 0294326..b1f7a1c 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -960,8 +960,7 @@ $result_converted{'plaintext'}->{'test_deftypefnnewline'} = 
' -- Function:
 
 $result_converted{'html_text'}->{'test_deftypefnnewline'} = '
 
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 <dl class="def">
 <dt id="index-name"><span class="category">Function:<br> 
</span><span><em>data-type</em><br> <strong>name</strong> 
<em>arguments...</em><a href=\'#index-name\' class=\'copiable-anchor\'> 
&para;</a></span></dt>
 <dd><p>aaa
@@ -982,7 +981,7 @@ $result_converted{'html_text'}->{'test_deftypefnnewline'} = 
'
 <dt id="index-arg2"><span class="category">fun2: 
</span><span><strong>arg2</strong><a href=\'#index-arg2\' 
class=\'copiable-anchor\'> &para;</a></span></dt>
 <dd><p>fff2
 </p></dd></dl>
-</div><hr></div>
+<hr></div>
 ';
 
 
diff --git a/tp/t/results/converters_tests/things_before_setfilename.pl 
b/tp/t/results/converters_tests/things_before_setfilename.pl
index 8eb5f76..3e042ba 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -1527,8 +1527,7 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 <div class="top" id="Top">
-<div class="node" id="top-section">
-<h1 class="top">top section</h1>
+<span id="top-section"></span><h1 class="top">top section</h1>
 
 <p>Ref to anchor
 <a href="#An-anchor">An anchor</a>
@@ -1536,7 +1535,7 @@ ul.no-bullet {list-style: none}
 <p>Ref to footnote anchor
 <a href="#Anchor-in-footnote">Anchor in footnote</a>
 </p>
-</div><hr></div>
+<hr></div>
 </div>
 
 
diff --git a/tp/t/results/converters_tests/top_in_ref.pl 
b/tp/t/results/converters_tests/top_in_ref.pl
index 1c5f1e3..bb0c29e 100644
--- a/tp/t/results/converters_tests/top_in_ref.pl
+++ b/tp/t/results/converters_tests/top_in_ref.pl
@@ -4392,8 +4392,7 @@ name)Top::
 ';
 
 
-$result_converted{'html_text'}->{'top_in_ref'} = '<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'top_in_ref'} = '<span id="Top"></span><h1 
class="node-heading">Top</h1>
 
 <p><code>@ref{Top,cross ref name}</code> <a href="#Top">cross ref name</a>
 <code>@ref{Top,,title}</code> <a href="#Top">title</a>
@@ -4429,7 +4428,7 @@ $result_converted{'html_text'}->{'top_in_ref'} = '<div 
class="node" id="Top">
 <code>@inforef{Top}</code> 
 <code>@inforef{Top, cross ref name}</code> See &lsquo;cross ref name&rsquo;
 <code>@inforef{Top,,file name}</code> See <a data-manual="file name" 
href="file name.html#Top">(file name)Top</a>
-</p></div><hr></div>
+</p><hr></div>
 ';
 
 
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 a9e9556..a82ad93 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
@@ -4354,8 +4354,7 @@ $result_floats{'top_in_ref_keep_top'} = {};
 
 
 
-$result_converted{'html_text'}->{'top_in_ref_keep_top'} = '<div class="node" 
id="Top">
-<h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'top_in_ref_keep_top'} = '<span 
id="Top"></span><h1 class="node-heading">Top</h1>
 
 <p><code>@ref{Top,cross ref name}</code> <a href="#Top">cross ref name</a>
 <code>@ref{Top,,title}</code> <a href="#Top">title</a>
@@ -4391,7 +4390,7 @@ $result_converted{'html_text'}->{'top_in_ref_keep_top'} = 
'<div class="node" id=
 <code>@inforef{Top}</code> See &lsquo;Top&rsquo;
 <code>@inforef{Top, cross ref name}</code> See &lsquo;cross ref name&rsquo;
 <code>@inforef{Top,,file name}</code> See <a data-manual="file name" 
href="file name.html#Top">(file name)Top</a>
-</p></div><hr></div>
+</p><hr></div>
 ';
 
 1;
diff --git a/tp/t/results/converters_tests/weird_accents.pl 
b/tp/t/results/converters_tests/weird_accents.pl
index 0099fcd..b1f4f8d 100644
--- a/tp/t/results/converters_tests/weird_accents.pl
+++ b/tp/t/results/converters_tests/weird_accents.pl
@@ -645,8 +645,7 @@ i~=
 
 $result_converted{'html_text'}->{'weird_accents'} = '
 <div class="top" id="Top">
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <p>&#297;=
 </p>
@@ -657,7 +656,7 @@ $result_converted{'html_text'}->{'weird_accents'} = '
 <p>.r`^
 </p>
 <p>r`\'=
-</p></div><hr></div>
+</p><hr></div>
 ';
 
 
diff --git a/tp/t/results/converters_tests/weird_accents_disable_encoding.pl 
b/tp/t/results/converters_tests/weird_accents_disable_encoding.pl
index 70984dc..16bbd75 100644
--- a/tp/t/results/converters_tests/weird_accents_disable_encoding.pl
+++ b/tp/t/results/converters_tests/weird_accents_disable_encoding.pl
@@ -645,8 +645,7 @@ i~=
 
 $result_converted{'html_text'}->{'weird_accents_disable_encoding'} = '
 <div class="top" id="Top">
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <p>&#297;=
 </p>
@@ -657,7 +656,7 @@ 
$result_converted{'html_text'}->{'weird_accents_disable_encoding'} = '
 <p>.r`^
 </p>
 <p>r`\'=
-</p></div><hr></div>
+</p><hr></div>
 ';
 
 
diff --git a/tp/t/results/coverage/commands.pl 
b/tp/t/results/coverage/commands.pl
index ade609b..94b926d 100644
--- a/tp/t/results/coverage/commands.pl
+++ b/tp/t/results/coverage/commands.pl
@@ -568,9 +568,8 @@ File &rarr; Open.
 </p>
 <span id="index-index-entry-_0060_0060in-text_0027_0027-LaTeX"></span>
 
-<div class="majorheading" id="majorheading-in-b">
-<h2 class="majorheading">majorheading <b>in b</b></h2>
-</div>';
+<span id="majorheading-in-b"></span><h2 class="majorheading">majorheading 
<b>in b</b></h2>
+';
 
 
 $result_converted{'xml'}->{'commands'} = '<para>&arobase; &tex; <spacecmd 
type="nl"/><accent type="uml" bracketed="off">e</accent> <accent 
type="circ"><dotless>i</dotless></accent> <accent type="tilde">a</accent> 
<accent type="ring" spaces=" ">a</accent>
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl 
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index b26728f..6794d43 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -1204,8 +1204,7 @@ top! After punc
 
 $result_converted{'html_text'}->{'punctuation_in_line_commands'} = '
 <div class="top" id="node_0021-After-punc">
-<div class="node" id="top_0021-After-punc">
-<h1 class="top">top! After punc</h1>
+<span id="top_0021-After-punc"></span><h1 class="top">top! After punc</h1>
 
 <dl compact="compact">
 <dt><span>item! After punc</span></dt>
@@ -1231,9 +1230,8 @@ 
$result_converted{'html_text'}->{'punctuation_in_line_commands'} = '
 
 <span id="index-index_0021-After-punc"></span>
 
-<div class="heading" id="heading_0021-After-punc">
-<h3 class="heading">heading! After punc</h3>
-</div>
+<span id="heading_0021-After-punc"></span><h3 class="heading">heading! After 
punc</h3>
+
 <h1 class="titlefont">titlefont! After punc</h1>
 
 <div align="center">center! After punc
@@ -1253,7 +1251,7 @@ 
$result_converted{'html_text'}->{'punctuation_in_line_commands'} = '
 </td></tr></table>
 
 
-</div><hr></div>
+<hr></div>
 ';
 
 
diff --git a/tp/t/results/coverage_braces/footnote_no_node.pl 
b/tp/t/results/coverage_braces/footnote_no_node.pl
index 3f6e59f..ca4522e 100644
--- a/tp/t/results/coverage_braces/footnote_no_node.pl
+++ b/tp/t/results/coverage_braces/footnote_no_node.pl
@@ -154,11 +154,10 @@ F(1).
 ';
 
 
-$result_converted{'html_text'}->{'footnote_no_node'} = '<div class="top" 
id="top">
-<h1 class="top">top</h1>
+$result_converted{'html_text'}->{'footnote_no_node'} = '<span 
id="top"></span><h1 class="top">top</h1>
 
 <p>F<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>.
-</p></div><div class="footnote">
+</p><div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
diff --git a/tp/t/results/coverage_braces/heading_in_footnote.pl 
b/tp/t/results/coverage_braces/heading_in_footnote.pl
index ae011cd..4bcd554 100644
--- a/tp/t/results/coverage_braces/heading_in_footnote.pl
+++ b/tp/t/results/coverage_braces/heading_in_footnote.pl
@@ -207,9 +207,8 @@ $result_converted{'html_text'}->{'heading_in_footnote'} = 
'<p>T<a id="DOCF1" hre
 
 <h5><a id="FOOT1" href="#DOCF1">(1)</a></h5>
 <p>AAA
-</p><div class="heading" id="H1">
-<h3 class="heading">H1</h3>
-</div><span id="index-ind-e"></span>
+</p><span id="H1"></span><h3 class="heading">H1</h3>
+<span id="index-ind-e"></span>
 <p>BBB
 </p>
 </div>
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 20c2192..9e47ba9 100644
--- a/tp/t/results/coverage_braces/inforef_too_much_args.pl
+++ b/tp/t/results/coverage_braces/inforef_too_much_args.pl
@@ -196,11 +196,10 @@ $result_converted{'plaintext'}->{'inforef_too_much_args'} 
= '*note cross ref nam
 ';
 
 
-$result_converted{'html_text'}->{'inforef_too_much_args'} = '<div class="node" 
id="chapter">
-<h4 class="node-heading">chapter</h4>
+$result_converted{'html_text'}->{'inforef_too_much_args'} = '<span 
id="chapter"></span><h4 class="node-heading">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></div><hr></div>
+</p><hr></div>
 ';
 
 1;
diff --git a/tp/t/results/coverage_braces/test_image.pl 
b/tp/t/results/coverage_braces/test_image.pl
index 645ccd6..c4ddf43 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -3947,8 +3947,7 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 
 <img 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; ">
 
@@ -3987,7 +3986,7 @@ In text [ alt <b>&icirc;&ndash;le..</b>  a
 &lt;&quot;%@  &lt; &amp; @ % &quot; ">.</p></dd>
 </dl>
 
-</div><hr></div>
+<hr></div>
 
 
 
@@ -4186,8 +4185,7 @@ $result_converted_errors{'plaintext'}->{'test_image'} = [
 
 $result_converted{'html_text'}->{'test_image'} = '
 
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 
 <img 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; ">
 
@@ -4226,7 +4224,7 @@ In text [ alt <b>&icirc;&ndash;le..</b>  a
 &lt;&quot;%@  &lt; &amp; @ % &quot; ">.</p></dd>
 </dl>
 
-</div><hr></div>
+<hr></div>
 ';
 
 $result_converted_errors{'html_text'}->{'test_image'} = [
diff --git a/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl 
b/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
index e91da1d..7e7f9fc 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
@@ -845,8 +845,7 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; </p>
 </div>
-<div class="node" id="g_t2-footnotes-in-2-nodes">
-<h1 class="top">2 footnotes in 2 nodes</h1>
+<span id="g_t2-footnotes-in-2-nodes"></span><h1 class="top">2 footnotes in 2 
nodes</h1>
 
 <p>A<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
@@ -856,20 +855,19 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">chapter</a> &nbsp; </p>
 <ul class="section-toc">
 <li><a href="#chapter" accesskey="1">chapter</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="chapter" id="chapter">
 <div class="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>
 </div>
-<div class="node" id="chapter-1">
-<h2 class="chapter">1 chapter</h2>
+<span id="chapter-1"></span><h2 class="chapter">1 chapter</h2>
 
 <p>C<a id="DOCF3" href="#FOOT3"><sup>3</sup></a>
 </p>
 <p>D<a id="DOCF4" href="#FOOT4"><sup>4</sup></a>
 </p>
-</div><div class="footnote">
+<div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
@@ -1008,8 +1006,7 @@ 
$result_converted{'html_text'}->{'two_footnotes_in_nodes'} = '<div class="top" i
 <p>
  &nbsp; </p>
 </div>
-<div class="node" id="g_t2-footnotes-in-2-nodes">
-<h1 class="top">2 footnotes in 2 nodes</h1>
+<span id="g_t2-footnotes-in-2-nodes"></span><h1 class="top">2 footnotes in 2 
nodes</h1>
 
 <p>A<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
@@ -1019,20 +1016,19 @@ 
$result_converted{'html_text'}->{'two_footnotes_in_nodes'} = '<div class="top" i
 <ul class="section-toc">
 <li><a href="#chapter" accesskey="1">chapter</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="chapter" id="chapter">
 <div class="header">
 <p>
  &nbsp; </p>
 </div>
-<div class="node" id="chapter-1">
-<h2 class="chapter">1 chapter</h2>
+<span id="chapter-1"></span><h2 class="chapter">1 chapter</h2>
 
 <p>C<a id="DOCF3" href="#FOOT3"><sup>3</sup></a>
 </p>
 <p>D<a id="DOCF4" href="#FOOT4"><sup>4</sup></a>
 </p>
-</div><div class="footnote">
+<div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
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 0bdfc2b..80b179e 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
@@ -881,8 +881,7 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; </p>
 </div>
-<div class="node" id="g_t2-footnotes-in-2-nodes">
-<h1 class="top">2 footnotes in 2 nodes</h1>
+<span id="g_t2-footnotes-in-2-nodes"></span><h1 class="top">2 footnotes in 2 
nodes</h1>
 
 <p>A<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
@@ -892,20 +891,19 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">chapter</a> &nbsp; </p>
 <ul class="section-toc">
 <li><a href="#chapter" accesskey="1">chapter</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="chapter" id="chapter">
 <div class="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>
 </div>
-<div class="node" id="chapter-1">
-<h2 class="chapter">1 chapter</h2>
+<span id="chapter-1"></span><h2 class="chapter">1 chapter</h2>
 
 <p>C<a id="DOCF3" href="#FOOT3"><sup>3</sup></a>
 </p>
 <p>D<a id="DOCF4" href="#FOOT4"><sup>4</sup></a>
 </p>
-</div><hr>
+<hr>
 </div>
 </div>
 
@@ -1023,8 +1021,7 @@ 
$result_converted{'html_text'}->{'two_footnotes_in_nodes_separate'} = '<div clas
 <p>
  &nbsp; </p>
 </div>
-<div class="node" id="g_t2-footnotes-in-2-nodes">
-<h1 class="top">2 footnotes in 2 nodes</h1>
+<span id="g_t2-footnotes-in-2-nodes"></span><h1 class="top">2 footnotes in 2 
nodes</h1>
 
 <p>A<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
@@ -1034,20 +1031,19 @@ 
$result_converted{'html_text'}->{'two_footnotes_in_nodes_separate'} = '<div clas
 <ul class="section-toc">
 <li><a href="#chapter" accesskey="1">chapter</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="chapter" id="chapter">
 <div class="header">
 <p>
  &nbsp; </p>
 </div>
-<div class="node" id="chapter-1">
-<h2 class="chapter">1 chapter</h2>
+<span id="chapter-1"></span><h2 class="chapter">1 chapter</h2>
 
 <p>C<a id="DOCF3" href="#FOOT3"><sup>3</sup></a>
 </p>
 <p>D<a id="DOCF4" href="#FOOT4"><sup>4</sup></a>
 </p>
-</div><hr>
+<hr>
 ';
 
 1;
diff --git a/tp/t/results/coverage_braces/verb_in_xref.pl 
b/tp/t/results/coverage_braces/verb_in_xref.pl
index 28c0cc6..7df1eb8 100644
--- a/tp/t/results/coverage_braces/verb_in_xref.pl
+++ b/tp/t/results/coverage_braces/verb_in_xref.pl
@@ -235,14 +235,13 @@ ggg : Top.
 ';
 
 
-$result_converted{'html_text'}->{'verb_in_xref'} = '<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'verb_in_xref'} = '<span id="Top"></span><h1 
class="node-heading">Top</h1>
 
 <p>See <a href="#Top"><tt>with
 verb
 
 ggg </tt></a>.
-</p></div><hr></div>
+</p><hr></div>
 ';
 
 1;
diff --git a/tp/t/results/def/all_commands_delimiters_printindex.pl 
b/tp/t/results/def/all_commands_delimiters_printindex.pl
index daea4f7..1f32914 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -16030,8 +16030,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 <dl class="def">
 <dt id="index-forward_002d_002dchar"><span class="category">Command: 
</span><span><strong><var>forward--char</var></strong> <em><var>nchars</var> 
argument2 argument3         (arg in brace, [something <var>in v--ar</var>, 
<b>in, b</b> , comma a<var>pref</var> p]) last</em><a 
href=\'#index-forward_002d_002dchar\' class=\'copiable-anchor\'> 
&para;</a></span></dt>
 </dl>
@@ -16220,9 +16219,8 @@ ul.no-bullet {list-style: none}
 <dt id="index-fun_005fname1"><span class="category">var then code: 
</span><span><em>ret_type1</em> <strong>fun_name1</strong> <em><var>A1</var> 
<code>A2</code> <var>A3</var> <code>A4</code></em><a 
href=\'#index-fun_005fname1\' class=\'copiable-anchor\'> &para;</a></span></dt>
 </dl>
 
-<div class="heading" id="Functions">
-<h3 class="heading">Functions</h3>
-</div><table><tr><th valign="top">Jump to: &nbsp; </th><td><a 
class="summary-letter" href="#Top_fn_symbol-1"><b>)</b></a>
+<span id="Functions"></span><h3 class="heading">Functions</h3>
+<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#Top_fn_symbol-1"><b>)</b></a>
  &nbsp; 
 <a class="summary-letter" href="#Top_fn_symbol-2"><b>,</b></a>
  &nbsp; 
@@ -16311,9 +16309,8 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<div class="heading" id="Types">
-<h3 class="heading">Types</h3>
-</div><table><tr><th valign="top">Jump to: &nbsp; </th><td><a 
class="summary-letter" href="#Top_tp_letter-A"><b>A</b></a>
+<span id="Types"></span><h3 class="heading">Types</h3>
+<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#Top_tp_letter-A"><b>A</b></a>
  &nbsp; 
 <a class="summary-letter" href="#Top_tp_letter-P"><b>P</b></a>
  &nbsp; 
@@ -16336,9 +16333,8 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<div class="heading" id="Variables">
-<h3 class="heading">Variables</h3>
-</div><table><tr><th valign="top">Jump to: &nbsp; </th><td><a 
class="summary-letter" href="#Top_vr_letter-A"><b>A</b></a>
+<span id="Variables"></span><h3 class="heading">Variables</h3>
+<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#Top_vr_letter-A"><b>A</b></a>
  &nbsp; 
 <a class="summary-letter" href="#Top_vr_letter-B"><b>B</b></a>
  &nbsp; 
@@ -16379,7 +16375,7 @@ ul.no-bullet {list-style: none}
 <a class="summary-letter" href="#Top_vr_letter-F"><b>F</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr></div>
+<hr></div>
 
 
 
diff --git a/tp/t/results/def/all_commands_printindex.pl 
b/tp/t/results/def/all_commands_printindex.pl
index ed68321..86a6c0b 100644
--- a/tp/t/results/def/all_commands_printindex.pl
+++ b/tp/t/results/def/all_commands_printindex.pl
@@ -4048,8 +4048,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 <dl class="def">
 <dt id="index-d_002d_002defvr_005fname"><span class="category">c--ategory: 
</span><span><strong>d--efvr_name</strong><a 
href=\'#index-d_002d_002defvr_005fname\' class=\'copiable-anchor\'> 
&para;</a></span></dt>
 <dd><p>d&ndash;efvr
@@ -4140,9 +4139,8 @@ ul.no-bullet {list-style: none}
 <dd><p>d&ndash;eftypemethod
 </p></dd></dl>
 
-<div class="heading" id="Functions">
-<h3 class="heading">Functions</h3>
-</div><table><tr><th valign="top">Jump to: &nbsp; </th><td><a 
class="summary-letter" href="#Top_fn_letter-D"><b>D</b></a>
+<span id="Functions"></span><h3 class="heading">Functions</h3>
+<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#Top_fn_letter-D"><b>D</b></a>
  &nbsp; 
 </td></tr></table>
 <table class="index-fn" border="0">
@@ -4164,9 +4162,8 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<div class="heading" id="Types">
-<h3 class="heading">Types</h3>
-</div><table><tr><th valign="top">Jump to: &nbsp; </th><td><a 
class="summary-letter" href="#Top_tp_letter-D"><b>D</b></a>
+<span id="Types"></span><h3 class="heading">Types</h3>
+<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#Top_tp_letter-D"><b>D</b></a>
  &nbsp; 
 </td></tr></table>
 <table class="index-tp" border="0">
@@ -4180,9 +4177,8 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<div class="heading" id="Variables">
-<h3 class="heading">Variables</h3>
-</div><table><tr><th valign="top">Jump to: &nbsp; </th><td><a 
class="summary-letter" href="#Top_vr_letter-D"><b>D</b></a>
+<span id="Variables"></span><h3 class="heading">Variables</h3>
+<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#Top_vr_letter-D"><b>D</b></a>
  &nbsp; 
 </td></tr></table>
 <table class="index-vr" border="0">
@@ -4202,7 +4198,7 @@ ul.no-bullet {list-style: none}
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#Top_vr_letter-D"><b>D</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr></div>
+<hr></div>
 
 
 
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 8513a91..8ea44ff 100644
--- a/tp/t/results/def/space_in_def_for_index.pl
+++ b/tp/t/results/def/space_in_def_for_index.pl
@@ -558,8 +558,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 
 <dl class="def">
 <dt id="index-name"><span class="category">Category: 
</span><span><strong>name</strong> <em>argument argument2...</em><a 
href=\'#index-name\' class=\'copiable-anchor\'> &para;</a></span></dt>
@@ -586,7 +585,7 @@ ul.no-bullet {list-style: none}
 <a class="summary-letter" href="#Top_fn_letter-N"><b>N</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr></div>
+<hr></div>
 
 
 
diff --git a/tp/t/results/float/anchor_in_caption.pl 
b/tp/t/results/float/anchor_in_caption.pl
index dbd4c77..ef74e49 100644
--- a/tp/t/results/float/anchor_in_caption.pl
+++ b/tp/t/results/float/anchor_in_caption.pl
@@ -450,8 +450,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 
 <dl class="listoffloats">
 <dt><a href="#label">fl 1</a></dt><dd><p>in caption</p></dd>
@@ -460,7 +459,7 @@ ul.no-bullet {list-style: none}
 <div class="float"><span id="label"></span>
 <p>In float.
 </p>
-<div class="float-caption"><p><strong>fl 1: </strong>in caption<span 
id="in-anchor"></span></p></div></div></div><hr></div>
+<div class="float-caption"><p><strong>fl 1: </strong>in caption<span 
id="in-anchor"></span></p></div></div><hr></div>
 
 
 
diff --git a/tp/t/results/float/cindex_in_caption.pl 
b/tp/t/results/float/cindex_in_caption.pl
index 0043146..1694d06 100644
--- a/tp/t/results/float/cindex_in_caption.pl
+++ b/tp/t/results/float/cindex_in_caption.pl
@@ -536,8 +536,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 
 <dl class="listoffloats">
 <dt><a href="#label">fl 1</a></dt><dd><p>in caption
@@ -564,7 +563,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr></div>
+<hr></div>
 
 
 
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 f08abc1..cd84d69 100644
--- a/tp/t/results/float/comment_space_comand_in_float.pl
+++ b/tp/t/results/float/comment_space_comand_in_float.pl
@@ -426,8 +426,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 
 <div class="float"><span id="label--"></span>
 <p>Float
@@ -436,7 +435,7 @@ ul.no-bullet {list-style: none}
 <dl class="listoffloats">
 <dt><a href="#label--">Text &nbsp; 1</a></dt><dd></dd>
 </dl>
-</div><hr></div>
+<hr></div>
 
 
 
diff --git a/tp/t/results/float/complex_float.pl 
b/tp/t/results/float/complex_float.pl
index 9e49a5b..e9ad62a 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -4904,8 +4904,7 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">A chapter</a> &nbsp; </p>
 </div>
-<div class="node" id="Test-floats">
-<h1 class="top">Test floats</h1>
+<span id="Test-floats"></span><h1 class="top">Test floats</h1>
 
 <p>A list of floats at the beginning.
 </p><dl class="listoffloats">
@@ -5017,14 +5016,13 @@ A footnote.
 <ul class="section-toc">
 <li><a href="#chapter" accesskey="1">A chapter</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="chapter" id="chapter">
 <div class="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>
 </div>
-<div class="node" id="A-chapter">
-<h2 class="chapter">1 A chapter</h2>
+<span id="A-chapter"></span><h2 class="chapter">1 A chapter</h2>
 
 <div class="float"><span 
id="float-with-a-lot-of-features-and-no-shortcaption"></span>
 
@@ -5069,7 +5067,7 @@ A footnote 2.
 </p></div></div>
 <p>See <a href="#text-with-a-lot-of-features">Text 1</a>.
 </p>
-</div><div class="footnote">
+<div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
diff --git a/tp/t/results/float/float_copying.pl 
b/tp/t/results/float/float_copying.pl
index 4113618..98d58f3 100644
--- a/tp/t/results/float/float_copying.pl
+++ b/tp/t/results/float/float_copying.pl
@@ -1640,8 +1640,7 @@ ul.no-bullet {list-style: none}
 <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>
 </div>
-<div class="node" id="Top-1">
-<h1 class="top">Top</h1>
+<span id="Top-1"></span><h1 class="top">Top</h1>
 
 
 <div class="float"><span id="public-domain"></span>
@@ -1658,14 +1657,13 @@ the author abandon his copyright.
 <ul class="section-toc">
 <li><a href="#Copying-and-floats" accesskey="1">Copying and floats</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="appendix" id="Copying-and-floats">
 <div class="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>
 </div>
-<div class="node" id="Copying-and-floats-1">
-<h2 class="appendix">Appendix A Copying and floats</h2>
+<span id="Copying-and-floats-1"></span><h2 class="appendix">Appendix A Copying 
and floats</h2>
 
 
 <div class="float"><span id="public-domain"></span>
@@ -1728,7 +1726,7 @@ the author abandon his copyright.
 <a class="summary-letter" href="#Copying-and-floats_fn_letter-P"><b>P</b></a>
  &nbsp; 
 </td></tr></table>
-</div><div class="footnote">
+<div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
diff --git a/tp/t/results/float/footnote_in_caption.pl 
b/tp/t/results/float/footnote_in_caption.pl
index 9055817..02b80f5 100644
--- a/tp/t/results/float/footnote_in_caption.pl
+++ b/tp/t/results/float/footnote_in_caption.pl
@@ -460,8 +460,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 
 <dl class="listoffloats">
 <dt><a href="#label">fl 1</a></dt><dd><p>in caption<a 
id="t_hlistoffloats_DOCF1_1" 
href="#t_hlistoffloats_FOOT1_1"><sup>1</sup></a></p></dd>
@@ -470,7 +469,7 @@ ul.no-bullet {list-style: none}
 <div class="float"><span id="label"></span>
 <p>In float.
 </p>
-<div class="float-caption"><p><strong>fl 1: </strong>in caption<a id="DOCF1" 
href="#FOOT1"><sup>2</sup></a></p></div></div></div><div class="footnote">
+<div class="float-caption"><p><strong>fl 1: </strong>in caption<a id="DOCF1" 
href="#FOOT1"><sup>2</sup></a></p></div></div><div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
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 f975b86..7542dd3 100644
--- a/tp/t/results/float/footnote_in_caption_and_error.pl
+++ b/tp/t/results/float/footnote_in_caption_and_error.pl
@@ -448,8 +448,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 
 <dl class="listoffloats">
 <dt><a href="#label">fl 1</a></dt><dd><p>in caption<a 
id="t_hlistoffloats_DOCF1_1" 
href="#t_hlistoffloats_FOOT1_1"><sup>1</sup></a></p></dd>
@@ -458,7 +457,7 @@ ul.no-bullet {list-style: none}
 <div class="float"><span id="label"></span>
 <p>In float.
 </p>
-<div class="float-caption"><p><strong>fl 1: </strong>in caption<a id="DOCF1" 
href="#FOOT1"><sup>2</sup></a></p></div></div></div><div class="footnote">
+<div class="float-caption"><p><strong>fl 1: </strong>in caption<a id="DOCF1" 
href="#FOOT1"><sup>2</sup></a></p></div></div><div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
diff --git a/tp/t/results/float/numbering_captions_listoffloats.pl 
b/tp/t/results/float/numbering_captions_listoffloats.pl
index 2bb1f84..4e95578 100644
--- a/tp/t/results/float/numbering_captions_listoffloats.pl
+++ b/tp/t/results/float/numbering_captions_listoffloats.pl
@@ -8243,8 +8243,7 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">A chapter</a> &nbsp; </p>
 </div>
-<div class="node" id="Test-floats">
-<h1 class="top">Test floats</h1>
+<span id="Test-floats"></span><h1 class="top">Test floats</h1>
 
 <div class="float"><span id="text-with-a-lot-of-features"></span>
 
@@ -8299,14 +8298,13 @@ Next: <a href="#chapter" accesskey="n" rel="next">A 
chapter</a> &nbsp; </p>
 <li><a href="#Appendix-for-float" accesskey="4">Appendix for float</a></li>
 <li><a href="#list-of-floats" accesskey="5">list of floats</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="chapter" id="chapter">
 <div class="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>
 </div>
-<div class="node" id="A-chapter">
-<h2 class="chapter">1 A chapter</h2>
+<span id="A-chapter"></span><h2 class="chapter">1 A chapter</h2>
 
 <div class="float"><span id="text-in-chapter"></span>
 <p>Text in chapter
@@ -8337,14 +8335,13 @@ Next: <a href="#Unnumbered" accesskey="n" 
rel="next">Unnumbered</a>, Previous: <
 <ul class="section-toc">
 <li><a href="#section" accesskey="1">A section</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="section" id="section">
 <div class="header">
 <p>
 Up: <a href="#chapter" accesskey="u" rel="up">A chapter</a> &nbsp; </p>
 </div>
-<div class="node" id="A-section">
-<h3 class="section">1.1 A section</h3>
+<span id="A-section"></span><h3 class="section">1.1 A section</h3>
 
 <div class="float"><span id="text-in-section"></span>
 
@@ -8352,7 +8349,7 @@ Up: <a href="#chapter" accesskey="u" rel="up">A 
chapter</a> &nbsp; </p>
 </p>
 <div class="float-caption"><p><strong>Text 1.3
 </strong></p></div></div>
-</div><hr>
+<hr>
 </div>
 </div>
 <div class="unnumbered" id="Unnumbered">
@@ -8360,8 +8357,7 @@ Up: <a href="#chapter" accesskey="u" rel="up">A 
chapter</a> &nbsp; </p>
 <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>
 </div>
-<div class="node" id="Unnumbered-1">
-<h2 class="unnumbered">Unnumbered</h2>
+<span id="Unnumbered-1"></span><h2 class="unnumbered">Unnumbered</h2>
 
 <div class="float"><span id="unnumbered-float"></span>
 <p>unnum
@@ -8377,14 +8373,13 @@ Next: <a href="#Chapter-with-unnumbsubsec" 
accesskey="n" rel="next">Chapter with
 <ul class="section-toc">
 <li><a href="#Section-within-unnumbered" accesskey="1">Section within 
unnumbered</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="section" id="Section-within-unnumbered">
 <div class="header">
 <p>
 Up: <a href="#Unnumbered" accesskey="u" rel="up">Unnumbered</a> &nbsp; </p>
 </div>
-<div class="node" id="Section-within-unnumbered-1">
-<h3 class="section">Section within unnumbered</h3>
+<span id="Section-within-unnumbered-1"></span><h3 class="section">Section 
within unnumbered</h3>
 
 
 <div class="float"><span id="Section-within-unnumbered-float"></span>
@@ -8392,7 +8387,7 @@ Up: <a href="#Unnumbered" accesskey="u" 
rel="up">Unnumbered</a> &nbsp; </p>
 </p>
 
 <div class="float-caption"><p><strong>Text 6: </strong>C Section within 
unnumbered</p></div></div>
-</div><hr>
+<hr>
 </div>
 </div>
 <div class="chapter" id="Chapter-with-unnumbsubsec">
@@ -8400,8 +8395,7 @@ Up: <a href="#Unnumbered" accesskey="u" 
rel="up">Unnumbered</a> &nbsp; </p>
 <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>
 </div>
-<div class="node" id="Chapter-with-unnumbsubsec-1">
-<h2 class="chapter">2 Chapter with unnumbsubsec</h2>
+<span id="Chapter-with-unnumbsubsec-1"></span><h2 class="chapter">2 Chapter 
with unnumbsubsec</h2>
 
 <div class="float"><span id="Chapter-with-subsec-float"></span>
 <p>Chap
@@ -8411,14 +8405,13 @@ Next: <a href="#Appendix-for-float" accesskey="n" 
rel="next">Appendix for float<
 <ul class="section-toc">
 <li><a href="#unnumbered-sec" accesskey="1">unnumbered sec</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="unnumberedsec" id="unnumbered-sec">
 <div class="header">
 <p>
 Up: <a href="#Chapter-with-unnumbsubsec" accesskey="u" rel="up">Chapter with 
unnumbsubsec</a> &nbsp; </p>
 </div>
-<div class="node" id="unnumbered-sec-1">
-<h3 class="unnumberedsec">unnumbered sec</h3>
+<span id="unnumbered-sec-1"></span><h3 class="unnumberedsec">unnumbered 
sec</h3>
 
 <div class="float"><span id="unnumbered-sec-float"></span>
 <p>Chap
@@ -8431,7 +8424,7 @@ Up: <a href="#Chapter-with-unnumbsubsec" accesskey="u" 
rel="up">Chapter with unn
 
 
 <div class="float-caption"><p><strong>2.1: </strong>C No type in unnumbered 
subsec in chapter</p></div></div>
-</div><hr>
+<hr>
 </div>
 </div>
 <div class="appendix" id="Appendix-for-float">
@@ -8439,8 +8432,7 @@ Up: <a href="#Chapter-with-unnumbsubsec" accesskey="u" 
rel="up">Chapter with unn
 <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>
 </div>
-<div class="node" id="Appendix-for-float-1">
-<h2 class="appendix">Appendix A Appendix for float</h2>
+<span id="Appendix-for-float-1"></span><h2 class="appendix">Appendix A 
Appendix for float</h2>
 
 <div class="float"><span id="appendix-sec-float"></span>
 
@@ -8448,15 +8440,14 @@ Next: <a href="#list-of-floats" accesskey="n" 
rel="next">list of floats</a>, Pre
 </p>
 
 <div class="float-caption"><p><strong>Text A.1: </strong>C appendix sec 
float</p></div></div>
-</div><hr>
+<hr>
 </div>
 <div class="unnumbered" id="list-of-floats">
 <div class="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>
 </div>
-<div class="node" id="list-of-floats-1">
-<h2 class="unnumbered">list of floats</h2>
+<span id="list-of-floats-1"></span><h2 class="unnumbered">list of floats</h2>
 
 <p>See <a href="#text-in-section">Text 1.3</a>.
 And (see <a href="#text-in-chapter">Text 1.1</a>).
@@ -8488,7 +8479,7 @@ See <a href="#text-with-a-lot-of-features">Text 1</a>.
 <dt><a href="#theoreme">th&eacute;or&egrave;me 1.1</a></dt><dd><p>C A 
th&eacute;or&egrave;me</p></dd>
 </dl>
 
-</div><hr>
+<hr>
 </div>
 </div>
 
diff --git a/tp/t/results/formatting/cond.pl b/tp/t/results/formatting/cond.pl
index 4d36b2d..03847b0 100644
--- a/tp/t/results/formatting/cond.pl
+++ b/tp/t/results/formatting/cond.pl
@@ -491,8 +491,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="node" id="Top">
-
+<span id="Top"></span>
 This is html text.
 
 <p>This is ifhtml text.
@@ -507,7 +506,7 @@ This is html text.
 
 <p>This is ifnottex text.
 </p>
-</div><hr></div>
+<hr></div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
diff --git a/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl 
b/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
index 886b5da..a6faaa8 100644
--- a/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
@@ -508,8 +508,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="node" id="Top">
-
+<span id="Top"></span>
 This is html text.
 
 <p>This is ifhtml text.
@@ -525,7 +524,7 @@ This is tex text.
 <p>This is iftex text.
 </p>
 
-</div><hr></div>
+<hr></div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
diff --git a/tp/t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl 
b/tp/t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl
index 8fd9e68..9e9f3e3 100644
--- a/tp/t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl
+++ b/tp/t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl
@@ -474,8 +474,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="node" id="Top">
-
+<span id="Top"></span>
 
 
 <p>This is ifnothtml text.
@@ -489,7 +488,7 @@ ul.no-bullet {list-style: none}
 
 <p>This is ifnottex text.
 </p>
-</div><hr></div>
+<hr></div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
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 af3e5e9..6ea3d36 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
@@ -38,12 +38,11 @@ ul.no-bullet {list-style: none}
 <hr>
 
 <div class="top" id="Top">
-<div class="node" id="g_t_0040documentlanguage-set">
-<h1 class="top">@documentlanguage set</h1>
+<span id="g_t_0040documentlanguage-set"></span><h1 
class="top">@documentlanguage set</h1>
 
 <p>Text.
 </p>
-</div><hr></div>
+<hr></div>
 </div>
 <p><font size="-1">
   Ce document a &eacute;t&eacute; g&eacute;n&eacute;r&eacute; <em>a sunny 
day</em> en utilisant <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 81c5f24..7f7e084 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
@@ -38,12 +38,11 @@ ul.no-bullet {list-style: none}
 <hr>
 
 <div class="top" id="Top">
-<div class="node" id="g_t_0040documentlanguage-set">
-<h1 class="top">@documentlanguage set</h1>
+<span id="g_t_0040documentlanguage-set"></span><h1 
class="top">@documentlanguage set</h1>
 
 <p>Text.
 </p>
-</div><hr></div>
+<hr></div>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 39767d5..08d5bc4 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
@@ -56,8 +56,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="#Copying-and-floats" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="float_copying_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Copying-and-floats-1">
-<h1 class="appendix">Appendix A Copying and floats</h1>
+<span id="Copying-and-floats-1"></span><h1 class="appendix">Appendix A Copying 
and floats</h1>
 
 <p>In the appendix, we print the references and the copying once more
 and the list of coyright notices (listoffloats).
@@ -89,17 +88,15 @@ the author abandon his copyright.
 <span id="public-domain-anchor"></span><span 
id="index-copying-indexed-caption"></span>
 <span id="index-copying-indexed-caption-function"></span>
 </div></div>
-<div class="subheading" id="listoffloats">
-<h3 class="subheading">listoffloats</h3>
-</div><dl class="listoffloats">
+<span id="listoffloats"></span><h3 class="subheading">listoffloats</h3>
+<dl class="listoffloats">
 <dt><a href="index.html#public-domain">Copyright notice 1</a></dt><dd><p>The 
Public Domain notice<a id="t_hlistoffloats_DOCF1_4" 
href="float_copying_fot.html#t_hlistoffloats_FOOT1_4"><sup>4</sup></a>
 </p>
 </dd>
 </dl>
 
-<div class="subheading" id="printindex">
-<h3 class="subheading">printindex</h3>
-</div><table><tr><th valign="top">Jump to: &nbsp; </th><td><a 
class="summary-letter" href="#Copying-and-floats-1_cp_letter-I"><b>I</b></a>
+<span id="printindex"></span><h3 class="subheading">printindex</h3>
+<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#Copying-and-floats-1_cp_letter-I"><b>I</b></a>
  &nbsp; 
 <a class="summary-letter" href="#Copying-and-floats-1_cp_letter-L"><b>L</b></a>
  &nbsp; 
@@ -148,7 +145,7 @@ the author abandon his copyright.
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
+<hr>
 <table class="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>
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 36b22db..1670fb4 100644
--- a/tp/t/results/formatting/float_copying/res_html/index.html
+++ b/tp/t/results/formatting/float_copying/res_html/index.html
@@ -51,8 +51,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="Copying-and-floats.html" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="float_copying_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Top-1">
-<h1 class="top">Top</h1>
+<span id="Top-1"></span><h1 class="top">Top</h1>
 
 <span id="index-Top"></span>
 
@@ -76,7 +75,7 @@ the author abandon his copyright.
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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/simplest_test_date_in_header/res_html/simplest.html 
b/tp/t/results/formatting/simplest_test_date_in_header/res_html/simplest.html
index f5c919e..978347c 100644
--- 
a/tp/t/results/formatting/simplest_test_date_in_header/res_html/simplest.html
+++ 
b/tp/t/results/formatting/simplest_test_date_in_header/res_html/simplest.html
@@ -36,11 +36,10 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="node" id="Top">
-
+<span id="Top"></span>
 <p>This is a very simple texi manual &nbsp; &lt;&gt;.
 </p>
-</div><hr></div>
+<hr></div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
diff --git a/tp/t/results/formatting/simplest_test_prefix/res_html/truc.html 
b/tp/t/results/formatting/simplest_test_prefix/res_html/truc.html
index 8339f7c..ea0d266 100644
--- a/tp/t/results/formatting/simplest_test_prefix/res_html/truc.html
+++ b/tp/t/results/formatting/simplest_test_prefix/res_html/truc.html
@@ -35,11 +35,10 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="node" id="Top">
-
+<span id="Top"></span>
 <p>This is a very simple texi manual &nbsp; &lt;&gt;.
 </p>
-</div><hr></div>
+<hr></div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
diff --git a/tp/t/results/formatting/texi_bib_example.pl 
b/tp/t/results/formatting/texi_bib_example.pl
index c143b3b..c2fb0be 100644
--- a/tp/t/results/formatting/texi_bib_example.pl
+++ b/tp/t/results/formatting/texi_bib_example.pl
@@ -5689,8 +5689,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Top-1">
-<h1 class="top">Top</h1>
+<span id="Top-1"></span><h1 class="top">Top</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#Introduction">1 
Introduction</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
@@ -5701,7 +5700,7 @@ ul.no-bullet {list-style: none}
 
 </pre></th></tr></table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="Introduction">
 <table class="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>
@@ -5718,15 +5717,14 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Introduction-1">
-<h1 class="chapter">1 Introduction</h1>
+<span id="Introduction-1"></span><h1 class="chapter">1 Introduction</h1>
 
 <p>The ability of a documentation format to make cross references to a
 bibliography, a feature of LaTeX (See item [LaTeX2e] in <a 
href="#References">LaTeX2e</a>.)
 , isn&rsquo;t
 currently supported in Texinfo.
 </p>
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="References">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -5744,8 +5742,7 @@ currently supported in Texinfo.
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="References-1">
-<h1 class="chapter">2 References</h1>
+<span id="References-1"></span><h1 class="chapter">2 References</h1>
 
 <ul class="no-bullet">
 <li> <span id="LaTeX2e"></span>[LaTeX2e]
@@ -5755,7 +5752,7 @@ Massachusetts, 1994.
 
 </li></ul>
 
-</div><hr>
+<hr>
 </div>
 </div>
 <p><font size="-1">
diff --git a/tp/t/results/formatting/texi_cond.pl 
b/tp/t/results/formatting/texi_cond.pl
index 221f177..22a200e 100644
--- a/tp/t/results/formatting/texi_cond.pl
+++ b/tp/t/results/formatting/texi_cond.pl
@@ -491,8 +491,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="node" id="Top">
-
+<span id="Top"></span>
 This is html text.
 
 <p>This is ifhtml text.
@@ -507,7 +506,7 @@ This is html text.
 
 <p>This is ifnottex text.
 </p>
-</div><hr></div>
+<hr></div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
diff --git a/tp/t/results/formatting/texi_glossary.pl 
b/tp/t/results/formatting/texi_glossary.pl
index d724c12..5459136 100644
--- a/tp/t/results/formatting/texi_glossary.pl
+++ b/tp/t/results/formatting/texi_glossary.pl
@@ -1619,8 +1619,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Top-1">
-<h1 class="top">Top</h1>
+<span id="Top-1"></span><h1 class="top">Top</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#glossary">1 
glossary</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
@@ -1632,7 +1631,7 @@ ul.no-bullet {list-style: none}
 <a href="#id2">name2</a>
  is quite specific
 </p>
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="glossary">
 <table class="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>
@@ -1649,13 +1648,12 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="glossary-1">
-<h1 class="chapter">1 glossary</h1>
+<span id="glossary-1"></span><h1 class="chapter">1 glossary</h1>
 
 <p>name2 <span id="id2"></span>text2
 </p>
 
-</div><hr>
+<hr>
 </div>
 </div>
 <p><font size="-1">
diff --git a/tp/t/results/heading/heading_in_copying.pl 
b/tp/t/results/heading/heading_in_copying.pl
index 18aaba3..a905bac 100644
--- a/tp/t/results/heading/heading_in_copying.pl
+++ b/tp/t/results/heading/heading_in_copying.pl
@@ -449,17 +449,14 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 
 
-<div class="heading" id="in-copying-_0040-heading">
-<h3 class="heading">in copying @ <em>heading</em></h3>
-</div><span id="index-copying-cindex-copying"></span>
+<span id="in-copying-_0040-heading"></span><h3 class="heading">in copying @ 
<em>heading</em></h3>
+<span id="index-copying-cindex-copying"></span>
 
-<div class="subheading" id="second-in-copying-_0040-subheading">
-<h4 class="subheading">second in copying @ <em>subheading</em></h4>
-</div></div><hr></div>
+<span id="second-in-copying-_0040-subheading"></span><h4 
class="subheading">second in copying @ <em>subheading</em></h4>
+<hr></div>
 
 
 
diff --git a/tp/t/results/heading/heading_in_example.pl 
b/tp/t/results/heading/heading_in_example.pl
index 19515ca..0d273e4 100644
--- a/tp/t/results/heading/heading_in_example.pl
+++ b/tp/t/results/heading/heading_in_example.pl
@@ -197,9 +197,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 <div class="example">
-<div class="heading" id="in-example-_0040-heading">
-<strong>in example @ <em>heading</em></strong>
-</div></div>
+<span id="in-example-_0040-heading"></span><strong>in example @ 
<em>heading</em></strong>
+</div>
 
 
 
diff --git a/tp/t/results/heading/heading_in_quotation.pl 
b/tp/t/results/heading/heading_in_quotation.pl
index 269dc8b..32ad756 100644
--- a/tp/t/results/heading/heading_in_quotation.pl
+++ b/tp/t/results/heading/heading_in_quotation.pl
@@ -216,9 +216,8 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 <blockquote>
 
-<div class="heading" id="in-quotation-_0040-heading">
-<h3 class="heading">in quotation @ <em>heading</em></h3>
-</div>
+<span id="in-quotation-_0040-heading"></span><h3 class="heading">in quotation 
@ <em>heading</em></h3>
+
 </blockquote>
 
 
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 8fa16f1..211f103 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
@@ -335,8 +335,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="top" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 <div class="Contents_element" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
@@ -361,19 +360,16 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 </div>
-</div><div class="chapter" id="g_t0">
-<h2 class="chapter">1 0</h2>
-</div><div class="unnumbered" id="g_t_005f">
-<h2 class="unnumbered">_</h2>
+<span id="g_t0"></span><h2 class="chapter">1 0</h2>
+<span id="g_t_005f"></span><h2 class="unnumbered">_</h2>
 <ul class="section-toc">
 <li><a href="#g_t_003f" accesskey="1">?</a></li>
 </ul>
-</div><div class="section" id="g_t_003f">
-<h3 class="section">?</h3>
+<span id="g_t_003f"></span><h3 class="section">?</h3>
 
 
 
-</div><hr></div>
+<hr></div>
 
 
 
diff --git a/tp/t/results/html_tests/check_htmlxref.pl 
b/tp/t/results/html_tests/check_htmlxref.pl
index 303526d..e70379f 100644
--- a/tp/t/results/html_tests/check_htmlxref.pl
+++ b/tp/t/results/html_tests/check_htmlxref.pl
@@ -855,21 +855,19 @@ ul.no-bullet {list-style: none}
 <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>
 </div>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <p><a data-manual="no_existing_no_manual.info" 
href="no_existing_no_manual.html#a">(no_existing_no_manual.info)c</a>
 <a data-manual="no_existing_no_manual.info" 
href="no_existing_no_manual.html#a">(no_existing_no_manual.info)c</a>
 </p>
 
-</div><hr>
-<div class="node" id="first">
-<div class="header">
+<hr>
+<span id="first"></span><div class="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>
-</div><hr>
+<hr>
 </div>
 
 
diff --git a/tp/t/results/html_tests/documentdescription.pl 
b/tp/t/results/html_tests/documentdescription.pl
index bad626d..9c02496 100644
--- a/tp/t/results/html_tests/documentdescription.pl
+++ b/tp/t/results/html_tests/documentdescription.pl
@@ -443,9 +443,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="top" id="top">
-<h1 class="top">top</h1>
-</div><hr></div>
+<span id="top"></span><h1 class="top">top</h1>
+<hr></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 1efd43b..4111a2e 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
@@ -282,10 +282,9 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 <div class="top" id="Top">
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
-</div><hr></div>
+<hr></div>
 </div>
 
 
diff --git a/tp/t/results/html_tests/html_in_copying.pl 
b/tp/t/results/html_tests/html_in_copying.pl
index 2de5288..1246889 100644
--- a/tp/t/results/html_tests/html_in_copying.pl
+++ b/tp/t/results/html_tests/html_in_copying.pl
@@ -388,10 +388,9 @@ ul.no-bullet {list-style: none}
 
 
 <div class="top" id="Top">
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
-</div><hr></div>
+<hr></div>
 </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 61f3eb9..7479e9d 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
@@ -286,10 +286,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="top" id="top">
-<h1 class="top">top</h1>
-</div><div class="node" id="index-node">
-<h4 class="node-heading">index node</h4>
+<span id="top"></span><h1 class="top">top</h1>
+<span id="index-node"></span><h4 class="node-heading">index node</h4>
 
 <span id="index-node-1"></span>
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#index-node_cp_letter-N"><b>N</b></a>
@@ -306,7 +304,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr></div>
+<hr></div>
 
 
 
diff --git a/tp/t/results/html_tests/index_below.pl 
b/tp/t/results/html_tests/index_below.pl
index e7c69d1..ef16e80 100644
--- a/tp/t/results/html_tests/index_below.pl
+++ b/tp/t/results/html_tests/index_below.pl
@@ -461,8 +461,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="top" id="top">
-<div class="header">
+<span id="top"></span><div class="header">
 <p>
  &nbsp; [<a href="#chap" title="Index" rel="index">Index</a>]</p>
 </div>
@@ -471,9 +470,8 @@ ul.no-bullet {list-style: none}
 <ul class="section-toc">
 <li><a href="#chap" accesskey="1">chap</a></li>
 </ul>
-</div><hr>
-<div class="chapter" id="chap">
-<div class="header">
+<hr>
+<span id="chap"></span><div class="header">
 <p>
  Up : <a href="#top" accesskey="u" rel="up">top</a> &nbsp; [<a href="#chap" 
title="Index" rel="index">Index</a>]</p>
 </div>
@@ -482,9 +480,8 @@ ul.no-bullet {list-style: none}
 <ul class="section-toc">
 <li><a href="#sec" accesskey="1">sec</a></li>
 </ul>
-</div><hr>
-<div class="section" id="sec">
-<div class="header">
+<hr>
+<span id="sec"></span><div class="header">
 <p>
  Up : <a href="#chap" accesskey="u" rel="up">chap</a> &nbsp; [<a href="#chap" 
title="Index" rel="index">Index</a>]</p>
 </div>
@@ -504,7 +501,7 @@ ul.no-bullet {list-style: none}
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#sec_cp_letter-E"><b>E</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr>
+<hr>
 
 
 
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 4dc6de9..f19a745 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
@@ -41,18 +41,16 @@ ul.no-bullet {list-style: none}
 <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>
 </div>
-<div class="node" id="circumflex-1">
-<h2 class="chapter">2 circumflex</h2>
+<span id="circumflex-1"></span><h2 class="chapter">2 circumflex</h2>
 
 
-</div><hr>
-<div class="node" id="g_t_00ee">
-<div class="header">
+<hr>
+<span id="g_t_00ee"></span><div class="header">
 <p>
 Up: <a href="#circumflex" accesskey="u" rel="up">circumflex</a> &nbsp; </p>
 </div>
 <h4 class="node-heading">&icirc;</h4>
-</div><hr>
+<hr>
 <div class="header">
 <p>
 Up: <a href="#circumflex" accesskey="u" rel="up">circumflex</a> &nbsp; </p>
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 cd0c7b0..ea624cc 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
@@ -41,15 +41,14 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="umlaut.html#umlaut" accesskey="n" rel="next">umlaut</a> &nbsp; 
</p>
 </div>
-<div class="node" id="the-top">
-<h1 class="top">the top</h1>
+<span id="the-top"></span><h1 class="top">the top</h1>
 
 
 <ul class="section-toc">
 <li><a href="umlaut.html#umlaut" accesskey="1">umlaut</a></li>
 <li><a href="circumflex.html#circumflex" accesskey="2">circumflex</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="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 41dad09..16cd51b 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
@@ -42,27 +42,24 @@ ul.no-bullet {list-style: none}
 <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>
 </div>
-<div class="node" id="umlaut-1">
-<h2 class="chapter">1 umlaut</h2>
+<span id="umlaut-1"></span><h2 class="chapter">1 umlaut</h2>
 
 
-</div><hr>
-<div class="node" id="g_t_00ef">
-<div class="header">
+<hr>
+<span id="g_t_00ef"></span><div class="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>
 
-</div><hr>
-<div class="node" id="g_t_0129">
-<div class="header">
+<hr>
+<span id="g_t_0129"></span><div class="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>
 
-</div><hr>
+<hr>
 <div class="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>
diff --git a/tp/t/results/html_tests/ref_in_preformatted.pl 
b/tp/t/results/html_tests/ref_in_preformatted.pl
index 9d193c0..fad587e 100644
--- a/tp/t/results/html_tests/ref_in_preformatted.pl
+++ b/tp/t/results/html_tests/ref_in_preformatted.pl
@@ -468,8 +468,7 @@ $result_floats{'ref_in_preformatted'} = {};
 
 
 
-$result_converted{'html_text'}->{'ref_in_preformatted'} = '<div class="node" 
id="Top">
-<div class="header">
+$result_converted{'html_text'}->{'ref_in_preformatted'} = '<span 
id="Top"></span><div class="header">
 <p>
  &nbsp; </p>
 </div>
@@ -481,14 +480,13 @@ $result_converted{'html_text'}->{'ref_in_preformatted'} = 
'<div class="node" id=
 node name</a>
 </pre></div>
 
-</div><hr>
-<div class="node" id="nnn-the-node-name">
-<div class="header">
+<hr>
+<span id="nnn-the-node-name"></span><div class="header">
 <p>
  &nbsp; </p>
 </div>
 <h4 class="node-heading">nnn the node name</h4>
-</div><hr>
+<hr>
 ';
 
 1;
diff --git a/tp/t/results/html_tests/shortcontents_no_top.pl 
b/tp/t/results/html_tests/shortcontents_no_top.pl
index eff58b1..4a2f615 100644
--- a/tp/t/results/html_tests/shortcontents_no_top.pl
+++ b/tp/t/results/html_tests/shortcontents_no_top.pl
@@ -267,17 +267,14 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chap">
-<h2 class="chapter">1 chap</h2>
+<span id="chap"></span><h2 class="chapter">1 chap</h2>
 
-</div><div class="chapter" id="chap2">
-<h2 class="chapter">2 chap2</h2>
+<span id="chap2"></span><h2 class="chapter">2 chap2</h2>
 
 <ul class="section-toc">
 <li><a href="#sec" accesskey="1">sec</a></li>
 </ul>
-</div><div class="section" id="sec">
-<h3 class="section">2.1 sec</h3>
+<span id="sec"></span><h3 class="section">2.1 sec</h3>
 
 <div class="Overview_element" id="SEC_Overview">
 <h2 class="shortcontents-heading">Short Table of Contents</h2>
@@ -290,7 +287,7 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 </div>
-</div><hr></div>
+<hr></div>
 
 
 
diff --git a/tp/t/results/html_tests/simple_menu.pl 
b/tp/t/results/html_tests/simple_menu.pl
index 74e6014..3985796 100644
--- a/tp/t/results/html_tests/simple_menu.pl
+++ b/tp/t/results/html_tests/simple_menu.pl
@@ -2266,9 +2266,8 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 <div class="top" id="Top">
-<div class="node" id="SEC_Top">
-
-</div><hr></div>
+<span id="SEC_Top"></span>
+<hr></div>
 </div>
 
 
diff --git a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl 
b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
index 3ff4dbc..e3acd6b 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
@@ -712,28 +712,26 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="#chap" accesskey="n" rel="next">chap</a> &nbsp; </p>
 </div>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 
 <ul class="section-toc">
 <li><a href="#chap" accesskey="1">chapter</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="chapter" id="chap">
 <div class="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 class="node" id="chapter">
-<h2 class="chapter">1 chapter</h2>
+<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
 
 
 <p>See <a href="#chap">chapter</a>.
 </p>
 
 <p>See <a href="#chap">chap</a>.
-</p></div><hr>
+</p><hr>
 </div>
 </div>
 
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 b26e7c6..12937e6 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
@@ -369,19 +369,17 @@ ul.no-bullet {list-style: none}
 <p>Some text before top
 </p>
 <div class="top" id="Top">
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <p>In top.
 </p>
 <ul class="section-toc">
 <li><a href="#the-chap" accesskey="1">the chap</a></li>
 </ul>
-</div><div class="chapter" id="the-chap">
-<h2 class="chapter">1 the chap</h2>
+<span id="the-chap"></span><h2 class="chapter">1 the chap</h2>
 
 
-</div><hr></div>
+<hr></div>
 </div>
 
 
diff --git a/tp/t/results/html_tests/titles.pl 
b/tp/t/results/html_tests/titles.pl
index 171ddbb..da886a4 100644
--- a/tp/t/results/html_tests/titles.pl
+++ b/tp/t/results/html_tests/titles.pl
@@ -445,13 +445,12 @@ ul.no-bullet {list-style: none}
 <h1 class="settitle" align="center">@title <small>HTML</small> 
<code>test</code></h1>
 
 <div class="top" id="Top">
-<div class="node" id="Top-of-_0040title-HTML-test">
-<h1 class="top">Top of @title <small>HTML</small> <code>test</code></h1>
+<span id="Top-of-_0040title-HTML-test"></span><h1 class="top">Top of @title 
<small>HTML</small> <code>test</code></h1>
 
 <p>Top.
 </p>
 <p>Second paragraph.
-</p></div><hr></div>
+</p><hr></div>
 </div>
 
 
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 ccc00e0..711ba44 100644
--- a/tp/t/results/htmlxref/htmlxref/res_html/test_refs.html
+++ b/tp/t/results/htmlxref/htmlxref/res_html/test_refs.html
@@ -43,17 +43,15 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Test-refs">
-<h1 class="top">Test refs</h1>
+<span id="Test-refs"></span><h1 class="top">Test refs</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#other-nodes">1 Chapter with 
nodes</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-<div class="subheading" id="Testing-distant-nodes">
-<h3 class="subheading">Testing distant nodes</h3>
-</div>
+<span id="Testing-distant-nodes"></span><h3 class="subheading">Testing distant 
nodes</h3>
+
 <p><tt> a  node </tt> <a data-manual="manual" 
href="mono-manual.html#a-node">(manual)a  node</a><br>
 </p><div class="example">
 <pre class="example">mono : manual.html#a-node
@@ -78,18 +76,16 @@ split: ../manual/index.html#Top
 split: ../mtexinfo/Cross-References.html#Cross-References
 </pre></div>
 
-<div class="subheading" id="Testing-manual-name">
-<h3 class="subheading">Testing manual name</h3>
-</div>
+<span id="Testing-manual-name"></span><h3 class="subheading">Testing manual 
name</h3>
+
 <p><tt>../manual/doc.texi</tt> <a data-manual="../manual/doc" 
href="doc.html#node">(../manual/doc)node</a><br>
 </p><div class="example">
 <pre class="example">mono : doc.html#node
 split: ../doc/node.html#node
 </pre></div>
 
-<div class="subheading" id="Testing-local-nodes">
-<h3 class="subheading">Testing local nodes</h3>
-</div>
+<span id="Testing-local-nodes"></span><h3 class="subheading">Testing local 
nodes</h3>
+
 <p><tt>!_&quot;#$%&amp;'()*+-.</tt> <a 
href="#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">!_&quot;#$%&amp;'()*+-.</a>
 </p><div class="example">
 <pre class="example">target: 
#_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
@@ -110,7 +106,7 @@ split: ../doc/node.html#node
 <pre class="example">target: #local-node
 </pre></div>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="other-nodes">
 <table class="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>
@@ -127,8 +123,7 @@ split: ../doc/node.html#node
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Chapter-with-nodes">
-<h1 class="chapter">1 Chapter with nodes</h1>
+<span id="Chapter-with-nodes"></span><h1 class="chapter">1 Chapter with 
nodes</h1>
 
 <div class="example">
 <pre class="example">id: other-nodes
@@ -148,22 +143,19 @@ split: ../doc/node.html#node
 </td></tr>
 </table>
 
-</div><div class="node" 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">
-<div class="example">
+<span 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></span><div
 class="example">
 <pre class="example">id: 
_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
 </pre></div>
 
-</div><div class="node" 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e">
-<div class="example">
+<span 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></span><div
 class="example">
 <pre class="example">id: 
002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e
 </pre></div>
 
-</div><div class="node" id="local-node">
-<div class="example">
+<span id="local-node"></span><div class="example">
 <pre class="example">id: local-node
 </pre></div>
 
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="About_element" id="SEC_About">
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 f476540..59c70f2 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
@@ -34,8 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></span><table
 class="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>
@@ -56,7 +55,7 @@ ul.no-bullet {list-style: none}
 <pre class="example">id: 
_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
 </pre></div>
 
-</div><hr>
+<hr>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
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 ef81811..a10ef48 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
@@ -34,8 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></span><table
 class="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>
@@ -56,7 +55,7 @@ ul.no-bullet {list-style: none}
 <pre class="example">id: 
002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e
 </pre></div>
 
-</div><hr>
+<hr>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
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 843ad89..1fbbf63 100644
--- a/tp/t/results/htmlxref/htmlxref_nodes/res_html/index.html
+++ b/tp/t/results/htmlxref/htmlxref_nodes/res_html/index.html
@@ -44,17 +44,15 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="Test-refs">
-<h1 class="top">Test refs</h1>
+<span id="Test-refs"></span><h1 class="top">Test refs</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a href="other-nodes.html">other 
nodes</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-<div class="subheading" id="Testing-distant-nodes">
-<h3 class="subheading">Testing distant nodes</h3>
-</div>
+<span id="Testing-distant-nodes"></span><h3 class="subheading">Testing distant 
nodes</h3>
+
 <p><tt> a  node </tt> <a data-manual="manual" 
href="split-dir-manual/a-node.html#a-node">(manual)a  node</a><br>
 </p><div class="example">
 <pre class="example">mono : manual.html#a-node
@@ -79,18 +77,16 @@ split: ../manual/index.html#Top
 split: ../mtexinfo/Cross-References.html#Cross-References
 </pre></div>
 
-<div class="subheading" id="Testing-manual-name">
-<h3 class="subheading">Testing manual name</h3>
-</div>
+<span id="Testing-manual-name"></span><h3 class="subheading">Testing manual 
name</h3>
+
 <p><tt>../manual/doc.texi</tt> <a data-manual="../manual/doc" 
href="../doc/node.html#node">(../manual/doc)node</a><br>
 </p><div class="example">
 <pre class="example">mono : doc.html#node
 split: ../doc/node.html#node
 </pre></div>
 
-<div class="subheading" id="Testing-local-nodes">
-<h3 class="subheading">Testing local nodes</h3>
-</div>
+<span id="Testing-local-nodes"></span><h3 class="subheading">Testing local 
nodes</h3>
+
 <p><tt>!_&quot;#$%&amp;'()*+-.</tt> <a 
href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html">!_&quot;#$%&amp;'()*+-.</a>
 </p><div class="example">
 <pre class="example">target: 
#_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
@@ -111,7 +107,7 @@ split: ../doc/node.html#node
 <pre class="example">target: #local-node
 </pre></div>
 
-</div><hr>
+<hr>
 <table class="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 de5fa80..773ba15 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
@@ -34,8 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="local-node">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="local-node"></span><table class="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>
@@ -56,7 +55,7 @@ ul.no-bullet {list-style: none}
 <pre class="example">id: local-node
 </pre></div>
 
-</div><hr>
+<hr>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
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 3dcba94..d2235a7 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
@@ -51,8 +51,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="Chapter-with-nodes">
-<h1 class="chapter">1 Chapter with nodes</h1>
+<span id="Chapter-with-nodes"></span><h1 class="chapter">1 Chapter with 
nodes</h1>
 
 <div class="example">
 <pre class="example">id: other-nodes
@@ -72,7 +71,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 ccc00e0..711ba44 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
@@ -43,17 +43,15 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Test-refs">
-<h1 class="top">Test refs</h1>
+<span id="Test-refs"></span><h1 class="top">Test refs</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#other-nodes">1 Chapter with 
nodes</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-<div class="subheading" id="Testing-distant-nodes">
-<h3 class="subheading">Testing distant nodes</h3>
-</div>
+<span id="Testing-distant-nodes"></span><h3 class="subheading">Testing distant 
nodes</h3>
+
 <p><tt> a  node </tt> <a data-manual="manual" 
href="mono-manual.html#a-node">(manual)a  node</a><br>
 </p><div class="example">
 <pre class="example">mono : manual.html#a-node
@@ -78,18 +76,16 @@ split: ../manual/index.html#Top
 split: ../mtexinfo/Cross-References.html#Cross-References
 </pre></div>
 
-<div class="subheading" id="Testing-manual-name">
-<h3 class="subheading">Testing manual name</h3>
-</div>
+<span id="Testing-manual-name"></span><h3 class="subheading">Testing manual 
name</h3>
+
 <p><tt>../manual/doc.texi</tt> <a data-manual="../manual/doc" 
href="doc.html#node">(../manual/doc)node</a><br>
 </p><div class="example">
 <pre class="example">mono : doc.html#node
 split: ../doc/node.html#node
 </pre></div>
 
-<div class="subheading" id="Testing-local-nodes">
-<h3 class="subheading">Testing local nodes</h3>
-</div>
+<span id="Testing-local-nodes"></span><h3 class="subheading">Testing local 
nodes</h3>
+
 <p><tt>!_&quot;#$%&amp;'()*+-.</tt> <a 
href="#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">!_&quot;#$%&amp;'()*+-.</a>
 </p><div class="example">
 <pre class="example">target: 
#_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
@@ -110,7 +106,7 @@ split: ../doc/node.html#node
 <pre class="example">target: #local-node
 </pre></div>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="other-nodes">
 <table class="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>
@@ -127,8 +123,7 @@ split: ../doc/node.html#node
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Chapter-with-nodes">
-<h1 class="chapter">1 Chapter with nodes</h1>
+<span id="Chapter-with-nodes"></span><h1 class="chapter">1 Chapter with 
nodes</h1>
 
 <div class="example">
 <pre class="example">id: other-nodes
@@ -148,22 +143,19 @@ split: ../doc/node.html#node
 </td></tr>
 </table>
 
-</div><div class="node" 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">
-<div class="example">
+<span 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></span><div
 class="example">
 <pre class="example">id: 
_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
 </pre></div>
 
-</div><div class="node" 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e">
-<div class="example">
+<span 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></span><div
 class="example">
 <pre class="example">id: 
002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e
 </pre></div>
 
-</div><div class="node" id="local-node">
-<div class="example">
+<span id="local-node"></span><div class="example">
 <pre class="example">id: local-node
 </pre></div>
 
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="About_element" id="SEC_About">
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 f476540..59c70f2 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
@@ -34,8 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></span><table
 class="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>
@@ -56,7 +55,7 @@ ul.no-bullet {list-style: none}
 <pre class="example">id: 
_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
 </pre></div>
 
-</div><hr>
+<hr>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
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 ef81811..a10ef48 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
@@ -34,8 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></span><table
 class="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>
@@ -56,7 +55,7 @@ ul.no-bullet {list-style: none}
 <pre class="example">id: 
002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e
 </pre></div>
 
-</div><hr>
+<hr>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
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 984c5a0..e9132a5 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
@@ -44,17 +44,15 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="Test-refs">
-<h1 class="top">Test refs</h1>
+<span id="Test-refs"></span><h1 class="top">Test refs</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a href="other-nodes.html">other 
nodes</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-<div class="subheading" id="Testing-distant-nodes">
-<h3 class="subheading">Testing distant nodes</h3>
-</div>
+<span id="Testing-distant-nodes"></span><h3 class="subheading">Testing distant 
nodes</h3>
+
 <p><tt> a  node </tt> <a data-manual="manual" 
href="mono-manual.html#a-node">(manual)a  node</a><br>
 </p><div class="example">
 <pre class="example">mono : manual.html#a-node
@@ -79,18 +77,16 @@ split: ../manual/index.html#Top
 split: ../mtexinfo/Cross-References.html#Cross-References
 </pre></div>
 
-<div class="subheading" id="Testing-manual-name">
-<h3 class="subheading">Testing manual name</h3>
-</div>
+<span id="Testing-manual-name"></span><h3 class="subheading">Testing manual 
name</h3>
+
 <p><tt>../manual/doc.texi</tt> <a data-manual="../manual/doc" 
href="../doc/node.html#node">(../manual/doc)node</a><br>
 </p><div class="example">
 <pre class="example">mono : doc.html#node
 split: ../doc/node.html#node
 </pre></div>
 
-<div class="subheading" id="Testing-local-nodes">
-<h3 class="subheading">Testing local nodes</h3>
-</div>
+<span id="Testing-local-nodes"></span><h3 class="subheading">Testing local 
nodes</h3>
+
 <p><tt>!_&quot;#$%&amp;'()*+-.</tt> <a 
href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html">!_&quot;#$%&amp;'()*+-.</a>
 </p><div class="example">
 <pre class="example">target: 
#_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
@@ -111,7 +107,7 @@ split: ../doc/node.html#node
 <pre class="example">target: #local-node
 </pre></div>
 
-</div><hr>
+<hr>
 <table class="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 de5fa80..773ba15 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
@@ -34,8 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="local-node">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="local-node"></span><table class="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>
@@ -56,7 +55,7 @@ ul.no-bullet {list-style: none}
 <pre class="example">id: local-node
 </pre></div>
 
-</div><hr>
+<hr>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
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 3dcba94..d2235a7 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
@@ -51,8 +51,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="Chapter-with-nodes">
-<h1 class="chapter">1 Chapter with nodes</h1>
+<span id="Chapter-with-nodes"></span><h1 class="chapter">1 Chapter with 
nodes</h1>
 
 <div class="example">
 <pre class="example">id: other-nodes
@@ -72,7 +71,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 0742ae8..0fce3ea 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
@@ -43,17 +43,15 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Test-refs">
-<h1 class="top">Test refs</h1>
+<span id="Test-refs"></span><h1 class="top">Test refs</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#other-nodes">1 Chapter with 
nodes</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-<div class="subheading" id="Testing-distant-nodes">
-<h3 class="subheading">Testing distant nodes</h3>
-</div>
+<span id="Testing-distant-nodes"></span><h3 class="subheading">Testing distant 
nodes</h3>
+
 <p><tt> a  node </tt> <a data-manual="manual" 
href="split-dir-manual/a-node.html#a-node">(manual)a  node</a><br>
 </p><div class="example">
 <pre class="example">mono : manual.html#a-node
@@ -78,18 +76,16 @@ split: ../manual/index.html#Top
 split: ../mtexinfo/Cross-References.html#Cross-References
 </pre></div>
 
-<div class="subheading" id="Testing-manual-name">
-<h3 class="subheading">Testing manual name</h3>
-</div>
+<span id="Testing-manual-name"></span><h3 class="subheading">Testing manual 
name</h3>
+
 <p><tt>../manual/doc.texi</tt> <a data-manual="../manual/doc" 
href="doc.html#node">(../manual/doc)node</a><br>
 </p><div class="example">
 <pre class="example">mono : doc.html#node
 split: ../doc/node.html#node
 </pre></div>
 
-<div class="subheading" id="Testing-local-nodes">
-<h3 class="subheading">Testing local nodes</h3>
-</div>
+<span id="Testing-local-nodes"></span><h3 class="subheading">Testing local 
nodes</h3>
+
 <p><tt>!_&quot;#$%&amp;'()*+-.</tt> <a 
href="#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">!_&quot;#$%&amp;'()*+-.</a>
 </p><div class="example">
 <pre class="example">target: 
#_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
@@ -110,7 +106,7 @@ split: ../doc/node.html#node
 <pre class="example">target: #local-node
 </pre></div>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="other-nodes">
 <table class="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>
@@ -127,8 +123,7 @@ split: ../doc/node.html#node
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Chapter-with-nodes">
-<h1 class="chapter">1 Chapter with nodes</h1>
+<span id="Chapter-with-nodes"></span><h1 class="chapter">1 Chapter with 
nodes</h1>
 
 <div class="example">
 <pre class="example">id: other-nodes
@@ -148,22 +143,19 @@ split: ../doc/node.html#node
 </td></tr>
 </table>
 
-</div><div class="node" 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">
-<div class="example">
+<span 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></span><div
 class="example">
 <pre class="example">id: 
_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
 </pre></div>
 
-</div><div class="node" 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e">
-<div class="example">
+<span 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></span><div
 class="example">
 <pre class="example">id: 
002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e
 </pre></div>
 
-</div><div class="node" id="local-node">
-<div class="example">
+<span id="local-node"></span><div class="example">
 <pre class="example">id: local-node
 </pre></div>
 
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="About_element" id="SEC_About">
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 f476540..59c70f2 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
@@ -34,8 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></span><table
 class="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>
@@ -56,7 +55,7 @@ ul.no-bullet {list-style: none}
 <pre class="example">id: 
_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
 </pre></div>
 
-</div><hr>
+<hr>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
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 ef81811..a10ef48 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
@@ -34,8 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></span><table
 class="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>
@@ -56,7 +55,7 @@ ul.no-bullet {list-style: none}
 <pre class="example">id: 
002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e
 </pre></div>
 
-</div><hr>
+<hr>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
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 843ad89..1fbbf63 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
@@ -44,17 +44,15 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="Test-refs">
-<h1 class="top">Test refs</h1>
+<span id="Test-refs"></span><h1 class="top">Test refs</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a href="other-nodes.html">other 
nodes</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-<div class="subheading" id="Testing-distant-nodes">
-<h3 class="subheading">Testing distant nodes</h3>
-</div>
+<span id="Testing-distant-nodes"></span><h3 class="subheading">Testing distant 
nodes</h3>
+
 <p><tt> a  node </tt> <a data-manual="manual" 
href="split-dir-manual/a-node.html#a-node">(manual)a  node</a><br>
 </p><div class="example">
 <pre class="example">mono : manual.html#a-node
@@ -79,18 +77,16 @@ split: ../manual/index.html#Top
 split: ../mtexinfo/Cross-References.html#Cross-References
 </pre></div>
 
-<div class="subheading" id="Testing-manual-name">
-<h3 class="subheading">Testing manual name</h3>
-</div>
+<span id="Testing-manual-name"></span><h3 class="subheading">Testing manual 
name</h3>
+
 <p><tt>../manual/doc.texi</tt> <a data-manual="../manual/doc" 
href="../doc/node.html#node">(../manual/doc)node</a><br>
 </p><div class="example">
 <pre class="example">mono : doc.html#node
 split: ../doc/node.html#node
 </pre></div>
 
-<div class="subheading" id="Testing-local-nodes">
-<h3 class="subheading">Testing local nodes</h3>
-</div>
+<span id="Testing-local-nodes"></span><h3 class="subheading">Testing local 
nodes</h3>
+
 <p><tt>!_&quot;#$%&amp;'()*+-.</tt> <a 
href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html">!_&quot;#$%&amp;'()*+-.</a>
 </p><div class="example">
 <pre class="example">target: 
#_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
@@ -111,7 +107,7 @@ split: ../doc/node.html#node
 <pre class="example">target: #local-node
 </pre></div>
 
-</div><hr>
+<hr>
 <table class="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 de5fa80..773ba15 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
@@ -34,8 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="local-node">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="local-node"></span><table class="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>
@@ -56,7 +55,7 @@ ul.no-bullet {list-style: none}
 <pre class="example">id: local-node
 </pre></div>
 
-</div><hr>
+<hr>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
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 3dcba94..d2235a7 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
@@ -51,8 +51,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="Chapter-with-nodes">
-<h1 class="chapter">1 Chapter with nodes</h1>
+<span id="Chapter-with-nodes"></span><h1 class="chapter">1 Chapter with 
nodes</h1>
 
 <div class="example">
 <pre class="example">id: other-nodes
@@ -72,7 +71,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
diff --git a/tp/t/results/indices/def_syn_indices.pl 
b/tp/t/results/indices/def_syn_indices.pl
index 0b39106..1adb78f 100644
--- a/tp/t/results/indices/def_syn_indices.pl
+++ b/tp/t/results/indices/def_syn_indices.pl
@@ -1772,8 +1772,7 @@ $result_converted{'plaintext'}->{'def_syn_indices'} = 
'definedx truc after
 
 $result_converted{'html_text'}->{'def_syn_indices'} = '
 
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 
 <p>definedx truc
 after
@@ -1867,7 +1866,7 @@ after
 <a class="summary-letter" href="#t_h_fn_letter-I"><b>I</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr></div>
+<hr></div>
 ';
 
 1;
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 757baf4..a9a702e 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
@@ -374,8 +374,7 @@ 
$result_converted{'plaintext'}->{'default_cp_index_and_one_letter_syncodeindex'}
 ';
 
 
-$result_converted{'html_text'}->{'default_cp_index_and_one_letter_syncodeindex'}
 = '<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'default_cp_index_and_one_letter_syncodeindex'}
 = '<span id="Top"></span><h1 class="node-heading">Top</h1>
 
 
 <span id="index-_002d_002dcindex"></span>
@@ -393,7 +392,7 @@ 
$result_converted{'html_text'}->{'default_cp_index_and_one_letter_syncodeindex'}
 </table>
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#t_h_fn_symbol-1"><b>-</b></a>
 </td></tr></table>
-</div><hr></div>
+<hr></div>
 ';
 
 1;
diff --git a/tp/t/results/indices/double_index_entry.pl 
b/tp/t/results/indices/double_index_entry.pl
index cfb1371..076a434 100644
--- a/tp/t/results/indices/double_index_entry.pl
+++ b/tp/t/results/indices/double_index_entry.pl
@@ -657,8 +657,7 @@ $result_converted{'plaintext'}->{'double_index_entry'} = 
'Text
 ';
 
 
-$result_converted{'html_text'}->{'double_index_entry'} = '<div class="node" 
id="Top">
-<div class="header">
+$result_converted{'html_text'}->{'double_index_entry'} = '<span 
id="Top"></span><div class="header">
 <p>
  &nbsp; [<a href="#other-node" title="Index" rel="index">Index</a>]</p>
 </div>
@@ -671,9 +670,8 @@ $result_converted{'html_text'}->{'double_index_entry'} = 
'<div class="node" id="
 <span id="index-aaa-1"></span>
 
 
-</div><hr>
-<div class="node" id="other-node">
-<div class="header">
+<hr>
+<span id="other-node"></span><div class="header">
 <p>
  &nbsp; [<a href="#other-node" title="Index" rel="index">Index</a>]</p>
 </div>
@@ -696,7 +694,7 @@ $result_converted{'html_text'}->{'double_index_entry'} = 
'<div class="node" id="
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#t_h_cp_letter-A"><b>A</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr>
+<hr>
 ';
 
 1;
diff --git a/tp/t/results/indices/double_syncodeindex.pl 
b/tp/t/results/indices/double_syncodeindex.pl
index 8a41be2..2fade83 100644
--- a/tp/t/results/indices/double_syncodeindex.pl
+++ b/tp/t/results/indices/double_syncodeindex.pl
@@ -457,8 +457,7 @@ $result_converted{'plaintext'}->{'double_syncodeindex'} = 
'* Menu:
 
 
 $result_converted{'html_text'}->{'double_syncodeindex'} = '
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 
 <span id="index-cindex-entry"></span>
 <span id="index-findex-entry"></span>
@@ -483,7 +482,7 @@ $result_converted{'html_text'}->{'double_syncodeindex'} = '
 <a class="summary-letter" href="#t_h_fn_letter-F"><b>F</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr></div>
+<hr></div>
 ';
 
 1;
diff --git a/tp/t/results/indices/empty_cindex_entry.pl 
b/tp/t/results/indices/empty_cindex_entry.pl
index 57d35a5..4bdb522 100644
--- a/tp/t/results/indices/empty_cindex_entry.pl
+++ b/tp/t/results/indices/empty_cindex_entry.pl
@@ -153,9 +153,8 @@ End:
 $result_converted{'plaintext'}->{'empty_cindex_entry'} = '';
 
 
-$result_converted{'html_text'}->{'empty_cindex_entry'} = '<div class="node" 
id="Top">
-<h1 class="node-heading">Top</h1>
-</div><hr></div>
+$result_converted{'html_text'}->{'empty_cindex_entry'} = '<span 
id="Top"></span><h1 class="node-heading">Top</h1>
+<hr></div>
 ';
 
 1;
diff --git a/tp/t/results/indices/empty_index_entry.pl 
b/tp/t/results/indices/empty_index_entry.pl
index 78e399a..6069cf2 100644
--- a/tp/t/results/indices/empty_index_entry.pl
+++ b/tp/t/results/indices/empty_index_entry.pl
@@ -317,14 +317,13 @@ $result_converted{'plaintext'}->{'empty_index_entry'} = ' 
-- :
 ';
 
 
-$result_converted{'html_text'}->{'empty_index_entry'} = '<div class="node" 
id="Top">
-<h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'empty_index_entry'} = '<span 
id="Top"></span><h1 class="node-heading">Top</h1>
 
 <dl class="def">
 <dt><span class="category">: </span><span><strong></strong></span></dt>
 </dl>
 
-</div><hr></div>
+<hr></div>
 ';
 
 1;
diff --git a/tp/t/results/indices/empty_string_index_entry.pl 
b/tp/t/results/indices/empty_string_index_entry.pl
index 5a85852..d81a585 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -948,8 +948,7 @@ 
$result_converted{'plaintext'}->{'empty_string_index_entry'} = '\'\'
 ';
 
 
-$result_converted{'html_text'}->{'empty_string_index_entry'} = '<div 
class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'empty_string_index_entry'} = '<span 
id="Top"></span><h1 class="node-heading">Top</h1>
 
 <span id="index-"></span>
 
@@ -962,7 +961,7 @@ 
$result_converted{'html_text'}->{'empty_string_index_entry'} = '<div class="node
 <dt id="index--3"><span class="category">Function: </span><span><strong><!-- 
/@w --></strong> <em> </em><a href=\'#index--3\' class=\'copiable-anchor\'> 
&para;</a></span></dt>
 </dl>
 
-</div><hr></div>
+<hr></div>
 ';
 
 1;
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 7131d7c..5993908 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
@@ -38,8 +38,7 @@ ul.no-bullet {list-style: none}
 
 
 <div class="top" id="Top">
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <span id="index-e-e"></span>
 <span id="index-i-iii"></span>
@@ -376,7 +375,7 @@ ul.no-bullet {list-style: none}
 <a class="summary-letter" href="#Top_cp_letter-Z"><b>Z</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr></div>
+<hr></div>
 </div>
 
 
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 7131d7c..5993908 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
@@ -38,8 +38,7 @@ ul.no-bullet {list-style: none}
 
 
 <div class="top" id="Top">
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <span id="index-e-e"></span>
 <span id="index-i-iii"></span>
@@ -376,7 +375,7 @@ ul.no-bullet {list-style: none}
 <a class="summary-letter" href="#Top_cp_letter-Z"><b>Z</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr></div>
+<hr></div>
 </div>
 
 
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 7d2923c..cee52fb 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
@@ -37,8 +37,7 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 <div class="top" id="Top">
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <span id="index-e-e"></span>
 <span id="index-i-iii"></span>
@@ -381,7 +380,7 @@ ul.no-bullet {list-style: none}
 <a class="summary-letter" href="#Top_cp_letter-�"><b>�</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr></div>
+<hr></div>
 </div>
 
 
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 ff9ee0a..d242825 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
@@ -37,8 +37,7 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 <div class="top" id="Top">
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <span id="index-e-e"></span>
 <span id="index-i-iii"></span>
@@ -423,7 +422,7 @@ ul.no-bullet {list-style: none}
 <a class="summary-letter" href="#Top_cp_letter-�"><b>�</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr></div>
+<hr></div>
 </div>
 
 
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 d0b2e53..31c8ae5 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
@@ -37,8 +37,7 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 <div class="top" id="Top">
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <span id="index-e-e"></span>
 <span id="index-i-iii"></span>
@@ -381,7 +380,7 @@ ul.no-bullet {list-style: none}
 <a class="summary-letter" href="#Top_cp_letter-É"><b>É</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr></div>
+<hr></div>
 </div>
 
 
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 567fa3a..9d76c2f 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
@@ -37,8 +37,7 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 <div class="top" id="Top">
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <span id="index-e-e"></span>
 <span id="index-i-iii"></span>
@@ -441,7 +440,7 @@ ul.no-bullet {list-style: none}
 <a class="summary-letter" href="#Top_cp_letter-Ł"><b>Ł</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr></div>
+<hr></div>
 </div>
 
 
diff --git a/tp/t/results/indices/explicit_sort_key.pl 
b/tp/t/results/indices/explicit_sort_key.pl
index 0812a67..d190bc1 100644
--- a/tp/t/results/indices/explicit_sort_key.pl
+++ b/tp/t/results/indices/explicit_sort_key.pl
@@ -998,8 +998,7 @@ $result_converted{'plaintext'}->{'explicit_sort_key'} = 'in 
a reuglar para.  \'i
 
 
 $result_converted{'html_text'}->{'explicit_sort_key'} = '<div class="top" 
id="Top">
-<div class="node" id="SEC_Top">
-
+<span id="SEC_Top"></span>
 
 <span id="index-Abbbbbbb-_0028first_0029"></span>
 <span id="index-Baaaaaaa-_0028second_0029"></span>
@@ -1041,7 +1040,7 @@ $result_converted{'html_text'}->{'explicit_sort_key'} = 
'<div class="top" id="To
 <a class="summary-letter" href="#t_h_SK_letter-B"><b>B</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr></div>
+<hr></div>
 ';
 
 1;
diff --git a/tp/t/results/indices/ftable_vtable.pl 
b/tp/t/results/indices/ftable_vtable.pl
index f3d7e3e..a23cddf 100644
--- a/tp/t/results/indices/ftable_vtable.pl
+++ b/tp/t/results/indices/ftable_vtable.pl
@@ -923,8 +923,7 @@ _var3_
 
 
 $result_converted{'html_text'}->{'ftable_vtable'} = '
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 
 <dl compact="compact">
 <dt id=\'index-function1\'><span><em>function1</em><a 
href=\'#index-function1\' class=\'copiable-anchor\'> &para;</a></span></dt>
@@ -977,7 +976,7 @@ $result_converted{'html_text'}->{'ftable_vtable'} = '
  &nbsp; 
 </td></tr></table>
 
-</div><hr></div>
+<hr></div>
 ';
 
 1;
diff --git a/tp/t/results/indices/image_lines_count.pl 
b/tp/t/results/indices/image_lines_count.pl
index 495eefe..9ebc28d 100644
--- a/tp/t/results/indices/image_lines_count.pl
+++ b/tp/t/results/indices/image_lines_count.pl
@@ -291,8 +291,7 @@ ff
 ';
 
 
-$result_converted{'html_text'}->{'image_lines_count'} = '<div class="node" 
id="Top">
-<h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'image_lines_count'} = '<span 
id="Top"></span><h1 class="node-heading">Top</h1>
 
 <img src="count_image.png" alt="count_image">
 
@@ -311,7 +310,7 @@ $result_converted{'html_text'}->{'image_lines_count'} = 
'<div class="node" id="T
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#t_h_cp_letter-I"><b>I</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr></div>
+<hr></div>
 ';
 
 1;
diff --git a/tp/t/results/indices/image_text_lines_count.pl 
b/tp/t/results/indices/image_text_lines_count.pl
index 3e2af59..ff7a22d 100644
--- a/tp/t/results/indices/image_text_lines_count.pl
+++ b/tp/t/results/indices/image_text_lines_count.pl
@@ -290,8 +290,7 @@ ff
 ';
 
 
-$result_converted{'html_text'}->{'image_text_lines_count'} = '<div 
class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'image_text_lines_count'} = '<span 
id="Top"></span><h1 class="node-heading">Top</h1>
 
 <img src="count_image_text.jpg" alt="count_image_text">
 
@@ -310,7 +309,7 @@ $result_converted{'html_text'}->{'image_text_lines_count'} 
= '<div class="node"
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#t_h_cp_letter-I"><b>I</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr></div>
+<hr></div>
 ';
 
 $result_converted_errors{'html_text'}->{'image_text_lines_count'} = [
diff --git a/tp/t/results/indices/index_entries_locations.pl 
b/tp/t/results/indices/index_entries_locations.pl
index 2c38f93..d407a63 100644
--- a/tp/t/results/indices/index_entries_locations.pl
+++ b/tp/t/results/indices/index_entries_locations.pl
@@ -543,8 +543,7 @@ $result_converted{'plaintext'}->{'index_entries_locations'} 
= 'Initial paragraph
 
 
 $result_converted{'html_text'}->{'index_entries_locations'} = '
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 
 <p>Initial paragraph.
 </p>
@@ -584,7 +583,7 @@ end paragraph.
 <a class="summary-letter" href="#t_h_cp_letter-L"><b>L</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr></div>
+<hr></div>
 ';
 
 1;
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 9d7f563..e26c978 100644
Binary files a/tp/t/results/indices/index_entry_before_first_node.pl and 
b/tp/t/results/indices/index_entry_before_first_node.pl differ
diff --git a/tp/t/results/indices/index_entry_before_node.pl 
b/tp/t/results/indices/index_entry_before_node.pl
index 00a4e72..640b11f 100644
--- a/tp/t/results/indices/index_entry_before_node.pl
+++ b/tp/t/results/indices/index_entry_before_node.pl
@@ -750,17 +750,15 @@ 
$result_converted{'plaintext'}->{'index_entry_before_node'} = 'Para.
 ';
 
 
-$result_converted{'html_text'}->{'index_entry_before_node'} = '<div 
class="node" id="Top">
-<div class="header">
+$result_converted{'html_text'}->{'index_entry_before_node'} = '<span 
id="Top"></span><div class="header">
 <p>
  &nbsp; [<a href="#second" title="Index" rel="index">Index</a>]</p>
 </div>
 <h1 class="node-heading">Top</h1>
 
 
-</div><hr>
-<div class="node" id="first">
-<div class="header">
+<hr>
+<span id="first"></span><div class="header">
 <p>
  &nbsp; [<a href="#second" title="Index" rel="index">Index</a>]</p>
 </div>
@@ -770,9 +768,8 @@ $result_converted{'html_text'}->{'index_entry_before_node'} 
= '<div class="node"
 </p>
 <span id="index-lone-entry"></span>
 
-</div><hr>
-<div class="node" id="second">
-<div class="header">
+<hr>
+<span id="second"></span><div class="header">
 <p>
  &nbsp; [<a href="#second" title="Index" rel="index">Index</a>]</p>
 </div>
@@ -791,7 +788,7 @@ $result_converted{'html_text'}->{'index_entry_before_node'} 
= '<div class="node"
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#t_h_cp_letter-L"><b>L</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr>
+<hr>
 ';
 
 1;
diff --git a/tp/t/results/indices/index_entry_in_footnote.pl 
b/tp/t/results/indices/index_entry_in_footnote.pl
index afbe448..3fb6c27 100644
--- a/tp/t/results/indices/index_entry_in_footnote.pl
+++ b/tp/t/results/indices/index_entry_in_footnote.pl
@@ -298,8 +298,7 @@ $result_converted{'plaintext'}->{'index_entry_in_footnote'} 
= 'Top node(1)
 ';
 
 
-$result_converted{'html_text'}->{'index_entry_in_footnote'} = '<div 
class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'index_entry_in_footnote'} = '<span 
id="Top"></span><h1 class="node-heading">Top</h1>
 
 <p>Top node<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
@@ -316,7 +315,7 @@ $result_converted{'html_text'}->{'index_entry_in_footnote'} 
= '<div class="node"
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#t_h_cp_letter-I"><b>I</b></a>
  &nbsp; 
 </td></tr></table>
-</div><div class="footnote">
+<div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
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 4721d48..143cfe9 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
@@ -654,8 +654,7 @@ 
$result_converted{'plaintext'}->{'index_entry_in_footnote_different_node_end'} =
 ';
 
 
-$result_converted{'html_text'}->{'index_entry_in_footnote_different_node_end'} 
= '<div class="node" id="Top">
-<div class="header">
+$result_converted{'html_text'}->{'index_entry_in_footnote_different_node_end'} 
= '<span id="Top"></span><div class="header">
 <p>
  &nbsp; [<a href="#First" title="Index" rel="index">Index</a>]</p>
 </div>
@@ -664,9 +663,8 @@ 
$result_converted{'html_text'}->{'index_entry_in_footnote_different_node_end'} =
 
 <p>Top node<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
-</div><hr>
-<div class="node" id="First">
-<div class="header">
+<hr>
+<span id="First"></span><div class="header">
 <p>
  &nbsp; [<a href="#First" title="Index" rel="index">Index</a>]</p>
 </div>
@@ -692,7 +690,7 @@ 
$result_converted{'html_text'}->{'index_entry_in_footnote_different_node_end'} =
 <a class="summary-letter" href="#t_h_cp_letter-I"><b>I</b></a>
  &nbsp; 
 </td></tr></table>
-</div><div class="footnote">
+<div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
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 8ce3d7f..5a19644 100644
--- a/tp/t/results/indices/index_entry_in_footnote_separate.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_separate.pl
@@ -690,8 +690,7 @@ 
$result_converted{'plaintext'}->{'index_entry_in_footnote_separate'} = 'Top node
 ';
 
 
-$result_converted{'html_text'}->{'index_entry_in_footnote_separate'} = '<div 
class="node" id="Top">
-<div class="header">
+$result_converted{'html_text'}->{'index_entry_in_footnote_separate'} = '<span 
id="Top"></span><div class="header">
 <p>
  &nbsp; [<a href="#First" title="Index" rel="index">Index</a>]</p>
 </div>
@@ -700,9 +699,8 @@ 
$result_converted{'html_text'}->{'index_entry_in_footnote_separate'} = '<div cla
 
 <p>Top node<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
-</div><hr>
-<div class="node" id="First">
-<div class="header">
+<hr>
+<span id="First"></span><div class="header">
 <p>
  &nbsp; [<a href="#First" title="Index" rel="index">Index</a>]</p>
 </div>
@@ -728,7 +726,7 @@ 
$result_converted{'html_text'}->{'index_entry_in_footnote_separate'} = '<div cla
 <a class="summary-letter" href="#t_h_cp_letter-I"><b>I</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr>
+<hr>
 ';
 
 1;
diff --git a/tp/t/results/indices/printindex_index_entry_in_copying.pl 
b/tp/t/results/indices/printindex_index_entry_in_copying.pl
index 4ca16f0..d1896a5 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -1412,8 +1412,7 @@ 
$result_converted{'html_text'}->{'printindex_index_entry_in_copying'} = '
 <p>
  &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
 </div>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <p>Top.
 </p>
@@ -1465,14 +1464,13 @@ 
$result_converted{'html_text'}->{'printindex_index_entry_in_copying'} = '
 <ul class="section-toc">
 <li><a href="#chapter" accesskey="1">Chapter</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="chapter" id="chapter">
 <div class="header">
 <p>
  &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
 </div>
-<div class="node" id="Chapter">
-<h2 class="chapter">1 Chapter</h2>
+<span id="Chapter"></span><h2 class="chapter">1 Chapter</h2>
 
 
 <span id="index-copying-Copying-this-document"></span>
@@ -1549,7 +1547,7 @@ 
$result_converted{'html_text'}->{'printindex_index_entry_in_copying'} = '
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
+<hr>
 ';
 
 1;
diff --git 
a/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl 
b/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
index 58e2566..bb20632 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
@@ -895,8 +895,7 @@ 
$result_converted{'html_text'}->{'printindex_index_entry_in_copying_in_footnote'
 <p>
  &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
 </div>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <p>Top.
 </p>
@@ -921,14 +920,13 @@ 
$result_converted{'html_text'}->{'printindex_index_entry_in_copying_in_footnote'
 <ul class="section-toc">
 <li><a href="#chapter" accesskey="1">Chapter</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="chapter" id="chapter">
 <div class="header">
 <p>
  &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
 </div>
-<div class="node" id="Chapter">
-<h2 class="chapter">1 Chapter</h2>
+<span id="Chapter"></span><h2 class="chapter">1 Chapter</h2>
 
 
 <p>Copying<a id="DOCF1_2" href="#FOOT1_2"><sup>2</sup></a>.
@@ -948,7 +946,7 @@ 
$result_converted{'html_text'}->{'printindex_index_entry_in_copying_in_footnote'
 </td></tr></table>
 
 
-</div><div class="footnote">
+<div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
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 a794305..e2bf8cf 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
@@ -1300,8 +1300,7 @@ 
$result_converted{'html_text'}->{'printindex_index_entry_in_copying_no_insertcop
 <p>
  &nbsp; </p>
 </div>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <p>Top.
 </p>
@@ -1309,14 +1308,13 @@ 
$result_converted{'html_text'}->{'printindex_index_entry_in_copying_no_insertcop
 <ul class="section-toc">
 <li><a href="#chapter" accesskey="1">Chapter</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="chapter" id="chapter">
 <div class="header">
 <p>
  &nbsp; </p>
 </div>
-<div class="node" id="Chapter">
-<h2 class="chapter">1 Chapter</h2>
+<span id="Chapter"></span><h2 class="chapter">1 Chapter</h2>
 
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#t_h_fn_letter-C"><b>C</b></a>
@@ -1349,7 +1347,7 @@ 
$result_converted{'html_text'}->{'printindex_index_entry_in_copying_no_insertcop
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
+<hr>
 ';
 
 1;
diff --git a/tp/t/results/indices/printindex_with_space_before.pl 
b/tp/t/results/indices/printindex_with_space_before.pl
index c6b865e..003ceeb 100644
Binary files a/tp/t/results/indices/printindex_with_space_before.pl and 
b/tp/t/results/indices/printindex_with_space_before.pl differ
diff --git a/tp/t/results/indices/same_index_entry_merged_indices.pl 
b/tp/t/results/indices/same_index_entry_merged_indices.pl
index eb37aac..54d8ebf 100644
--- a/tp/t/results/indices/same_index_entry_merged_indices.pl
+++ b/tp/t/results/indices/same_index_entry_merged_indices.pl
@@ -741,8 +741,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="node" id="SEC_Top">
-
+<span id="SEC_Top"></span>
 <p>Text.
 </p>
 <dl class="def">
@@ -769,7 +768,7 @@ 
$result_converted{'html_text'}->{'same_index_entry_merged_indices'} = '
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#t_h_fn_letter-M"><b>M</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr></div>
+<hr></div>
 ';
 
 1;
diff --git a/tp/t/results/indices/seealso_duplicate.pl 
b/tp/t/results/indices/seealso_duplicate.pl
index be1075a..a3f0a17 100644
--- a/tp/t/results/indices/seealso_duplicate.pl
+++ b/tp/t/results/indices/seealso_duplicate.pl
@@ -446,8 +446,7 @@ $result_converted{'plaintext'}->{'seealso_duplicate'} = '* 
Menu:
 ';
 
 
-$result_converted{'html_text'}->{'seealso_duplicate'} = '<div class="node" 
id="Top">
-<h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'seealso_duplicate'} = '<span 
id="Top"></span><h1 class="node-heading">Top</h1>
 
 <span id="index-awk"></span>
 <span id="index-awk-1"></span>
@@ -466,7 +465,7 @@ $result_converted{'html_text'}->{'seealso_duplicate'} = 
'<div class="node" id="T
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#t_h_cp_letter-A"><b>A</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr></div>
+<hr></div>
 ';
 
 1;
diff --git a/tp/t/results/indices/seeentry.pl b/tp/t/results/indices/seeentry.pl
index c94a6de..d463a61 100644
--- a/tp/t/results/indices/seeentry.pl
+++ b/tp/t/results/indices/seeentry.pl
@@ -346,9 +346,8 @@ $result_converted{'plaintext'}->{'seeentry'} = '';
 
 
 $result_converted{'html_text'}->{'seeentry'} = '<div class="top" id="Top">
-<div class="node" id="SEC_Top">
-
-</div><hr></div>
+<span id="SEC_Top"></span>
+<hr></div>
 ';
 
 1;
diff --git a/tp/t/results/indices/subentries.pl 
b/tp/t/results/indices/subentries.pl
index c0bc3e9..6f0f195 100644
--- a/tp/t/results/indices/subentries.pl
+++ b/tp/t/results/indices/subentries.pl
@@ -654,8 +654,7 @@ $result_converted{'plaintext'}->{'subentries'} = '* Menu:
 
 
 $result_converted{'html_text'}->{'subentries'} = '<div class="top" id="Top">
-<div class="node" id="SEC_Top">
-
+<span id="SEC_Top"></span>
 <span id="index-aa"></span>
 <span id="index-bb"></span>
 <span id="index-ddd"></span>
@@ -695,7 +694,7 @@ $result_converted{'html_text'}->{'subentries'} = '<div 
class="top" id="Top">
 <a class="summary-letter" href="#t_h_cp_letter-G"><b>G</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr></div>
+<hr></div>
 ';
 
 1;
diff --git a/tp/t/results/indices/subentry_and_sortas.pl 
b/tp/t/results/indices/subentry_and_sortas.pl
index 43dfd6e..940fe87 100644
--- a/tp/t/results/indices/subentry_and_sortas.pl
+++ b/tp/t/results/indices/subentry_and_sortas.pl
@@ -403,8 +403,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 <div class="top" id="Top">
-<div class="node" id="SEC_Top">
-
+<span id="SEC_Top"></span>
 <span id="index-aaaA"></span>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#Top_cp_letter-A"><b>A</b></a>
@@ -420,7 +419,7 @@ ul.no-bullet {list-style: none}
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#Top_cp_letter-A"><b>A</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr></div>
+<hr></div>
 </div>
 
 
@@ -472,8 +471,7 @@ $result_converted{'plaintext'}->{'subentry_and_sortas'} = 
'* Menu:
 
 
 $result_converted{'html_text'}->{'subentry_and_sortas'} = '<div class="top" 
id="Top">
-<div class="node" id="SEC_Top">
-
+<span id="SEC_Top"></span>
 <span id="index-aaaA"></span>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#t_h_cp_letter-A"><b>A</b></a>
@@ -489,7 +487,7 @@ $result_converted{'html_text'}->{'subentry_and_sortas'} = 
'<div class="top" id="
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#t_h_cp_letter-A"><b>A</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr></div>
+<hr></div>
 ';
 
 1;
diff --git a/tp/t/results/indices/syncode_index_print_both.pl 
b/tp/t/results/indices/syncode_index_print_both.pl
index 3ff04a6..39c569e 100644
--- a/tp/t/results/indices/syncode_index_print_both.pl
+++ b/tp/t/results/indices/syncode_index_print_both.pl
@@ -504,8 +504,7 @@ 
$result_converted{'plaintext'}->{'syncode_index_print_both'} = 'Print fn
 
 
 $result_converted{'html_text'}->{'syncode_index_print_both'} = '
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 
 <span id="index-c_002d_002d_002doncept"></span>
 <span id="index-f_002d_002d_002dun"></span>
@@ -537,7 +536,7 @@ 
$result_converted{'html_text'}->{'syncode_index_print_both'} = '
  &nbsp; 
 </td></tr></table>
 
-</div><hr></div>
+<hr></div>
 ';
 
 1;
diff --git a/tp/t/results/indices/syncodeindex_to_plain.pl 
b/tp/t/results/indices/syncodeindex_to_plain.pl
index e5885f3..5017db6 100644
--- a/tp/t/results/indices/syncodeindex_to_plain.pl
+++ b/tp/t/results/indices/syncodeindex_to_plain.pl
@@ -516,8 +516,7 @@ $result_converted{'plaintext'}->{'syncodeindex_to_plain'} = 
'cp index.
 
 
 $result_converted{'html_text'}->{'syncodeindex_to_plain'} = '
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 
 <span id="index-_002d_002dk1"></span>
 <span id="index-_002d_002dv"></span>
@@ -549,7 +548,7 @@ $result_converted{'html_text'}->{'syncodeindex_to_plain'} = 
'
 </table>
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#t_h_vr_symbol-1"><b>-</b></a>
 </td></tr></table>
-</div><hr></div>
+<hr></div>
 ';
 
 1;
diff --git a/tp/t/results/indices/transparent_sort_chars.pl 
b/tp/t/results/indices/transparent_sort_chars.pl
index d445bb6..71c5048 100644
--- a/tp/t/results/indices/transparent_sort_chars.pl
+++ b/tp/t/results/indices/transparent_sort_chars.pl
@@ -474,8 +474,7 @@ $result_converted{'plaintext'}->{'transparent_sort_chars'} 
= '* Menu:
 
 $result_converted{'html_text'}->{'transparent_sort_chars'} = '
 <div class="top" id="Top">
-<div class="node" id="SEC_Top">
-
+<span id="SEC_Top"></span>
 <span id="index-_002d_002dversion_002c-for-install_002dinfo"></span>
 <span id="index-Source-file-format"></span>
 <span id="index-Semantic-markup"></span>
@@ -501,7 +500,7 @@ $result_converted{'html_text'}->{'transparent_sort_chars'} 
= '
 <a class="summary-letter" href="#t_h_cp_letter-V"><b>V</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr></div>
+<hr></div>
 ';
 
 1;
diff --git a/tp/t/results/indices/w_lines_count.pl 
b/tp/t/results/indices/w_lines_count.pl
index 26386f8..9714377 100644
--- a/tp/t/results/indices/w_lines_count.pl
+++ b/tp/t/results/indices/w_lines_count.pl
@@ -440,8 +440,7 @@ $result_converted{'plaintext'}->{'w_lines_count'} = 
'xzcompilationxdmbufferxmsub
 
 
 $result_converted{'html_text'}->{'w_lines_count'} = '<div class="top" id="Top">
-<div class="node" id="SEC_Top">
-
+<span id="SEC_Top"></span>
 <p>xzcompilationxdmbufferxmsubsequentmxCtxaxxmcommandsmadvancemfrommthere.  
 <code><span class="nolinebreak">C-u</span></code><!-- /@w --> starts again 
from the beginning
 </p>
@@ -461,7 +460,7 @@ $result_converted{'html_text'}->{'w_lines_count'} = '<div 
class="top" id="Top">
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#t_h_fn_letter-C"><b>C</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr></div>
+<hr></div>
 ';
 
 1;
diff --git a/tp/t/results/languages/appendix_translated.pl 
b/tp/t/results/languages/appendix_translated.pl
index da52629..5f7be0b 100644
--- a/tp/t/results/languages/appendix_translated.pl
+++ b/tp/t/results/languages/appendix_translated.pl
@@ -368,8 +368,7 @@ ul.no-bullet {list-style: none}
 <body lang="fr">
 
 <div class="top" id="Top">
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <div class="Contents_element" id="SEC_Contents">
 <h2 class="contents-heading">Table des mati&egrave;res</h2>
@@ -381,10 +380,9 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 </div>
-</div><div class="appendix" id="dernier">
-<h2 class="appendix">Annexe A dernier</h2>
+<span id="dernier"></span><h2 class="appendix">Annexe A dernier</h2>
 
-</div><hr></div>
+<hr></div>
 </div>
 
 
diff --git a/tp/t/results/languages/command_translated.pl 
b/tp/t/results/languages/command_translated.pl
index 5c0732e..d616445 100644
--- a/tp/t/results/languages/command_translated.pl
+++ b/tp/t/results/languages/command_translated.pl
@@ -331,11 +331,10 @@ ul.no-bullet {list-style: none}
 <body lang="fr">
 
 <div class="top" id="Top">
-<div class="node" id="top-error_002d_002d_003e">
-<h1 class="top">top erreur&rarr;</h1>
+<span id="top-error_002d_002d_003e"></span><h1 class="top">top 
erreur&rarr;</h1>
 
 <p>erreur&rarr;
-</p></div><hr></div>
+</p><hr></div>
 </div>
 
 
diff --git a/tp/t/results/languages/multiple.pl 
b/tp/t/results/languages/multiple.pl
index edbb7b4..2a64241 100644
--- a/tp/t/results/languages/multiple.pl
+++ b/tp/t/results/languages/multiple.pl
@@ -973,8 +973,7 @@ ul.no-bullet {list-style: none}
 <body lang="pt">
 
 
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 
 <dl class="def">
 <dt id="index-BBB-of-fr"><span>Variable d\'instance de fr&nbsp;: 
<strong>BBB</strong> <em>CCC</em><a href=\'#index-BBB-of-fr\' 
class=\'copiable-anchor\'> &para;</a></span></dt>
@@ -992,7 +991,7 @@ ul.no-bullet {list-style: none}
 <dl class="def">
 <dt id="index-copying-a-of-copying"><span>Variável de instância da copying: 
<strong>a</strong> <em>b</em><a href=\'#index-copying-a-of-copying\' 
class=\'copiable-anchor\'> &para;</a></span></dt>
 </dl>
-</div><hr></div>
+<hr></div>
 
 
 
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 23840ce..b51f16b 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
@@ -41,8 +41,7 @@ ul.no-bullet {list-style: none}
 <p>
 Pr&oacute;ximo: <a href="#chapter-ja" accesskey="n" rel="next">ja</a> &nbsp; 
</p>
 </div>
-<div class="node" id="Multi-language-file">
-<h1 class="top">Multi language file</h1>
+<span id="Multi-language-file"></span><h1 class="top">Multi language file</h1>
 
 
 <ul class="section-toc">
@@ -52,71 +51,66 @@ Pr&oacute;ximo: <a href="#chapter-ja" accesskey="n" 
rel="next">ja</a> &nbsp; </p
 <li><a href="#chapter-de" accesskey="4">de</a></li>
 <li><a href="#chapter-pt_005fBR" accesskey="5">pt_bR</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="chapter" id="chapter-ja">
 <div class="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>
 </div>
-<div class="node" id="ja">
-<h2 class="chapter">1 ja</h2>
+<span id="ja"></span><h2 class="chapter">1 ja</h2>
 
 <p>In japanese. See <a href="#Top">Multi language file</a>.
 </p><dl class="def">
 <dt id="index-BBB-of-AAA"><span>Instance Variable of AAA: <strong>BBB</strong> 
<em>CCC</em><a href='#index-BBB-of-AAA' class='copiable-anchor'> 
&para;</a></span></dt>
 </dl>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="chapter-en">
 <div class="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>
 </div>
-<div class="node" id="en">
-<h2 class="chapter">2 en</h2>
+<span id="en"></span><h2 class="chapter">2 en</h2>
 
 <p>In english. See <a href="#Top">Multi language file</a>.
 </p><dl class="def">
 <dt id="index-BBB-of-AAA-1"><span>Instance Variable of AAA: 
<strong>BBB</strong> <em>CCC</em><a href='#index-BBB-of-AAA-1' 
class='copiable-anchor'> &para;</a></span></dt>
 </dl>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="chapter-fr_005fFR">
 <div class="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>
 </div>
-<div class="node" id="fr_005fFR">
-<h2 class="chapter">3 fr_FR</h2>
+<span id="fr_005fFR"></span><h2 class="chapter">3 fr_FR</h2>
 
 <dl class="def">
 <dt id="index-BBB-of-AAA-2"><span>Variable d'instance de AAA&nbsp;: 
<strong>BBB</strong> <em>CCC</em><a href='#index-BBB-of-AAA-2' 
class='copiable-anchor'> &para;</a></span></dt>
 </dl>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="chapter-de">
 <div class="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>
 </div>
-<div class="node" id="de">
-<h2 class="chapter">4 de</h2>
+<span id="de"></span><h2 class="chapter">4 de</h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="chapter-pt_005fBR">
 <div class="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>
 </div>
-<div class="node" id="pt_005fbR">
-<h2 class="chapter">5 pt_bR</h2>
+<span id="pt_005fbR"></span><h2 class="chapter">5 pt_bR</h2>
 
 <p>In brazilian. Veja <a href="#Top">Multi language file</a>.
-</p></div><hr>
+</p><hr>
 </div>
 </div>
 
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 80c2334..915def5 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
@@ -43,8 +43,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[&Iacute;ndice]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="Sobre (ajuda)"> 
? </a>]</td>
 </tr></table>
-<div class="node" id="Multi-language-file">
-<h1 class="top">Multi language file</h1>
+<span id="Multi-language-file"></span><h1 class="top">Multi language file</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#chapter-ja">1 
ja</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
@@ -59,7 +58,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter-ja">
 <table class="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>
@@ -76,15 +75,14 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="ja">
-<h1 class="chapter">1 ja</h1>
+<span id="ja"></span><h1 class="chapter">1 ja</h1>
 
 <p>In japanese. See <a href="#Top">Multi language file</a>.
 </p><dl class="def">
 <dt id="index-BBB-of-AAA"><span>Instance Variable of AAA: <strong>BBB</strong> 
<em>CCC</em><a href='#index-BBB-of-AAA' class='copiable-anchor'> 
&para;</a></span></dt>
 </dl>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="chapter-en">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -102,15 +100,14 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="en">
-<h1 class="chapter">2 en</h1>
+<span id="en"></span><h1 class="chapter">2 en</h1>
 
 <p>In english. See <a href="#Top">Multi language file</a>.
 </p><dl class="def">
 <dt id="index-BBB-of-AAA-1"><span>Instance Variable of AAA: 
<strong>BBB</strong> <em>CCC</em><a href='#index-BBB-of-AAA-1' 
class='copiable-anchor'> &para;</a></span></dt>
 </dl>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="chapter-fr_005fFR">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -128,14 +125,13 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="A propos (page 
d&rsquo;aide)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="fr_005fFR">
-<h1 class="chapter">3 fr_FR</h1>
+<span id="fr_005fFR"></span><h1 class="chapter">3 fr_FR</h1>
 
 <dl class="def">
 <dt id="index-BBB-of-AAA-2"><span>Variable d'instance de AAA&nbsp;: 
<strong>BBB</strong> <em>CCC</em><a href='#index-BBB-of-AAA-2' 
class='copiable-anchor'> &para;</a></span></dt>
 </dl>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="chapter-de">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -153,10 +149,9 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="Info (Hilfe)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="de">
-<h1 class="chapter">4 de</h1>
+<span id="de"></span><h1 class="chapter">4 de</h1>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="chapter-pt_005fBR">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -174,11 +169,10 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[&Iacute;ndice]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="Sobre (ajuda)"> 
? </a>]</td>
 </tr></table>
-<div class="node" id="pt_005fbR">
-<h1 class="chapter">5 pt_bR</h1>
+<span id="pt_005fbR"></span><h1 class="chapter">5 pt_bR</h1>
 
 <p>In brazilian. Veja <a href="#Top">Multi language file</a>.
-</p></div><hr size="6">
+</p><hr size="6">
 </div>
 </div>
 <div class="About_element" id="SEC_About">
diff --git a/tp/t/results/languages/unknown_language.pl 
b/tp/t/results/languages/unknown_language.pl
index 08c4c4e..aed904f 100644
--- a/tp/t/results/languages/unknown_language.pl
+++ b/tp/t/results/languages/unknown_language.pl
@@ -473,14 +473,13 @@ ul.no-bullet {list-style: none}
 <body lang="another_UNKNOWN">
 
 <div class="top" id="Top">
-<div class="node" id="unknkown-language">
-<h1 class="top">unknkown language</h1>
+<span id="unknkown-language"></span><h1 class="top">unknkown language</h1>
 
 <p>Unknown language. See <a href="#Top">unknkown language</a>.
 </p>
 
 <p>Another unknown language. See <a href="#Top">unknkown language</a>.
-</p></div><hr></div>
+</p><hr></div>
 </div>
 
 
diff --git a/tp/t/results/languages/unknown_region.pl 
b/tp/t/results/languages/unknown_region.pl
index 7f2bbf0..5768ab7 100644
--- a/tp/t/results/languages/unknown_region.pl
+++ b/tp/t/results/languages/unknown_region.pl
@@ -408,13 +408,12 @@ ul.no-bullet {list-style: none}
 
 <body lang="fr_NOWHERE">
 
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 
 <dl class="def">
 <dt id="index-BBB-of-AAA"><span>Variable d\'instance de AAA&nbsp;: 
<strong>BBB</strong> <em>CCC</em><a href=\'#index-BBB-of-AAA\' 
class=\'copiable-anchor\'> &para;</a></span></dt>
 </dl>
-</div><hr></div>
+<hr></div>
 
 
 
diff --git a/tp/t/results/layout/navigation/res_html/navigation.html 
b/tp/t/results/layout/navigation/res_html/navigation.html
index c1c9654..bad021e 100644
--- a/tp/t/results/layout/navigation/res_html/navigation.html
+++ b/tp/t/results/layout/navigation/res_html/navigation.html
@@ -44,15 +44,14 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="File-used-for-navigation-testing">
-<h1 class="top">File used for navigation testing</h1>
+<span id="File-used-for-navigation-testing"></span><h1 class="top">File used 
for navigation testing</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#chapter">1 First 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -69,15 +68,14 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="First-chapter">
-<h1 class="chapter">1 First chapter</h1>
+<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#section">1.1 Section in 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="section" id="section">
 <table class="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>
@@ -94,8 +92,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Section-in-chapter">
-<h2 class="section">1.1 Section in chapter</h2>
+<span id="Section-in-chapter"></span><h2 class="section">1.1 Section in 
chapter</h2>
 
 <p>AAAA
 </p>
@@ -129,7 +126,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.
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="subsection" id="subsection">
 <table class="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>
@@ -146,11 +143,10 @@ 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.
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Sub-section-in-section">
-<h3 class="subsection">1.1.1 Sub section in section</h3>
+<span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub 
section in section</h3>
 
 
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 </div>
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 68de709..2d312ea 100644
--- a/tp/t/results/layout/navigation_chapter/res_html/chapter.html
+++ b/tp/t/results/layout/navigation_chapter/res_html/chapter.html
@@ -50,15 +50,14 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="First-chapter">
-<h1 class="chapter">1 First chapter</h1>
+<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#section">1.1 Section in 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="section" id="section">
 <table class="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>
@@ -75,8 +74,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Section-in-chapter">
-<h2 class="section">1.1 Section in chapter</h2>
+<span id="Section-in-chapter"></span><h2 class="section">1.1 Section in 
chapter</h2>
 
 <p>AAAA
 </p>
@@ -110,7 +108,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.
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="subsection" id="subsection">
 <table class="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>
@@ -127,11 +125,10 @@ 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.
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Sub-section-in-section">
-<h3 class="subsection">1.1.1 Sub section in section</h3>
+<span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub 
section in section</h3>
 
 
-</div><hr>
+<hr>
 <table class="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">[ &gt;&gt; ]</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 53301cc..8cdca65 100644
--- a/tp/t/results/layout/navigation_chapter/res_html/index.html
+++ b/tp/t/results/layout/navigation_chapter/res_html/index.html
@@ -44,15 +44,14 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="File-used-for-navigation-testing">
-<h1 class="top">File used for navigation testing</h1>
+<span id="File-used-for-navigation-testing"></span><h1 class="top">File used 
for navigation testing</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="chapter.html#chapter">1 First 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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 0293854..ec80879 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
@@ -49,18 +49,16 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="First-chapter">
-<h1 class="chapter">1 First chapter</h1>
+<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#section">1.1 Section in 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="section" id="section">
-<div class="node" id="Section-in-chapter">
-<h2 class="section">1.1 Section in chapter</h2>
+<span id="Section-in-chapter"></span><h2 class="section">1.1 Section in 
chapter</h2>
 
 <p>AAAA
 </p>
@@ -94,13 +92,12 @@ 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.
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="subsection" id="subsection">
-<div class="node" id="Sub-section-in-section">
-<h3 class="subsection">1.1.1 Sub section in section</h3>
+<span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub 
section in section</h3>
 
 
-</div><hr>
+<hr>
 <table class="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">[ &gt;&gt; ]</td>
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 53301cc..8cdca65 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
@@ -44,15 +44,14 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="File-used-for-navigation-testing">
-<h1 class="top">File used for navigation testing</h1>
+<span id="File-used-for-navigation-testing"></span><h1 class="top">File used 
for navigation testing</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="chapter.html#chapter">1 First 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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 bbe837d..e66ee57 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
@@ -75,18 +75,16 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<div class="node" id="First-chapter">
-<h1 class="chapter">1 First chapter</h1>
+<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#section">1.1 Section in 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="section" id="section">
-<div class="node" id="Section-in-chapter">
-<h2 class="section">1.1 Section in chapter</h2>
+<span id="Section-in-chapter"></span><h2 class="section">1.1 Section in 
chapter</h2>
 
 <p>AAAA
 </p>
@@ -120,13 +118,12 @@ 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.
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="subsection" id="subsection">
-<div class="node" id="Sub-section-in-section">
-<h3 class="subsection">1.1.1 Sub section in section</h3>
+<span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub 
section in section</h3>
 
 
-</div></td>
+</td>
 </tr>
 </table>
 <hr>
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 698284f..eeb8578 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
@@ -61,15 +61,14 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<div class="node" id="File-used-for-navigation-testing">
-<h1 class="top">File used for navigation testing</h1>
+<span id="File-used-for-navigation-testing"></span><h1 class="top">File used 
for navigation testing</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="chapter.html#chapter">1 First 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div></td>
+</td>
 </tr>
 </table>
 <hr>
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 3214db7..88ee19d 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
@@ -81,15 +81,14 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<div class="node" id="First-chapter">
-<h1 class="chapter">1 First chapter</h1>
+<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#section">1.1 Section in 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="section" id="section">
 <table class="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>
@@ -106,8 +105,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Section-in-chapter">
-<h2 class="section">1.1 Section in chapter</h2>
+<span id="Section-in-chapter"></span><h2 class="section">1.1 Section in 
chapter</h2>
 
 <p>AAAA
 </p>
@@ -141,7 +139,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.
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="subsection" id="subsection">
 <table class="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>
@@ -158,11 +156,10 @@ 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.
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Sub-section-in-section">
-<h3 class="subsection">1.1.1 Sub section in section</h3>
+<span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub 
section in section</h3>
 
 
-</div></td>
+</td>
 </tr>
 </table>
 <hr>
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 698284f..eeb8578 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
@@ -61,15 +61,14 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<div class="node" id="File-used-for-navigation-testing">
-<h1 class="top">File used for navigation testing</h1>
+<span id="File-used-for-navigation-testing"></span><h1 class="top">File used 
for navigation testing</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="chapter.html#chapter">1 First 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div></td>
+</td>
 </tr>
 </table>
 <hr>
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 04e0773..af90408 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
@@ -36,28 +36,25 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 <div class="top" id="Top">
-<div class="node" id="File-used-for-navigation-testing">
-<h1 class="top">File used for navigation testing</h1>
+<span id="File-used-for-navigation-testing"></span><h1 class="top">File used 
for navigation testing</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#chapter">1 First 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
-<div class="node" id="First-chapter">
-<h1 class="chapter">1 First chapter</h1>
+<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#section">1.1 Section in 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="section" id="section">
-<div class="node" id="Section-in-chapter">
-<h2 class="section">1.1 Section in chapter</h2>
+<span id="Section-in-chapter"></span><h2 class="section">1.1 Section in 
chapter</h2>
 
 <p>AAAA
 </p>
@@ -91,13 +88,12 @@ 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.
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="subsection" id="subsection">
-<div class="node" id="Sub-section-in-section">
-<h3 class="subsection">1.1.1 Sub section in section</h3>
+<span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub 
section in section</h3>
 
 
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 </div>
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 7231276..35e5e32 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
@@ -36,31 +36,28 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 <div class="top" id="Top">
-<div class="node" id="File-used-for-navigation-testing">
-<h1 class="top">File used for navigation testing</h1>
+<span id="File-used-for-navigation-testing"></span><h1 class="top">File used 
for navigation testing</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#chapter">1 First 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div></td>
+</td>
 </tr>
 </table>
 <hr size="6">
 <div class="chapter" id="chapter">
-<div class="node" id="First-chapter">
-<h1 class="chapter">1 First chapter</h1>
+<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#section">1.1 Section in 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="section" id="section">
-<div class="node" id="Section-in-chapter">
-<h2 class="section">1.1 Section in chapter</h2>
+<span id="Section-in-chapter"></span><h2 class="section">1.1 Section in 
chapter</h2>
 
 <p>AAAA
 </p>
@@ -94,13 +91,12 @@ 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.
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="subsection" id="subsection">
-<div class="node" id="Sub-section-in-section">
-<h3 class="subsection">1.1.1 Sub section in section</h3>
+<span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub 
section in section</h3>
 
 
-</div></td>
+</td>
 </tr>
 </table>
 <hr size="6">
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 03e9862..23e76aa 100644
--- a/tp/t/results/layout/navigation_node/res_html/chapter.html
+++ b/tp/t/results/layout/navigation_node/res_html/chapter.html
@@ -51,15 +51,14 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="First-chapter">
-<h1 class="chapter">1 First chapter</h1>
+<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="section.html">1.1 Section in 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 2b3f4a2..06ab86a 100644
--- a/tp/t/results/layout/navigation_node/res_html/index.html
+++ b/tp/t/results/layout/navigation_node/res_html/index.html
@@ -45,15 +45,14 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="File-used-for-navigation-testing">
-<h1 class="top">File used for navigation testing</h1>
+<span id="File-used-for-navigation-testing"></span><h1 class="top">File used 
for navigation testing</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="chapter.html">1 First 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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 b2193cd..0589b1e 100644
--- a/tp/t/results/layout/navigation_node/res_html/section.html
+++ b/tp/t/results/layout/navigation_node/res_html/section.html
@@ -51,8 +51,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="Section-in-chapter">
-<h2 class="section">1.1 Section in chapter</h2>
+<span id="Section-in-chapter"></span><h2 class="section">1.1 Section in 
chapter</h2>
 
 <p>AAAA
 </p>
@@ -86,7 +85,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.
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 3920601..ab271ad 100644
--- a/tp/t/results/layout/navigation_node/res_html/subsection.html
+++ b/tp/t/results/layout/navigation_node/res_html/subsection.html
@@ -51,11 +51,10 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="Sub-section-in-section">
-<h3 class="subsection">1.1.1 Sub section in section</h3>
+<span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub 
section in section</h3>
 
 
-</div><hr>
+<hr>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 77bcb2c..1b77145 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
@@ -50,15 +50,14 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="First-chapter">
-<h1 class="chapter">1 First chapter</h1>
+<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="section.html">1.1 Section in 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div></div>
+</div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
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 ad0c6c7..a10ef01 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
@@ -45,15 +45,14 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="File-used-for-navigation-testing">
-<h1 class="top">File used for navigation testing</h1>
+<span id="File-used-for-navigation-testing"></span><h1 class="top">File used 
for navigation testing</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="chapter.html">1 First 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 cb01ea5..d4d3bb8 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
@@ -50,8 +50,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Section-in-chapter">
-<h2 class="section">1.1 Section in chapter</h2>
+<span id="Section-in-chapter"></span><h2 class="section">1.1 Section in 
chapter</h2>
 
 <p>AAAA
 </p>
@@ -85,7 +84,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.
 </td></tr>
 </table>
 
-</div></div>
+</div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
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 cc0d4e8..11d316c 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
@@ -50,11 +50,10 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Sub-section-in-section">
-<h3 class="subsection">1.1.1 Sub section in section</h3>
+<span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub 
section in section</h3>
 
 
-</div></div>
+</div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
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 77bcb2c..1b77145 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
@@ -50,15 +50,14 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="First-chapter">
-<h1 class="chapter">1 First chapter</h1>
+<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="section.html">1.1 Section in 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div></div>
+</div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
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 9800083..3552463 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
@@ -61,15 +61,14 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<div class="node" id="File-used-for-navigation-testing">
-<h1 class="top">File used for navigation testing</h1>
+<span id="File-used-for-navigation-testing"></span><h1 class="top">File used 
for navigation testing</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="chapter.html">1 First 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div></td>
+</td>
 </tr>
 </table>
 <hr>
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 cb01ea5..d4d3bb8 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
@@ -50,8 +50,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Section-in-chapter">
-<h2 class="section">1.1 Section in chapter</h2>
+<span id="Section-in-chapter"></span><h2 class="section">1.1 Section in 
chapter</h2>
 
 <p>AAAA
 </p>
@@ -85,7 +84,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.
 </td></tr>
 </table>
 
-</div></div>
+</div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
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 cc0d4e8..11d316c 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
@@ -50,11 +50,10 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Sub-section-in-section">
-<h3 class="subsection">1.1.1 Sub section in section</h3>
+<span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub 
section in section</h3>
 
 
-</div></div>
+</div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
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 bba89aa..d0d2312 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
@@ -81,15 +81,14 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<div class="node" id="First-chapter">
-<h1 class="chapter">1 First chapter</h1>
+<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="section.html">1.1 Section in 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div></td>
+</td>
 </tr>
 </table>
 <hr>
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 d788df6..677c23b 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
@@ -61,15 +61,14 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<div class="node" id="File-used-for-navigation-testing">
-<h1 class="top">File used for navigation testing</h1>
+<span id="File-used-for-navigation-testing"></span><h1 class="top">File used 
for navigation testing</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="chapter.html">1 First 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div></td>
+</td>
 </tr>
 </table>
 <hr>
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 c8533fb..674f587 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
@@ -81,8 +81,7 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<div class="node" id="Section-in-chapter">
-<h2 class="section">1.1 Section in chapter</h2>
+<span id="Section-in-chapter"></span><h2 class="section">1.1 Section in 
chapter</h2>
 
 <p>AAAA
 </p>
@@ -116,7 +115,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.
 </td></tr>
 </table>
 
-</div></td>
+</td>
 </tr>
 </table>
 <hr>
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 419838e..4c353f8 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
@@ -81,11 +81,10 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<div class="node" id="Sub-section-in-section">
-<h3 class="subsection">1.1.1 Sub section in section</h3>
+<span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub 
section in section</h3>
 
 
-</div></td>
+</td>
 </tr>
 </table>
 <hr>
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 784b0d5..e5a5035 100644
--- a/tp/t/results/layout/navigation_section/res_html/chapter.html
+++ b/tp/t/results/layout/navigation_section/res_html/chapter.html
@@ -50,15 +50,14 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="First-chapter">
-<h1 class="chapter">1 First chapter</h1>
+<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="section.html#section">1.1 Section 
in chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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 de5a564..ed2310b 100644
--- a/tp/t/results/layout/navigation_section/res_html/index.html
+++ b/tp/t/results/layout/navigation_section/res_html/index.html
@@ -44,15 +44,14 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="File-used-for-navigation-testing">
-<h1 class="top">File used for navigation testing</h1>
+<span id="File-used-for-navigation-testing"></span><h1 class="top">File used 
for navigation testing</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="chapter.html">1 First 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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 cc52171..9b5b50d 100644
--- a/tp/t/results/layout/navigation_section/res_html/section.html
+++ b/tp/t/results/layout/navigation_section/res_html/section.html
@@ -50,8 +50,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Section-in-chapter">
-<h2 class="section">1.1 Section in chapter</h2>
+<span id="Section-in-chapter"></span><h2 class="section">1.1 Section in 
chapter</h2>
 
 <p>AAAA
 </p>
@@ -85,7 +84,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.
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="subsection" id="subsection">
 <table class="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>
@@ -102,11 +101,10 @@ 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.
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Sub-section-in-section">
-<h3 class="subsection">1.1.1 Sub section in section</h3>
+<span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub 
section in section</h3>
 
 
-</div><hr>
+<hr>
 <table class="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 784b0d5..e5a5035 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
@@ -50,15 +50,14 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="First-chapter">
-<h1 class="chapter">1 First chapter</h1>
+<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="section.html#section">1.1 Section 
in chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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 de5a564..ed2310b 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
@@ -44,15 +44,14 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="File-used-for-navigation-testing">
-<h1 class="top">File used for navigation testing</h1>
+<span id="File-used-for-navigation-testing"></span><h1 class="top">File used 
for navigation testing</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="chapter.html">1 First 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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 350c452..b2e43ad 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
@@ -50,8 +50,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Section-in-chapter">
-<h2 class="section">1.1 Section in chapter</h2>
+<span id="Section-in-chapter"></span><h2 class="section">1.1 Section in 
chapter</h2>
 
 <p>AAAA
 </p>
@@ -85,13 +84,12 @@ 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.
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="subsection" id="subsection">
-<div class="node" id="Sub-section-in-section">
-<h3 class="subsection">1.1.1 Sub section in section</h3>
+<span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub 
section in section</h3>
 
 
-</div><hr>
+<hr>
 <table class="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_vertical/res_html/chapter.html
 
b/tp/t/results/layout/navigation_section_no_header_vertical/res_html/chapter.html
index 8eaf51d..add1017 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
@@ -81,15 +81,14 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<div class="node" id="First-chapter">
-<h1 class="chapter">1 First chapter</h1>
+<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="section.html#section">1.1 Section 
in chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div></td>
+</td>
 </tr>
 </table>
 <hr>
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 d788df6..677c23b 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
@@ -61,15 +61,14 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<div class="node" id="File-used-for-navigation-testing">
-<h1 class="top">File used for navigation testing</h1>
+<span id="File-used-for-navigation-testing"></span><h1 class="top">File used 
for navigation testing</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="chapter.html">1 First 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div></td>
+</td>
 </tr>
 </table>
 <hr>
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 007732b..bdb864f 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
@@ -81,8 +81,7 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<div class="node" id="Section-in-chapter">
-<h2 class="section">1.1 Section in chapter</h2>
+<span id="Section-in-chapter"></span><h2 class="section">1.1 Section in 
chapter</h2>
 
 <p>AAAA
 </p>
@@ -116,13 +115,12 @@ 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.
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="subsection" id="subsection">
-<div class="node" id="Sub-section-in-section">
-<h3 class="subsection">1.1.1 Sub section in section</h3>
+<span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub 
section in section</h3>
 
 
-</div></td>
+</td>
 </tr>
 </table>
 <hr>
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 8eaf51d..add1017 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
@@ -81,15 +81,14 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<div class="node" id="First-chapter">
-<h1 class="chapter">1 First chapter</h1>
+<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="section.html#section">1.1 Section 
in chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div></td>
+</td>
 </tr>
 </table>
 <hr>
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 d788df6..677c23b 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
@@ -61,15 +61,14 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<div class="node" id="File-used-for-navigation-testing">
-<h1 class="top">File used for navigation testing</h1>
+<span id="File-used-for-navigation-testing"></span><h1 class="top">File used 
for navigation testing</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="chapter.html">1 First 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div></td>
+</td>
 </tr>
 </table>
 <hr>
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 108aa27..5825dd0 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
@@ -81,8 +81,7 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<div class="node" id="Section-in-chapter">
-<h2 class="section">1.1 Section in chapter</h2>
+<span id="Section-in-chapter"></span><h2 class="section">1.1 Section in 
chapter</h2>
 
 <p>AAAA
 </p>
@@ -116,7 +115,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.
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="subsection" id="subsection">
 <table class="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>
@@ -133,11 +132,10 @@ 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.
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Sub-section-in-section">
-<h3 class="subsection">1.1.1 Sub section in section</h3>
+<span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub 
section in section</h3>
 
 
-</div></td>
+</td>
 </tr>
 </table>
 <hr>
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 ca97a31..76497ee 100644
--- a/tp/t/results/layout/navigation_vertical/res_html/navigation.html
+++ b/tp/t/results/layout/navigation_vertical/res_html/navigation.html
@@ -61,15 +61,14 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<div class="node" id="File-used-for-navigation-testing">
-<h1 class="top">File used for navigation testing</h1>
+<span id="File-used-for-navigation-testing"></span><h1 class="top">File used 
for navigation testing</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#chapter">1 First 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div></td>
+</td>
 </tr>
 </table>
 <hr size="6">
@@ -120,15 +119,14 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<div class="node" id="First-chapter">
-<h1 class="chapter">1 First chapter</h1>
+<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#section">1.1 Section in 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="section" id="section">
 <table class="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>
@@ -145,8 +143,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Section-in-chapter">
-<h2 class="section">1.1 Section in chapter</h2>
+<span id="Section-in-chapter"></span><h2 class="section">1.1 Section in 
chapter</h2>
 
 <p>AAAA
 </p>
@@ -180,7 +177,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.
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="subsection" id="subsection">
 <table class="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>
@@ -197,11 +194,10 @@ 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.
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Sub-section-in-section">
-<h3 class="subsection">1.1.1 Sub section in section</h3>
+<span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub 
section in section</h3>
 
 
-</div></td>
+</td>
 </tr>
 </table>
 <hr size="6">
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 ef4a6df..d4c86b2 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
@@ -44,8 +44,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="#chapter" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="no_monolithic_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Not-monolithic">
-<h1 class="top">Not monolithic</h1>
+<span id="Not-monolithic"></span><h1 class="top">Not monolithic</h1>
 
 <p>Not monolitic manual<a id="DOCF1" 
href="no_monolithic_fot.html#FOOT1"><sup>1</sup></a>.
 </p>
@@ -56,7 +55,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -73,8 +72,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="#chapter" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="no_monolithic_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Chapter">
-<h1 class="chapter">1 Chapter</h1>
+<span id="Chapter"></span><h1 class="chapter">1 Chapter</h1>
 
 <p>Chapter.
 </p>
@@ -92,7 +90,7 @@ ul.no-bullet {list-style: none}
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#Chapter_cp_letter-T"><b>T</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr>
+<hr>
 </div>
 </div>
 <p><font size="-1">
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 78e2c97..54b222f 100644
--- a/tp/t/results/menu/block_commands_in_menu_description.pl
+++ b/tp/t/results/menu/block_commands_in_menu_description.pl
@@ -863,8 +863,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 <div class="top" id="Top">
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a href="manual.html#Top" 
accesskey="1">(manual)</a>:</td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top">
@@ -891,7 +890,7 @@ Text.
 <pre class="verbatim">
 </pre></td></tr>
 </table>
-</div><hr></div>
+<hr></div>
 </div>
 
 
diff --git a/tp/t/results/menu/comment_on_menu_line.pl 
b/tp/t/results/menu/comment_on_menu_line.pl
index 9b4ddd4..e76e2bd 100644
--- a/tp/t/results/menu/comment_on_menu_line.pl
+++ b/tp/t/results/menu/comment_on_menu_line.pl
@@ -475,16 +475,14 @@ Next: <a href="#first" accesskey="n" rel="next">first</a> 
&nbsp; </p>
 </td></tr>
 </table>
 
-<div class="node" id="first-1">
-<h2 class="chapter">1 first</h2>
-</div><hr>
-<div class="node" id="first">
-<div class="header">
+<span id="first-1"></span><h2 class="chapter">1 first</h2>
+<hr>
+<span id="first"></span><div class="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>
-</div><hr>
+<hr>
 </div>
 
 
diff --git a/tp/t/results/menu/detailmenu_on_subnodes.pl 
b/tp/t/results/menu/detailmenu_on_subnodes.pl
index 844e3d3..8feec3f 100644
--- a/tp/t/results/menu/detailmenu_on_subnodes.pl
+++ b/tp/t/results/menu/detailmenu_on_subnodes.pl
@@ -1978,8 +1978,7 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; </p>
 </div>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a href="#chapter" 
accesskey="1">chapter</a>:</td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top">
@@ -2000,30 +1999,28 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">chapter</a> &nbsp; </p>
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="chapter" id="chapter">
 <div class="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>
 </div>
-<div class="node" id="chapter-1">
-<h2 class="chapter">1 chapter</h2>
+<span id="chapter-1"></span><h2 class="chapter">1 chapter</h2>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a href="#section" 
accesskey="1">section</a>:</td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top">
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="section" id="section">
 <div class="header">
 <p>
 Up: <a href="#chapter" accesskey="u" rel="up">chapter</a> &nbsp; </p>
 </div>
-<div class="node" id="section-1">
-<h3 class="section">1.1 section</h3>
+<span id="section-1"></span><h3 class="section">1.1 section</h3>
 
-</div><hr>
+<hr>
 </div>
 </div>
 <div class="chapter" id="chapter-2">
@@ -2031,8 +2028,7 @@ Up: <a href="#chapter" accesskey="u" rel="up">chapter</a> 
&nbsp; </p>
 <p>
 Previous: <a href="#chapter" accesskey="p" rel="prev">chapter</a>, Up: <a 
href="#Top" accesskey="u" rel="up">top</a> &nbsp; </p>
 </div>
-<div class="node" id="chapter-2-1">
-<h2 class="chapter">2 chapter 2</h2>
+<span id="chapter-2-1"></span><h2 class="chapter">2 chapter 2</h2>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a href="#section-chap-2" 
accesskey="1">section chap 2</a>:</td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top">
@@ -2041,25 +2037,23 @@ Previous: <a href="#chapter" accesskey="p" 
rel="prev">chapter</a>, Up: <a href="
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="section" id="section-chap-2">
 <div class="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>
 </div>
-<div class="node" id="section-chap-2-1">
-<h3 class="section">2.1 section chap 2</h3>
+<span id="section-chap-2-1"></span><h3 class="section">2.1 section chap 2</h3>
 
-</div><hr>
+<hr>
 </div>
 <div class="unnumberedsec" id="unnumberedsec">
 <div class="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>
 </div>
-<div class="node" id="unnumberedsec-1">
-<h3 class="unnumberedsec">unnumberedsec</h3>
-</div><hr>
+<span id="unnumberedsec-1"></span><h3 class="unnumberedsec">unnumberedsec</h3>
+<hr>
 </div>
 </div>
 </div>
diff --git a/tp/t/results/menu/detailmenu_unknown_node.pl 
b/tp/t/results/menu/detailmenu_unknown_node.pl
index 9d2f1b4..f3f6fa3 100644
--- a/tp/t/results/menu/detailmenu_unknown_node.pl
+++ b/tp/t/results/menu/detailmenu_unknown_node.pl
@@ -364,14 +364,13 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">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">
 </td></tr>
 </table>
-</div><hr></div>
+<hr></div>
 
 
 
diff --git a/tp/t/results/menu/entry_after_detailmenu.pl 
b/tp/t/results/menu/entry_after_detailmenu.pl
index fa99038..1b2f355 100644
--- a/tp/t/results/menu/entry_after_detailmenu.pl
+++ b/tp/t/results/menu/entry_after_detailmenu.pl
@@ -847,8 +847,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<div class="header">
+<span id="Top"></span><div class="header">
 <p>
 Next: <a href="#first" accesskey="n" rel="next">first</a> &nbsp; </p>
 </div>
@@ -871,21 +870,19 @@ Menu comment
 </td></tr>
 </table>
 
-</div><hr>
-<div class="node" id="first">
-<div class="header">
+<hr>
+<span id="first"></span><div class="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>
-</div><hr>
-<div class="node" id="second">
-<div class="header">
+<hr>
+<span id="second"></span><div class="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>
-</div><hr>
+<hr>
 
 
 
diff --git a/tp/t/results/menu/example_in_menu_description.pl 
b/tp/t/results/menu/example_in_menu_description.pl
index 0bcb7f2..ef47c36 100644
--- a/tp/t/results/menu/example_in_menu_description.pl
+++ b/tp/t/results/menu/example_in_menu_description.pl
@@ -509,8 +509,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 <div class="top" id="Top">
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a href="manual.html#Top" 
accesskey="1">(manual)</a>:</td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top">
@@ -523,7 +522,7 @@ example
 <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
 
 </pre></th></tr></table>
-</div><hr></div>
+<hr></div>
 </div>
 
 
diff --git a/tp/t/results/menu/formats_in_menu.pl 
b/tp/t/results/menu/formats_in_menu.pl
index 248ef2c..7ed4bea 100644
--- a/tp/t/results/menu/formats_in_menu.pl
+++ b/tp/t/results/menu/formats_in_menu.pl
@@ -1049,8 +1049,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">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
@@ -1083,7 +1082,7 @@ Menu comment
 <pre class="menu-comment">
 
 </pre></th></tr></table>
-</div><hr></div>
+<hr></div>
 
 
 
diff --git a/tp/t/results/menu/inlineraw_in_menu_description.pl 
b/tp/t/results/menu/inlineraw_in_menu_description.pl
index 8df1761..e309e28 100644
--- a/tp/t/results/menu/inlineraw_in_menu_description.pl
+++ b/tp/t/results/menu/inlineraw_in_menu_description.pl
@@ -480,8 +480,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 <div class="top" id="Top">
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a href="manual.html#Top" 
accesskey="1">(manual)</a>:</td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top">
@@ -492,7 +491,7 @@ end inlineraw
 <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
 
 </pre></th></tr></table>
-</div><hr></div>
+<hr></div>
 </div>
 
 
diff --git a/tp/t/results/menu/invalid_info_menu_entry.pl 
b/tp/t/results/menu/invalid_info_menu_entry.pl
index 7da101a..73da26e 100644
--- a/tp/t/results/menu/invalid_info_menu_entry.pl
+++ b/tp/t/results/menu/invalid_info_menu_entry.pl
@@ -918,8 +918,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">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">
@@ -933,7 +932,7 @@ ul.no-bullet {list-style: none}
 <tr><td align="left" valign="top">&bull; <a href="f.html#node-n" 
accesskey="5">name</a>:</td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top">d3
 </td></tr>
 </table>
-</div><hr></div>
+<hr></div>
 
 
 
diff --git a/tp/t/results/menu/menu_in_example.pl 
b/tp/t/results/menu/menu_in_example.pl
index b9830c8..c2b2c05 100644
--- a/tp/t/results/menu/menu_in_example.pl
+++ b/tp/t/results/menu/menu_in_example.pl
@@ -763,8 +763,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 
 <div class="example">
 <table class="menu" border="0" cellspacing="0"><tr><td>
@@ -785,7 +784,7 @@ ul.no-bullet {list-style: none}
 
 </pre></td></tr></table>
 </div>
-</div><hr></div>
+<hr></div>
 
 
 
diff --git a/tp/t/results/menu/menu_pointing_to_anchor.pl 
b/tp/t/results/menu/menu_pointing_to_anchor.pl
index e914240..292f707 100644
--- a/tp/t/results/menu/menu_pointing_to_anchor.pl
+++ b/tp/t/results/menu/menu_pointing_to_anchor.pl
@@ -455,8 +455,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 <div class="top" id="Top">
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <p>Text
 </p>
@@ -465,7 +464,7 @@ ul.no-bullet {list-style: none}
 <tr><td align="left" valign="top">&bull; <a href="#An-anchor" accesskey="1">An 
anchor</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">menu entry 
pointing to the anchor.
 </td></tr>
 </table>
-</div><hr></div>
+<hr></div>
 </div>
 
 
diff --git a/tp/t/results/menu/menu_title_before_entries.pl 
b/tp/t/results/menu/menu_title_before_entries.pl
index c8fa8ea..a634c8b 100644
--- a/tp/t/results/menu/menu_title_before_entries.pl
+++ b/tp/t/results/menu/menu_title_before_entries.pl
@@ -397,8 +397,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<div class="header">
+<span id="Top"></span><div class="header">
 <p>
 Next: <a href="#subnode" accesskey="n" rel="next">subnode</a> &nbsp; </p>
 </div>
@@ -410,14 +409,13 @@ Next: <a href="#subnode" accesskey="n" 
rel="next">subnode</a> &nbsp; </p>
 </td></tr>
 </table>
 
-</div><hr>
-<div class="node" id="subnode">
-<div class="header">
+<hr>
+<span id="subnode"></span><div class="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>
-</div><hr>
+<hr>
 
 
 
diff --git a/tp/t/results/menu/no_colon_in_menu.pl 
b/tp/t/results/menu/no_colon_in_menu.pl
index 2d9075f..481b1de 100644
--- a/tp/t/results/menu/no_colon_in_menu.pl
+++ b/tp/t/results/menu/no_colon_in_menu.pl
@@ -245,13 +245,12 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">* a
 </pre></th></tr></table>
-</div><hr></div>
+<hr></div>
 
 
 
diff --git a/tp/t/results/menu/reference_to_external_manual.pl 
b/tp/t/results/menu/reference_to_external_manual.pl
index 76a6183..ac03313 100644
--- a/tp/t/results/menu/reference_to_external_manual.pl
+++ b/tp/t/results/menu/reference_to_external_manual.pl
@@ -332,14 +332,13 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">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">
 </td></tr>
 </table>
-</div><hr></div>
+<hr></div>
 
 
 
diff --git a/tp/t/results/menu/sc_in_menu.pl b/tp/t/results/menu/sc_in_menu.pl
index 78d5242..3139d27 100644
--- a/tp/t/results/menu/sc_in_menu.pl
+++ b/tp/t/results/menu/sc_in_menu.pl
@@ -1158,8 +1158,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="node" id="Top">
-<div class="header">
+<span id="Top"></span><div class="header">
 <p>
 Next: <a href="#NODE" accesskey="n" rel="next"><small>NODE</small></a> &nbsp; 
</p>
 </div>
@@ -1179,9 +1178,8 @@ MENU-EXAMPLE COMMENT
 </pre></div>
 </th></tr></table>
 
-</div><hr>
-<div class="node" id="NODE">
-<div class="header">
+<hr>
+<span id="NODE"></span><div class="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>
@@ -1196,7 +1194,7 @@ EXAMPLE COMMENT
 </pre></td></tr></table>
 </div>
 
-</div><hr>
+<hr>
 
 
 
diff --git a/tp/t/results/menu/verb_in_menu_description.pl 
b/tp/t/results/menu/verb_in_menu_description.pl
index 4f42444..34feacf 100644
--- a/tp/t/results/menu/verb_in_menu_description.pl
+++ b/tp/t/results/menu/verb_in_menu_description.pl
@@ -464,8 +464,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 <div class="top" id="Top">
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a href="manual.html#Top" 
accesskey="1">(manual)</a>:</td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top">
@@ -476,7 +475,7 @@ ul.no-bullet {list-style: none}
 <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
 
 </pre></th></tr></table>
-</div><hr></div>
+<hr></div>
 </div>
 
 
diff --git 
a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl 
b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
index dc66e3c..95ebb84 100644
--- a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -5296,8 +5296,7 @@ 
$result_converted{'html_text'}->{'codequoteundirected_codequotebacktick'} = '
 
 
 <div class="top" id="Top">
-<div class="node" id="test-quotes">
-<h1 class="top">test quotes</h1>
+<span id="test-quotes"></span><h1 class="top">test quotes</h1>
 
 <p>&ldquo;simple-double&ndash;three&mdash;four&mdash;-&rdquo; 
&lsquo;simple&rsquo; quotedblleft: &ldquo; <br>
 code: <code>``simple-double--three---four----\'\' `simple\' quotedblleft: 
&ldquo;</code> <br>
@@ -5377,7 +5376,7 @@ samp: &lsquo;<samp>``simple-double--three---four----\'\' 
`simple\' quotedblleft:
 
 </pre></div>
 
-</div><hr></div>
+<hr></div>
 ';
 
 
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 9807c9a..2a8ef14 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
@@ -838,15 +838,13 @@ Text 1
 
 $result_converted{'html_text'}->{'comment_space_command_on_line'} = '
 <div class="top" id="Top">
-<div class="node" id="top-element-">
-<h1 class="top">top element&nbsp;</h1>
+<span id="top-element-"></span><h1 class="top">top element&nbsp;</h1>
 
 
 <span id="index-index-entry--"></span>
 
-<div class="heading" id="Heading--">
-<h3 class="heading">Heading &nbsp;</h3>
-</div>
+<span id="Heading--"></span><h3 class="heading">Heading &nbsp;</h3>
+
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#t_h_cp_letter-I"><b>I</b></a>
  &nbsp; 
 </td></tr></table>
@@ -866,7 +864,7 @@ 
$result_converted{'html_text'}->{'comment_space_command_on_line'} = '
 </p><div class="float-caption"><p><strong>Text 1
 </strong></p></div></div>
 
-</div><hr></div>
+<hr></div>
 ';
 
 
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 2dc9006..407ee9e 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
@@ -233,21 +233,17 @@ Subheading
 ';
 
 
-$result_converted{'html_text'}->{'no_empty_line_between_headings'} = '<div 
class="top" id="Top">
-<h1 class="top">Top</h1>
-<div class="subheading" id="Subheading">
-<h4 class="subheading">Subheading</h4>
-</div><ul class="section-toc">
+$result_converted{'html_text'}->{'no_empty_line_between_headings'} = '<span 
id="Top"></span><h1 class="top">Top</h1>
+<span id="Subheading"></span><h4 class="subheading">Subheading</h4>
+<ul class="section-toc">
 <li><a href="#Chapter" accesskey="1">Chapter</a></li>
 </ul>
-</div><div class="chapter" id="Chapter">
-<h2 class="chapter">1 Chapter</h2>
+<span id="Chapter"></span><h2 class="chapter">1 Chapter</h2>
 <ul class="section-toc">
 <li><a href="#Section" accesskey="1">Section</a></li>
 </ul>
-</div><div class="section" id="Section">
-<h3 class="section">1.1 Section</h3>
-</div><hr></div>
+<span id="Section"></span><h3 class="section">1.1 Section</h3>
+<hr></div>
 ';
 
 
diff --git a/tp/t/results/misc_commands/ref_in_center.pl 
b/tp/t/results/misc_commands/ref_in_center.pl
index 5868dc3..5b68521 100644
--- a/tp/t/results/misc_commands/ref_in_center.pl
+++ b/tp/t/results/misc_commands/ref_in_center.pl
@@ -291,15 +291,14 @@ $result_converted{'plaintext'}->{'ref_in_center'} = '
 ';
 
 
-$result_converted{'html_text'}->{'ref_in_center'} = '<div class="node" 
id="Top">
-<h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'ref_in_center'} = '<span id="Top"></span><h1 
class="node-heading">Top</h1>
 
 <div align="center"><a href="#Top">Top</a>
 </div>
 <div align="center">&lsquo;title
 &rsquo;
 </div><p>very long
-</p></div><hr></div>
+</p><hr></div>
 ';
 
 
diff --git a/tp/t/results/misc_commands/test_allowcodebreaks.pl 
b/tp/t/results/misc_commands/test_allowcodebreaks.pl
index c23750e..13f4c45 100644
--- a/tp/t/results/misc_commands/test_allowcodebreaks.pl
+++ b/tp/t/results/misc_commands/test_allowcodebreaks.pl
@@ -2737,8 +2737,7 @@ Out of code -- out-of-code. \'1aaa\' \'2aaa-\' \'-3bbb\' 
\'4aaa-bbb\'  \' 5aaa-b
 ';
 
 
-$result_converted{'html_text'}->{'test_allowcodebreaks'} = '<div class="node" 
id="Top">
-<h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'test_allowcodebreaks'} = '<span 
id="Top"></span><h1 class="node-heading">Top</h1>
 
 
 
@@ -2784,7 +2783,7 @@ anc-hor<span id="A-node2"></span></samp>&rsquo;
 <div class="example">
 <pre class="example"><code>in-example</code>
 </pre></div>
-</div><hr></div>
+<hr></div>
 ';
 
 1;
diff --git a/tp/t/results/morecoverage/formatting_fr.pl 
b/tp/t/results/morecoverage/formatting_fr.pl
index db48c8f..5e07302 100644
--- a/tp/t/results/morecoverage/formatting_fr.pl
+++ b/tp/t/results/morecoverage/formatting_fr.pl
@@ -4925,8 +4925,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="A propos (page 
d&rsquo;aide)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Top-section">
-<h1 class="top">Top section</h1>
+<span id="Top-section"></span><h1 class="top">Top section</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#chapter">1 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
@@ -5054,7 +5053,7 @@ Menu comment
 </p>
 
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -5071,8 +5070,7 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="A propos (page 
d&rsquo;aide)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="chapter-1">
-<h1 class="chapter">1 chapter</h1>
+<span id="chapter-1"></span><h1 class="chapter">1 chapter</h1>
 
 <p><a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
@@ -5088,7 +5086,7 @@ Menu comment
 </pre></td></tr></table>
 </div>
 
-</div><hr>
+<hr>
 <div class="section" id="s_002d_002dect_002cion">
 <table class="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>
@@ -5105,8 +5103,7 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="A propos (page 
d&rsquo;aide)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="A-section">
-<h2 class="section">1.1 A section</h2>
+<span id="A-section"></span><h2 class="section">1.1 A section</h2>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#subsection">1.1.1 
subsection</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
@@ -5121,7 +5118,7 @@ Menu comment
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="subsection" id="subsection">
 <table class="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>
@@ -5138,8 +5135,7 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="A propos (page 
d&rsquo;aide)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="subsection-1">
-<h3 class="subsection">1.1.1 subsection</h3>
+<span id="subsection-1"></span><h3 class="subsection">1.1.1 subsection</h3>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a 
href="#subsubsection-_0060_0060simple_002ddouble_002d_002d">1.1.1.1 
subsubsection &ldquo;simple-double&ndash;</a></td><td>&nbsp;&nbsp;</td><td 
align="left" valign="top">
@@ -5149,7 +5145,7 @@ Menu comment
 </table>
 
 <span id="anchor"></span>
-</div><hr>
+<hr>
 <div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
 <table class="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>
@@ -5166,10 +5162,9 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="A propos (page 
d&rsquo;aide)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1">
-<h4 class="subsubsection">1.1.1.1 subsubsection 
&ldquo;simple-double&ndash;</h4>
+<span id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1"></span><h4 
class="subsubsection">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</h4>
 
-</div><hr>
+<hr>
 </div>
 <div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -5187,10 +5182,9 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="A propos (page 
d&rsquo;aide)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
-<h4 class="subsubsection">1.1.1.2 three&mdash;four&mdash;-&rdquo;</h4>
+<span id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027"></span><h4 
class="subsubsection">1.1.1.2 three&mdash;four&mdash;-&rdquo;</h4>
 
-</div><hr>
+<hr>
 </div>
 </div>
 </div>
@@ -5211,8 +5205,7 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="A propos (page 
d&rsquo;aide)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="chapter-2">
-<h1 class="centerchap" align="center">chapter 2</h1>
+<span id="chapter-2"></span><h1 class="centerchap" align="center">chapter 
2</h1>
 
 <table><tr><th valign="top">Aller &agrave;: &nbsp; </th><td><a 
class="summary-letter" href="#chapter-2_cp_symbol-1"><b>.</b></a>
  &nbsp; 
@@ -5289,7 +5282,7 @@ Menu comment
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
+<hr>
 </div>
 </div>
 <p><font size="-1">
diff --git a/tp/t/results/morecoverage/texi_formatting.pl 
b/tp/t/results/morecoverage/texi_formatting.pl
index c9bc72b..2d3e076 100644
--- a/tp/t/results/morecoverage/texi_formatting.pl
+++ b/tp/t/results/morecoverage/texi_formatting.pl
@@ -4912,8 +4912,7 @@ ul.no-bullet {list-style: none}
 <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>
 </div>
-<div class="node" id="Top-section">
-<h1 class="top">Top section</h1>
+<span id="Top-section"></span><h1 class="top">Top section</h1>
 
 
 
@@ -5063,14 +5062,13 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">chapter</a> &nbsp; [<a href="#
 </ul>
 </div>
 </div>
-</div><hr>
+<hr>
 <div class="chapter" id="chapter">
 <div class="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>
 </div>
-<div class="node" id="chapter-1">
-<h2 class="chapter">1 chapter</h2>
+<span id="chapter-1"></span><h2 class="chapter">1 chapter</h2>
 
 <p><a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
@@ -5078,27 +5076,25 @@ Next: <a href="#chapter2" accesskey="n" 
rel="next">chapter 2</a>, Previous: <a h
 <ul class="section-toc">
 <li><a href="#s_002d_002dect_002cion" accesskey="1">A section</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="section" id="s_002d_002dect_002cion">
 <div class="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>
 </div>
-<div class="node" id="A-section">
-<h3 class="section">1.1 A section</h3>
+<span id="A-section"></span><h3 class="section">1.1 A section</h3>
 
 
 <ul class="section-toc">
 <li><a href="#subsection" accesskey="1">subsection</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="subsection" id="subsection">
 <div class="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>
 </div>
-<div class="node" id="subsection-1">
-<h4 class="subsection">1.1.1 subsection</h4>
+<span id="subsection-1"></span><h4 class="subsection">1.1.1 subsection</h4>
 
 
 <span id="anchor"></span>
@@ -5106,26 +5102,24 @@ Up: <a href="#s_002d_002dect_002cion" accesskey="u" 
rel="up">A section</a> &nbsp
 <li><a href="#subsubsection-_0060_0060simple_002ddouble_002d_002d" 
accesskey="1">subsubsection &ldquo;simple-double&ndash;</a></li>
 <li><a 
href="#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" 
accesskey="2">three&mdash;four&mdash;-&rdquo;</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
 <div class="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>
 </div>
-<div class="node" id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1">
-<h4 class="subsubsection">1.1.1.1 subsubsection 
&ldquo;simple-double&ndash;</h4>
+<span id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1"></span><h4 
class="subsubsection">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</h4>
 
-</div><hr>
+<hr>
 </div>
 <div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
 <div class="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>
 </div>
-<div class="node" id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
-<h4 class="subsubsection">1.1.1.2 three&mdash;four&mdash;-&rdquo;</h4>
+<span id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027"></span><h4 
class="subsubsection">1.1.1.2 three&mdash;four&mdash;-&rdquo;</h4>
 
-</div><hr>
+<hr>
 </div>
 </div>
 </div>
@@ -5135,8 +5129,7 @@ Previous: <a 
href="#subsubsection-_0060_0060simple_002ddouble_002d_002d" accessk
 <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>
 </div>
-<div class="node" id="chapter-2">
-<h2 class="centerchap" align="center">chapter 2</h2>
+<span id="chapter-2"></span><h2 class="centerchap" align="center">chapter 
2</h2>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#chapter2_cp_symbol-1"><b>.</b></a>
  &nbsp; 
@@ -5213,7 +5206,7 @@ Previous: <a href="#chapter" accesskey="p" 
rel="prev">chapter</a>, Up: <a href="
  &nbsp; 
 </td></tr></table>
 
-</div><div class="footnote">
+<div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
diff --git 
a/tp/t/results/moreindices/double_index_entry/res_html/double_index_entry.html 
b/tp/t/results/moreindices/double_index_entry/res_html/double_index_entry.html
index e7579fb..deac11d 100644
--- 
a/tp/t/results/moreindices/double_index_entry/res_html/double_index_entry.html
+++ 
b/tp/t/results/moreindices/double_index_entry/res_html/double_index_entry.html
@@ -34,8 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-
+<span id="Top"></span>
 <span id="index-aaa"></span>
 
 <p>Text
@@ -47,8 +46,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><div class="node" id="other-node">
-
+<span id="other-node"></span>
 <span id="index-aaa-2"></span>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#t_h_cp_letter-A"><b>A</b></a>
@@ -67,7 +65,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr></div>
+<hr></div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></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 c8002bf..54a1f4d 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
@@ -34,8 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="chapter" id="Chapter-2">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="Chapter-2"></span><table class="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">[ Up ]</td>
@@ -54,7 +53,7 @@ ul.no-bullet {list-style: none}
 
 <p>In chapter 2
 </p>
-</div><hr>
+<hr>
 <table class="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">[ &gt;&gt; ]</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 e991fa3..c1e5c1e 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
@@ -34,8 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="chapter" id="Chapter">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="Chapter"></span><table class="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>
 <td valign="middle" align="left">[ Up ]</td>
@@ -100,7 +99,7 @@ ul.no-bullet {list-style: none}
 <p>Text of chapter
 <span id="index-Chapter2"></span>
 </p>
-</div><hr>
+<hr>
 <table class="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="Chapter-2.html" title="Next 
chapter"> &gt;&gt; </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 d57c0ea..1b70c37 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
@@ -34,8 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="top" id="top-section">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="top-section"></span><table class="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>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -101,9 +100,8 @@ ul.no-bullet {list-style: none}
 <span id="index-top-section1"></span>
 
 
-</div><hr size="6">
-<div class="section" id="second">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr size="6">
+<span id="second"></span><table class="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>
 <td valign="middle" align="left">[<a href="#top-section" title="Up section"> 
Up </a>]</td>
@@ -212,7 +210,7 @@ ul.no-bullet {list-style: none}
 <a class="summary-letter" href="#second_cp_letter-U"><b>U</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr>
+<hr>
 <table class="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="Chapter.html" title="Next chapter"> 
&gt;&gt; </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 ca3400e..9fe3dc1 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
@@ -83,8 +83,7 @@ ul.no-bullet {list-style: none}
 </td></tr></table>
 
 
-<div class="unnumbered" id="unnumbered">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="unnumbered"></span><table class="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">[ Up ]</td>
@@ -150,7 +149,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
+<hr>
 <table class="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#top-section" title="Next 
chapter"> &gt;&gt; </a>]</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 aa8d888..79bb1b5 100644
--- a/tp/t/results/moreindices/index_split/res_html/first.html
+++ b/tp/t/results/moreindices/index_split/res_html/first.html
@@ -154,8 +154,7 @@ ul.no-bullet {list-style: none}
 
 <span id="index-entry-after-printindex"></span>
 
-<div class="node" id="First-chapter">
-<h1 class="chapter">1 First chapter</h1>
+<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
 <span id="index-a-function"></span>
 <span id="index-a-concept-in-first"></span>
 <span id="index-somewhere"></span>
@@ -175,7 +174,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="section" id="section-1">
 <table class="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>
@@ -192,8 +191,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="index.html" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Section-1">
-<h2 class="section">1.1 Section 1</h2>
+<span id="Section-1"></span><h2 class="section">1.1 Section 1</h2>
 
 <span id="index-something"></span>
 
@@ -274,7 +272,7 @@ ul.no-bullet {list-style: none}
 
 <span id="index-another"></span>
 
-</div><hr>
+<hr>
 <div class="subsection" id="subsection-1">
 <table class="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>
@@ -291,12 +289,11 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="index.html" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Subsection-1">
-<h3 class="subsection">1.1.1 Subsection 1</h3>
+<span id="Subsection-1"></span><h3 class="subsection">1.1.1 Subsection 1</h3>
 
 <p>In subsection 1
 </p>
-</div><hr>
+<hr>
 </div>
 <div class="subsection" id="subsection-2">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -314,8 +311,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="index.html" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Subsection-2">
-<h3 class="subsection">1.1.2 Subsection 2</h3>
+<span id="Subsection-2"></span><h3 class="subsection">1.1.2 Subsection 2</h3>
 
 <p>index in subsction 2
 </p>
@@ -390,7 +386,7 @@ ul.no-bullet {list-style: none}
 
 <span id="index-printindex-subsection-2"></span>
 
-</div><hr>
+<hr>
 </div>
 </div>
 <div class="section" id="section-2">
@@ -409,12 +405,11 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="index.html" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Section-2">
-<h2 class="section">1.2 Section 2</h2>
+<span id="Section-2"></span><h2 class="section">1.2 Section 2</h2>
 
 <p>Section 2
 </p>
-</div><hr>
+<hr>
 </div>
 <div class="section" id="section-3">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -432,8 +427,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="index.html" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Section-3">
-<h2 class="section">1.3 Section 3</h2>
+<span id="Section-3"></span><h2 class="section">1.3 Section 3</h2>
 
 <span id="index-section-3"></span>
 
@@ -504,13 +498,11 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><div class="node" id="node-in-section-3">
-
+<span id="node-in-section-3"></span>
 <span id="index-node-in-section-3"></span>
 <p>Text for the node in section 3
 </p>
-</div><div class="node" id="node-2-in-section-3">
-
+<span id="node-2-in-section-3"></span>
 <span id="index-node-2-in-section-3"></span>
 <p>Text for the node 2 in section 3
 </p>
@@ -652,11 +644,10 @@ ul.no-bullet {list-style: none}
 
 <span id="index-after-second-printindex-node-in-section-3"></span>
 
-</div><div class="node" id="node-3-in-section-3">
-
+<span id="node-3-in-section-3"></span>
 <span id="index-node-3-in-section-3"></span>
 
-</div><hr>
+<hr>
 <table class="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="second-chapter.html" title="Next 
chapter"> &gt;&gt; </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 8b2715d..f63684f 100644
--- a/tp/t/results/moreindices/index_split/res_html/index.html
+++ b/tp/t/results/moreindices/index_split/res_html/index.html
@@ -44,8 +44,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="split-indices">
-<h1 class="top">split indices</h1>
+<span id="split-indices"></span><h1 class="top">split indices</h1>
 <span id="index-entry-a"></span>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#split-indices_cp_symbol-1"><b>!</b></a>
@@ -221,7 +220,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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 b2acc59..27d04da 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
@@ -50,12 +50,11 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="index.html" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Second-chapter">
-<h1 class="chapter">2 Second chapter</h1>
+<span id="Second-chapter"></span><h1 class="chapter">2 Second chapter</h1>
 
 <p>Second chapter
 </p>
-</div><hr>
+<hr>
 <table class="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">[ &gt;&gt; ]</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 7a461ba..4e21b87 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
@@ -155,8 +155,7 @@ ul.no-bullet {list-style: none}
 
 <span id="index-entry-after-printindex"></span>
 
-<div class="node" id="First-chapter">
-<h1 class="chapter">1 First chapter</h1>
+<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
 <span id="index-a-function"></span>
 <span id="index-a-concept-in-first"></span>
 <span id="index-somewhere"></span>
@@ -176,7 +175,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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 85912c1..7b72d2e 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
@@ -45,8 +45,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="split-indices">
-<h1 class="top">split indices</h1>
+<span id="split-indices"></span><h1 class="top">split indices</h1>
 <span id="index-entry-a"></span>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#Top_cp_symbol-1"><b>!</b></a>
@@ -222,7 +221,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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 0f25ca1..1231c95 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
@@ -34,8 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="node-2-in-section-3">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="node-2-in-section-3"></span><table class="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>
@@ -194,7 +193,7 @@ ul.no-bullet {list-style: none}
 
 <span id="index-after-second-printindex-node-in-section-3"></span>
 
-</div><hr>
+<hr>
 <table class="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>
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 5a1cc19..f7bda3b 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
@@ -34,8 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="node-3-in-section-3">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="node-3-in-section-3"></span><table class="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>
@@ -55,7 +54,7 @@ ul.no-bullet {list-style: none}
 
 <span id="index-node-3-in-section-3"></span>
 
-</div><hr>
+<hr>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
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 3ecf577..c635872 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
@@ -34,8 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="node-in-section-3">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="node-in-section-3"></span><table class="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>
@@ -56,7 +55,7 @@ ul.no-bullet {list-style: none}
 <span id="index-node-in-section-3"></span>
 <p>Text for the node in section 3
 </p>
-</div><hr>
+<hr>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
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 f372619..82197eb 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
@@ -51,12 +51,11 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="Second-chapter">
-<h1 class="chapter">2 Second chapter</h1>
+<span id="Second-chapter"></span><h1 class="chapter">2 Second chapter</h1>
 
 <p>Second chapter
 </p>
-</div><hr>
+<hr>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 471e4a6..f5c5b9f 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
@@ -51,8 +51,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="Section-1">
-<h2 class="section">1.1 Section 1</h2>
+<span id="Section-1"></span><h2 class="section">1.1 Section 1</h2>
 
 <span id="index-something"></span>
 
@@ -133,7 +132,7 @@ ul.no-bullet {list-style: none}
 
 <span id="index-another"></span>
 
-</div><hr>
+<hr>
 <table class="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 59c82b0..636f699 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
@@ -51,12 +51,11 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="Section-2">
-<h2 class="section">1.2 Section 2</h2>
+<span id="Section-2"></span><h2 class="section">1.2 Section 2</h2>
 
 <p>Section 2
 </p>
-</div><hr>
+<hr>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 565db04..638cf6e 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
@@ -51,8 +51,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="Section-3">
-<h2 class="section">1.3 Section 3</h2>
+<span id="Section-3"></span><h2 class="section">1.3 Section 3</h2>
 
 <span id="index-section-3"></span>
 
@@ -123,7 +122,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
+<hr>
 <table class="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 9346de1..9dab982 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
@@ -51,12 +51,11 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="Subsection-1">
-<h3 class="subsection">1.1.1 Subsection 1</h3>
+<span id="Subsection-1"></span><h3 class="subsection">1.1.1 Subsection 1</h3>
 
 <p>In subsection 1
 </p>
-</div><hr>
+<hr>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 7dcb342..ac336aa 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
@@ -51,8 +51,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="Subsection-2">
-<h3 class="subsection">1.1.2 Subsection 2</h3>
+<span id="Subsection-2"></span><h3 class="subsection">1.1.2 Subsection 2</h3>
 
 <p>index in subsction 2
 </p>
@@ -127,7 +126,7 @@ ul.no-bullet {list-style: none}
 
 <span id="index-printindex-subsection-2"></span>
 
-</div><hr>
+<hr>
 <table class="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 4fbfa5d..b990e65 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
@@ -36,8 +36,7 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<div class="node" id="first-before-top">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="first-before-top"></span><table class="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>
@@ -120,9 +119,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
-<div class="node" id="node-in-menu-before-top">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr>
+<span id="node-in-menu-before-top"></span><table class="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>
@@ -205,9 +203,8 @@ ul.no-bullet {list-style: none}
 <span id="index-printindex-node-in-menu-before-top"></span>
 
 
-</div><hr size="6">
-<div class="node" id="first">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr size="6">
+<span id="first"></span><table class="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>
@@ -294,9 +291,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
-<div class="node" id="second">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr>
+<span id="second"></span><table class="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>
@@ -347,9 +343,8 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
-<div class="node" id="another">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr>
+<span id="another"></span><table class="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>
@@ -370,9 +365,8 @@ ul.no-bullet {list-style: none}
 <span id="index-somewhere"></span>
 <span id="index-another"></span>
 
-</div><hr>
-<div class="node" id="a-node">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr>
+<span id="a-node"></span><table class="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>
@@ -515,7 +509,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
+<hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
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 2f57bb2..b140b58 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
@@ -34,8 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="Top"></span><table class="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>
@@ -203,7 +202,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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>
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 1299872..2f14ff0 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
@@ -36,8 +36,7 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<div class="node" id="first-before-top">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="first-before-top"></span><table class="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>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -191,8 +190,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><div class="node" id="node-in-menu-before-top">
-
+<span id="node-in-menu-before-top"></span>
 <span id="index-node-in-menu-before-top"></span>
 <p>between node in menu before top and printindex
 </p><table><tr><th valign="top">Jump to: &nbsp; </th><td><a 
class="summary-letter" href="#top-section_cp_symbol-1"><b>!</b></a>
@@ -268,7 +266,7 @@ ul.no-bullet {list-style: none}
 <span id="index-printindex-node-in-menu-before-top"></span>
 
 
-</div><div class="top" id="Top">
+<div class="top" id="Top">
 <span id="index-entry-a"></span>
 <p>in top node.
 </p><table><tr><th valign="top">Jump to: &nbsp; </th><td><a 
class="summary-letter" href="#top-section_cp_symbol-1"><b>!</b></a>
@@ -439,8 +437,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<div class="node" id="top-section">
-<h1 class="top">top section</h1>
+<span id="top-section"></span><h1 class="top">top section</h1>
 <span id="index-top-section"></span>
 
 <p>in top section
@@ -454,8 +451,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><div class="node" id="first">
-<p>Text and then index entries
+<span id="first"></span><p>Text and then index entries
 <span id="index-_0021-entry-in-node"></span>
 <span id="index-fun-in-node"></span>
 <span id="index-entry-in-node"></span>
@@ -534,8 +530,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><div class="node" id="second">
-<table class="menu" border="0" cellspacing="0">
+<span id="second"></span><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>
 <tr><td align="left" valign="top">&bull; <a 
href="#another">another</a></td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top">
@@ -570,14 +565,12 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><div class="node" id="another">
-
+<span id="another"></span>
 <span id="index-something"></span>
 <span id="index-somewhere"></span>
 <span id="index-another"></span>
 
-</div><div class="node" id="a-node">
-<span id="index-entry-after-printindex"></span>
+<span id="a-node"></span><span id="index-entry-after-printindex"></span>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#top-section_cp_symbol-1"><b>!</b></a>
  &nbsp; 
@@ -720,7 +713,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -737,8 +730,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="A-chapter">
-<h1 class="chapter">1 A chapter</h1>
+<span id="A-chapter"></span><h1 class="chapter">1 A chapter</h1>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#A-chapter_cp_symbol-1"><b>!</b></a>
  &nbsp; 
@@ -809,11 +801,10 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><div class="node" id="node-in-chapter">
-
+<span id="node-in-chapter"></span>
 <span id="index-node-in-chapter"></span>
 
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="About_element" id="SEC_About">
diff --git 
a/tp/t/results/moreindices/nodes_before_top_no_nodes/res_html/index.html 
b/tp/t/results/moreindices/nodes_before_top_no_nodes/res_html/index.html
index a20b7c2..fb4adaf 100644
--- a/tp/t/results/moreindices/nodes_before_top_no_nodes/res_html/index.html
+++ b/tp/t/results/moreindices/nodes_before_top_no_nodes/res_html/index.html
@@ -36,8 +36,7 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<div class="node" id="first-before-top">
-<span id="index-first-before-top"></span>
+<span id="first-before-top"></span><span id="index-first-before-top"></span>
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#t_h_cp_symbol-1"><b>!</b></a>
  &nbsp; 
 <br>
@@ -104,8 +103,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><div class="node" id="node-in-menu-before-top">
-
+<span id="node-in-menu-before-top"></span>
 <span id="index-node-in-menu-before-top"></span>
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#t_h_cp_symbol-1"><b>!</b></a>
  &nbsp; 
@@ -172,8 +170,7 @@ ul.no-bullet {list-style: none}
 <span id="index-printindex-node-in-menu-before-top"></span>
 
 
-</div><div class="node" id="Top">
-<span id="index-entry-a"></span>
+<span id="Top"></span><span id="index-entry-a"></span>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#t_h_cp_symbol-1"><b>!</b></a>
  &nbsp; 
@@ -332,8 +329,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><div class="node" id="first">
-<p>Text and then index entries
+<span id="first"></span><p>Text and then index entries
 <span id="index-_0021-entry-in-node"></span>
 <span id="index-fun-in-node"></span>
 <span id="index-entry-in-node"></span>
@@ -404,8 +400,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><div class="node" id="second">
-<table class="menu" border="0" cellspacing="0">
+<span id="second"></span><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>
 <tr><td align="left" valign="top">&bull; <a 
href="#another">another</a></td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top">
@@ -440,14 +435,12 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><div class="node" id="another">
-
+<span id="another"></span>
 <span id="index-something"></span>
 <span id="index-somewhere"></span>
 <span id="index-another"></span>
 
-</div><div class="node" id="a-node">
-<span id="index-entry-after-printindex"></span>
+<span id="a-node"></span><span id="index-entry-after-printindex"></span>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#t_h_cp_symbol-1"><b>!</b></a>
  &nbsp; 
@@ -574,7 +567,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr></div>
+<hr></div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
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 b614cc3..489a6d2 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
@@ -34,8 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="a-node">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="a-node"></span><table class="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>
@@ -179,7 +178,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
+<hr>
 <table class="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>
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 5a08b20..79b3fef 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
@@ -34,8 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="another">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="another"></span><table class="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>
@@ -57,7 +56,7 @@ ul.no-bullet {list-style: none}
 <span id="index-somewhere"></span>
 <span id="index-another"></span>
 
-</div><hr>
+<hr>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
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 71291d3..7ef6938 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
@@ -36,8 +36,7 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<div class="node" id="first-before-top">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="first-before-top"></span><table class="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>
@@ -121,7 +120,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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/nodes_before_top_nodes/res_html/first.html 
b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first.html
index d63ed8a..8c421fd 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
@@ -34,8 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="first">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="first"></span><table class="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>
@@ -123,7 +122,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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>
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 2a3f11d..753aa74 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
@@ -34,8 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="Top"></span><table class="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>
@@ -204,7 +203,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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>
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 98958c8..49f26d9 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
@@ -34,8 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="node-in-menu-before-top">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="node-in-menu-before-top"></span><table class="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>
@@ -119,7 +118,7 @@ ul.no-bullet {list-style: none}
 <span id="index-printindex-node-in-menu-before-top"></span>
 
 
-</div><hr>
+<hr>
 <table class="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>
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 c37cbd0..9ff909f 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
@@ -34,8 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="second">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="second"></span><table class="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>
@@ -87,7 +86,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
+<hr>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
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 4c53c7b..5c32672 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
@@ -50,8 +50,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="#first" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a 
href="split_chapter_index_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="First-chapter">
-<h1 class="chapter">1 First chapter</h1>
+<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
 
 <p>Text and then index entries
 <span id="index-entry-in-node"></span>
@@ -118,7 +117,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="section" id="section-1">
 <table class="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>
@@ -135,8 +134,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="#first" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a 
href="split_chapter_index_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Section-1">
-<h2 class="section">1.1 Section 1</h2>
+<span id="Section-1"></span><h2 class="section">1.1 Section 1</h2>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#subsection-1">1.1.1 Subsection 
1</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
@@ -147,7 +145,7 @@ ul.no-bullet {list-style: none}
 
 <span id="index-another"></span>
 
-</div><hr>
+<hr>
 <div class="subsection" id="subsection-1">
 <table class="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>
@@ -164,14 +162,13 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="#first" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a 
href="split_chapter_index_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Subsection-1">
-<h3 class="subsection">1.1.1 Subsection 1</h3>
+<span id="Subsection-1"></span><h3 class="subsection">1.1.1 Subsection 1</h3>
 
 <p>In subsection 1
 </p>
 <span id="index-printindex-subsection-2"></span>
 
-</div><hr>
+<hr>
 <table class="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">[ &gt;&gt; ]</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 bc9f7a1..eb92078 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
@@ -44,8 +44,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="first.html#first" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a 
href="split_chapter_index_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="split-indices">
-<h1 class="top">split indices</h1>
+<span id="split-indices"></span><h1 class="top">split indices</h1>
 <span id="index-entry-a"></span>
 
 <p>Text in top.
@@ -56,7 +55,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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 e4213fe..7c53d33 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
@@ -35,8 +35,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="node" id="before-top">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="before-top"></span><table class="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>
@@ -53,9 +52,8 @@ ul.no-bullet {list-style: none}
 </tr></table>
 <h3 class="node-heading">before top</h3>
 
-</div><hr size="6">
-<div class="node" id="Top">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr size="6">
+<span id="Top"></span><table class="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>
@@ -72,9 +70,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
-<div class="node" id="node">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr size="6">
+<span id="node"></span><table class="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>
@@ -102,7 +99,7 @@ ul.no-bullet {list-style: none}
 </p>
 <p>Ref to @samp{node} <a href="#node">node</a>.
 </p>
-</div><hr size="6">
+<hr size="6">
 <div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Cover (top) of 
document">Top</a>]</td>
diff --git 
a/tp/t/results/moresectioning/equivalent_nodes_no_node/res_html/equivalent_nodes.html
 
b/tp/t/results/moresectioning/equivalent_nodes_no_node/res_html/equivalent_nodes.html
index 7fa0b6b..8c77f3c 100644
--- 
a/tp/t/results/moresectioning/equivalent_nodes_no_node/res_html/equivalent_nodes.html
+++ 
b/tp/t/results/moresectioning/equivalent_nodes_no_node/res_html/equivalent_nodes.html
@@ -35,10 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="node" id="before-top">
-
-</div><div class="node" id="Top">
-
+<span id="before-top"></span>
+<span id="Top"></span>
 <p>Equivalent nodes in node line and in menu.
 </p>
 <table class="menu" border="0" cellspacing="0">
@@ -46,8 +44,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><div class="node" id="node">
-
+<span id="node"></span>
 <div class="float">
 <p>A figure
 </p><div class="float-caption"><p><strong>Figure
@@ -59,7 +56,7 @@ ul.no-bullet {list-style: none}
 </p>
 <p>Ref to @samp{node} <a href="#node">node</a>.
 </p>
-</div><hr></div>
+<hr></div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
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 1141944..1e3285d 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
@@ -44,8 +44,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#n-c2">2 
c2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
@@ -56,9 +55,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
-<div class="chapter" id="c1">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr size="6">
+<span id="c1"></span><table class="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>
@@ -75,7 +73,7 @@ ul.no-bullet {list-style: none}
 </tr></table>
 <h1 class="chapter">1 c1</h1>
 
-</div><hr>
+<hr>
 <div class="chapter" id="n-c2">
 <table class="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>
@@ -92,12 +90,10 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="c2">
-<h1 class="chapter">2 c2</h1>
+<span id="c2"></span><h1 class="chapter">2 c2</h1>
 
-</div><hr>
-<div class="section" id="s1">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr>
+<span id="s1"></span><table class="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>
 <td valign="middle" align="left">[<a href="#n-c2" title="Up section"> Up 
</a>]</td>
@@ -114,7 +110,7 @@ ul.no-bullet {list-style: none}
 </tr></table>
 <h2 class="section">2.1 s1</h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="n-c3">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -132,17 +128,15 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="c3">
-<h1 class="chapter">3 c3</h1>
+<span id="c3"></span><h1 class="chapter">3 c3</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#n-c3-s-2">3.2 c3 
s2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div><hr>
-<div class="section" id="C3-s1">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr>
+<span id="C3-s1"></span><table class="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>
 <td valign="middle" align="left">[<a href="#n-c3" title="Up section"> Up 
</a>]</td>
@@ -159,7 +153,7 @@ ul.no-bullet {list-style: none}
 </tr></table>
 <h2 class="section">3.1 C3 s1</h2>
 
-</div><hr>
+<hr>
 <div class="section" id="n-c3-s-2">
 <table class="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>
@@ -176,12 +170,10 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="c3-s2">
-<h2 class="section">3.2 c3 s2</h2>
+<span id="c3-s2"></span><h2 class="section">3.2 c3 s2</h2>
 
-</div><hr>
-<div class="section" id="c3-s3">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr>
+<span id="c3-s3"></span><table class="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>
 <td valign="middle" align="left">[<a href="#n-c3" title="Up section"> Up 
</a>]</td>
@@ -198,9 +190,8 @@ ul.no-bullet {list-style: none}
 </tr></table>
 <h2 class="section">3.3 c3 s3</h2>
 
-</div><hr>
-<div class="chapter" id="c4">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr>
+<span id="c4"></span><table class="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>
 <td valign="middle" align="left">[<a href="#Top" title="Up section"> Up 
</a>]</td>
@@ -217,9 +208,8 @@ ul.no-bullet {list-style: none}
 </tr></table>
 <h1 class="chapter">4 c4</h1>
 
-</div><hr>
-<div class="section" id="c3-s1">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr>
+<span id="c3-s1"></span><table class="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>
 <td valign="middle" align="left">[<a href="#c4" title="Up section"> Up 
</a>]</td>
@@ -236,9 +226,8 @@ ul.no-bullet {list-style: none}
 </tr></table>
 <h2 class="section">4.1 c3 s1</h2>
 
-</div><hr>
-<div class="subsection" id="c3-s1-s1">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr>
+<span id="c3-s1-s1"></span><table class="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>
 <td valign="middle" align="left">[<a href="#c3-s1" title="Up section"> Up 
</a>]</td>
@@ -255,7 +244,7 @@ ul.no-bullet {list-style: none}
 </tr></table>
 <h3 class="subsection">4.1.1 c3 s1 s1</h3>
 
-</div><hr>
+<hr>
 <div class="subsection" id="n-c3-s1-s2">
 <table class="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>
@@ -272,12 +261,10 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="c3-s1-s2">
-<h3 class="subsection">4.1.2 c3 s1 s2</h3>
+<span id="c3-s1-s2"></span><h3 class="subsection">4.1.2 c3 s1 s2</h3>
 
-</div><hr>
-<div class="appendix" id="appendix">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr>
+<span id="appendix"></span><table class="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>
 <td valign="middle" align="left">[<a href="#Top" title="Up section"> Up 
</a>]</td>
@@ -294,7 +281,7 @@ ul.no-bullet {list-style: none}
 </tr></table>
 <h1 class="appendix">Appendix A appendix</h1>
 
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 </div>
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 2a0398a..437330b 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
@@ -35,8 +35,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="node" id="Top">
-
+<span id="Top"></span>
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a 
href="#g_t_00e1">&aacute;</a></td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top">
 </td></tr>
@@ -48,31 +47,27 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><div class="node" id="g_t_00e1">
-
+<span id="g_t_00e1"></span>
 <p>node &aacute;,
 Footnote 1<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>.
 </p>
-</div><div class="node" id="g_t_00e2">
-
+<span id="g_t_00e2"></span>
 <p>node &acirc;,
 Footnote 2<a id="DOCF2" href="#FOOT2"><sup>2</sup></a>.
 </p>
-</div><div class="chapter" id="chapter">
-<div class="node" id="chapter-1">
-<h1 class="chapter">1 chapter</h1>
+<div class="chapter" id="chapter">
+<span id="chapter-1"></span><h1 class="chapter">1 chapter</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a 
href="#g_t_00e0">&agrave;</a></td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top">
 </td></tr>
 </table>
 
-</div><div class="node" id="g_t_00e0">
-
+<span id="g_t_00e0"></span>
 <p>node &agrave;,
 Footnote 3<a id="DOCF3" href="#FOOT3"><sup>3</sup></a>.
 </p>
-</div><div class="footnote">
+<div class="footnote">
 <hr>
 <h3 class="footnotes-heading">Footnotes</h3>
 
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 2a0398a..437330b 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
@@ -35,8 +35,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="node" id="Top">
-
+<span id="Top"></span>
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a 
href="#g_t_00e1">&aacute;</a></td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top">
 </td></tr>
@@ -48,31 +47,27 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><div class="node" id="g_t_00e1">
-
+<span id="g_t_00e1"></span>
 <p>node &aacute;,
 Footnote 1<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>.
 </p>
-</div><div class="node" id="g_t_00e2">
-
+<span id="g_t_00e2"></span>
 <p>node &acirc;,
 Footnote 2<a id="DOCF2" href="#FOOT2"><sup>2</sup></a>.
 </p>
-</div><div class="chapter" id="chapter">
-<div class="node" id="chapter-1">
-<h1 class="chapter">1 chapter</h1>
+<div class="chapter" id="chapter">
+<span id="chapter-1"></span><h1 class="chapter">1 chapter</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a 
href="#g_t_00e0">&agrave;</a></td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top">
 </td></tr>
 </table>
 
-</div><div class="node" id="g_t_00e0">
-
+<span id="g_t_00e0"></span>
 <p>node &agrave;,
 Footnote 3<a id="DOCF3" href="#FOOT3"><sup>3</sup></a>.
 </p>
-</div><div class="footnote">
+<div class="footnote">
 <hr>
 <h3 class="footnotes-heading">Footnotes</h3>
 
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 4df5a83..cd18057 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
@@ -34,8 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="g_t_00e1">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="g_t_00e1"></span><table class="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>
@@ -56,9 +55,8 @@ ul.no-bullet {list-style: none}
 <p>node &aacute;,
 Footnote 1<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>.
 </p>
-</div><hr>
-<div class="node" id="g_t_00e2">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr>
+<span id="g_t_00e2"></span><table class="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>
@@ -78,7 +76,7 @@ Footnote 1<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>.
 <p>node &acirc;,
 Footnote 2<a id="DOCF2" href="#FOOT2"><sup>2</sup></a>.
 </p>
-</div><div class="footnote">
+<div class="footnote">
 <hr>
 <h3 class="footnotes-heading">Footnotes</h3>
 
@@ -88,8 +86,7 @@ Footnote 2<a id="DOCF2" href="#FOOT2"><sup>2</sup></a>.
 <p>foot 2 &acirc;</p>
 </div>
 <hr>
-<div class="node" id="g_t_00e0">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="g_t_00e0"></span><table class="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>
@@ -109,7 +106,7 @@ Footnote 2<a id="DOCF2" href="#FOOT2"><sup>2</sup></a>.
 <p>node &agrave;,
 Footnote 3<a id="DOCF3" href="#FOOT3"><sup>3</sup></a>.
 </p>
-</div><div class="footnote">
+<div class="footnote">
 <hr>
 <h3 class="footnotes-heading">Footnotes</h3>
 
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 f412100..b41c305 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
@@ -51,15 +51,14 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="node_footnote_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="chapter-1">
-<h1 class="chapter">1 chapter</h1>
+<span id="chapter-1"></span><h1 class="chapter">1 chapter</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a 
href="a.html#g_t_00e0">&agrave;</a></td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top">
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 8532094..55baf8a 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
@@ -35,8 +35,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="node" id="Top">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="Top"></span><table class="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>
@@ -58,7 +57,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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>
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 5bdc2cd..b66e4d1 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
@@ -36,8 +36,7 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<div class="node" id="Top">
-<p>Top node
+<span id="Top"></span><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">
 </td></tr>
@@ -45,16 +44,14 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><div class="node" id="second-node">
-
+<span id="second-node"></span>
 <p>second node
 </p>
-</div><div class="chapter" id="third-node">
-<div class="node" id="chapter">
-<h1 class="chapter">1 chapter</h1>
+<div class="chapter" id="third-node">
+<span id="chapter"></span><h1 class="chapter">1 chapter</h1>
 
 
-</div><hr></div>
+<hr></div>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 6e9a1f4..6e17c81 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
@@ -36,8 +36,7 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<div class="node" id="Top">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="Top"></span><table class="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>
@@ -54,9 +53,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
-<div class="node" id="second-node">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr size="6">
+<span id="second-node"></span><table class="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>
@@ -75,7 +73,7 @@ ul.no-bullet {list-style: none}
 
 <p>second node
 </p>
-</div><hr>
+<hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
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 d26fcd5..d927a53 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
@@ -50,11 +50,10 @@ ul.no-bullet {list-style: none}
 <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>
-<div class="node" id="chapter">
-<h1 class="chapter">1 chapter</h1>
+<span id="chapter"></span><h1 class="chapter">1 chapter</h1>
 
 
-</div><hr>
+<hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</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 fce843f..c62acdd 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
@@ -36,8 +36,7 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<div class="node" id="Top">
-<p>Top node
+<span id="Top"></span><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">
 </td></tr>
@@ -45,16 +44,14 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><div class="node" id="second-node">
-
+<span id="second-node"></span>
 <p>second node
 </p>
-</div><div class="subsection" id="third-node">
-<div class="node" id="subsection">
-<h3 class="subsection">1 subsection</h3>
+<div class="subsection" id="third-node">
+<span id="subsection"></span><h3 class="subsection">1 subsection</h3>
 
 
-</div><hr></div>
+<hr></div>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 bec88d5..b61cc0a 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
@@ -36,8 +36,7 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<div class="node" id="Top">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="Top"></span><table class="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>
@@ -54,9 +53,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
-<div class="node" id="second-node">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr size="6">
+<span id="second-node"></span><table class="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>
@@ -75,7 +73,7 @@ ul.no-bullet {list-style: none}
 
 <p>second node
 </p>
-</div><hr>
+<hr>
 <div class="subsection" id="third-node">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
@@ -92,11 +90,10 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="subsection">
-<h3 class="subsection">1 subsection</h3>
+<span id="subsection"></span><h3 class="subsection">1 subsection</h3>
 
 
-</div><hr size="6">
+<hr size="6">
 </div>
 <div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
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 b26c588..457c21b 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
@@ -36,8 +36,7 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<div class="node" id="Top">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="Top"></span><table class="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>
@@ -54,9 +53,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
-<div class="node" id="second-node">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr size="6">
+<span id="second-node"></span><table class="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>
@@ -75,7 +73,7 @@ ul.no-bullet {list-style: none}
 
 <p>second node
 </p>
-</div><hr>
+<hr>
 <div class="subsection" id="third-node">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
@@ -92,11 +90,10 @@ ul.no-bullet {list-style: none}
 <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>
-<div class="node" id="subsection">
-<h3 class="subsection">1 subsection</h3>
+<span id="subsection"></span><h3 class="subsection">1 subsection</h3>
 
 
-</div><hr>
+<hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</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 474aee9..39011bc 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
@@ -61,8 +61,7 @@ ul.no-bullet {list-style: none}
 
 <span id="index-index-entry"></span>
 
-<div class="section" id="section">
-<h2 class="section">1 section</h2>
+<span id="section"></span><h2 class="section">1 section</h2>
 
 <p>Ref to anchor
 <a href="#An-anchor">An anchor</a>
@@ -70,7 +69,7 @@ ul.no-bullet {list-style: none}
 <p>Ref to footnote anchor
 <a href="#Anchor-in-footnote">Anchor in footnote</a>
 </p>
-</div><div class="footnote">
+<div class="footnote">
 <hr>
 <h3 class="footnotes-heading">Footnotes</h3>
 
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 030b21e..8ccaafe 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
@@ -50,8 +50,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="first-node-chapter">
-<h1 class="chapter">1 first node chapter</h1>
+<span id="first-node-chapter"></span><h1 class="chapter">1 first node 
chapter</h1>
 
 <p>first node chapter text
 </p><table class="menu" border="0" cellspacing="0">
@@ -65,7 +64,7 @@ ul.no-bullet {list-style: none}
 
 </pre></th></tr></table>
 
-</div><hr>
+<hr>
 <div class="unnumberedsec" id="unnumbered">
 <table class="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>
@@ -82,8 +81,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="unnumbered-section">
-<h2 class="unnumberedsec">unnumbered section</h2>
+<span id="unnumbered-section"></span><h2 class="unnumberedsec">unnumbered 
section</h2>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#unnumbered-sub">unnumbered 
subsection</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">un
@@ -96,7 +94,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="unnumberedsubsec" id="unnumbered-sub">
 <table class="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>
@@ -113,10 +111,9 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="unnumbered-subsection">
-<h3 class="unnumberedsubsec">unnumbered subsection</h3>
+<span id="unnumbered-subsection"></span><h3 
class="unnumberedsubsec">unnumbered subsection</h3>
 
-</div><hr>
+<hr>
 </div>
 <div class="subsection" id="numbered-sub">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -134,10 +131,9 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="numbered-subsection">
-<h3 class="subsection">numbered subsection</h3>
+<span id="numbered-subsection"></span><h3 class="subsection">numbered 
subsection</h3>
 
-</div><hr>
+<hr>
 </div>
 <div class="unnumberedsubsec" id="unnumbered-sub2">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -155,10 +151,9 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="unnumbered-subsection2">
-<h3 class="unnumberedsubsec">unnumbered subsection2</h3>
+<span id="unnumbered-subsection2"></span><h3 
class="unnumberedsubsec">unnumbered subsection2</h3>
 
-</div><hr>
+<hr>
 </div>
 <div class="subsection" id="numbered-sub2">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -176,10 +171,9 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="numbered-subsection2">
-<h3 class="subsection">numbered subsection2</h3>
+<span id="numbered-subsection2"></span><h3 class="subsection">numbered 
subsection2</h3>
 
-</div><hr>
+<hr>
 </div>
 </div>
 <div class="unnumberedsec" id="unnumbered2">
@@ -198,15 +192,14 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="unnumbered-section2">
-<h2 class="unnumberedsec">unnumbered section2</h2>
+<span id="unnumbered-section2"></span><h2 class="unnumberedsec">unnumbered 
section2</h2>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#numbered-sub3">numbered 
subsection3</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="subsection" id="numbered-sub3">
 <table class="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>
@@ -223,11 +216,10 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="numbered-subsection3">
-<h3 class="subsection">numbered subsection3</h3>
+<span id="numbered-subsection3"></span><h3 class="subsection">numbered 
subsection3</h3>
 
 
-</div><hr>
+<hr>
 </div>
 </div>
 <div class="section" id="numbered">
@@ -246,14 +238,12 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="numbered-section">
-<h2 class="section">1.1 numbered section</h2>
-
-</div><div class="node" id="between-node">
+<span id="numbered-section"></span><h2 class="section">1.1 numbered 
section</h2>
 
+<span id="between-node"></span>
 <p>between node, node without sectioning node
 </p>
-</div><hr>
+<hr>
 <table class="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="Second-node.html" title="Next 
chapter"> &gt;&gt; </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 44297db..37d62e1 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
@@ -53,12 +53,11 @@ ul.no-bullet {list-style: none}
 
 <p>Second node text
 </p>
-<div class="node" id="second-node-chapter">
-<h1 class="chapter">2 second node chapter</h1>
+<span id="second-node-chapter"></span><h1 class="chapter">2 second node 
chapter</h1>
 
 <p>second node chapter text.
 </p>
-</div><hr>
+<hr>
 <table class="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="Third-node-unnumbered.html" 
title="Next chapter"> &gt;&gt; </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 3665479..3e2cc3e 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
@@ -50,15 +50,13 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="unnumbered-chapter">
-<h1 class="unnumbered">unnumbered chapter</h1>
+<span id="unnumbered-chapter"></span><h1 class="unnumbered">unnumbered 
chapter</h1>
 
 <p>unnumbered chapter text.
 </p>
 
-</div><div class="node" id="Last-node-no-description">
-
-</div><hr>
+<span id="Last-node-no-description"></span>
+<hr>
 <table class="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">[ &gt;&gt; ]</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 edba441..7c2083b 100644
--- a/tp/t/results/moresectioning/sectioning_frames/res_html/index.html
+++ b/tp/t/results/moresectioning/sectioning_frames/res_html/index.html
@@ -43,8 +43,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="SEC_Top">
-<table class="menu" border="0" cellspacing="0">
+<span id="SEC_Top"></span><table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="First-node.html#First-node">1 first 
node chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">node 1
   explaination no heading ?
 * and here ?
@@ -77,7 +76,7 @@ description here
 
 </pre></th></tr></table>
 
-</div><hr>
+<hr>
 <table class="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 e6ea545..790318d 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
@@ -45,8 +45,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="The-top">
-<h1 class="top">The top</h1>
+<span id="The-top"></span><h1 class="top">The top</h1>
 
 <p>Just a top node.
 </p>
@@ -55,7 +54,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="Chap">
 <table class="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>
@@ -72,12 +71,11 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="A-chapter">
-<h1 class="chapter">1 A chapter</h1>
+<span id="A-chapter"></span><h1 class="chapter">1 A chapter</h1>
 
 <p>Without the chapter, no up node from top is generated.
 </p>
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="About_element" id="SEC_About">
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 e6ea545..790318d 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
@@ -45,8 +45,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="The-top">
-<h1 class="top">The top</h1>
+<span id="The-top"></span><h1 class="top">The top</h1>
 
 <p>Just a top node.
 </p>
@@ -55,7 +54,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="Chap">
 <table class="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>
@@ -72,12 +71,11 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="A-chapter">
-<h1 class="chapter">1 A chapter</h1>
+<span id="A-chapter"></span><h1 class="chapter">1 A chapter</h1>
 
 <p>Without the chapter, no up node from top is generated.
 </p>
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="About_element" id="SEC_About">
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 d592367..5a799d2 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
@@ -44,8 +44,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="g_t2-footnotes-in-2-nodes">
-<h1 class="top">2 footnotes in 2 nodes</h1>
+<span id="g_t2-footnotes-in-2-nodes"></span><h1 class="top">2 footnotes in 2 
nodes</h1>
 
 <p>A<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
@@ -56,7 +55,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -73,14 +72,13 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="chapter-1">
-<h1 class="chapter">1 chapter</h1>
+<span id="chapter-1"></span><h1 class="chapter">1 chapter</h1>
 
 <p>C<a id="DOCF3" href="#FOOT3"><sup>3</sup></a>
 </p>
 <p>D<a id="DOCF4" href="#FOOT4"><sup>4</sup></a>
 </p>
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="Footnotes_element" id="SEC_Foot">
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 d592367..5a799d2 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
@@ -44,8 +44,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="g_t2-footnotes-in-2-nodes">
-<h1 class="top">2 footnotes in 2 nodes</h1>
+<span id="g_t2-footnotes-in-2-nodes"></span><h1 class="top">2 footnotes in 2 
nodes</h1>
 
 <p>A<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
@@ -56,7 +55,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -73,14 +72,13 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="chapter-1">
-<h1 class="chapter">1 chapter</h1>
+<span id="chapter-1"></span><h1 class="chapter">1 chapter</h1>
 
 <p>C<a id="DOCF3" href="#FOOT3"><sup>3</sup></a>
 </p>
 <p>D<a id="DOCF4" href="#FOOT4"><sup>4</sup></a>
 </p>
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="Footnotes_element" id="SEC_Foot">
diff --git a/tp/t/results/regions/anchor_in_copying.pl 
b/tp/t/results/regions/anchor_in_copying.pl
index 3eda7ed..d945878 100644
--- a/tp/t/results/regions/anchor_in_copying.pl
+++ b/tp/t/results/regions/anchor_in_copying.pl
@@ -459,8 +459,7 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 
 
 <p>Copying.
@@ -472,7 +471,7 @@ ul.no-bullet {list-style: none}
 
 <p>See <a href="#Copying-information">Copying information</a>.
 </p>
-</div><hr></div>
+<hr></div>
 
 
 
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 702bbf1..4575632 100644
--- a/tp/t/results/regions/anchor_in_copying_in_footnote.pl
+++ b/tp/t/results/regions/anchor_in_copying_in_footnote.pl
@@ -505,8 +505,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 
 
 <p>Copying<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>.
@@ -518,7 +517,7 @@ ul.no-bullet {list-style: none}
 
 <p>See <a href="#Copying-footnote">Copying footnote</a>.
 </p>
-</div><div class="footnote">
+<div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
diff --git a/tp/t/results/regions/anchor_in_titlepage.pl 
b/tp/t/results/regions/anchor_in_titlepage.pl
index 79fc822..a1d6e3f 100644
--- a/tp/t/results/regions/anchor_in_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage.pl
@@ -388,13 +388,11 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="top" id="top">
-<h1 class="top">top</h1>
-</div><div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="top"></span><h1 class="top">top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 
 <p>See <a href="#in-titlepage">in titlepage</a>.
-</p></div><hr></div>
+</p><hr></div>
 
 
 
diff --git a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl 
b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
index 80a002b..c2c51a7 100644
--- a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
@@ -390,13 +390,11 @@ ul.no-bullet {list-style: none}
 
 <span id="in-titlepage"></span><hr>
 
-<div class="top" id="top">
-<h1 class="top">top</h1>
-</div><div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="top"></span><h1 class="top">top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 
 <p>See <a href="#in-titlepage">in titlepage</a>.
-</p></div><hr></div>
+</p><hr></div>
 
 
 
diff --git a/tp/t/results/regions/format_in_titlepage.pl 
b/tp/t/results/regions/format_in_titlepage.pl
index 5eb3f7d..17aa2cb 100644
--- a/tp/t/results/regions/format_in_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage.pl
@@ -324,10 +324,9 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 
-</div><hr></div>
+<hr></div>
 
 
 
diff --git a/tp/t/results/regions/format_in_titlepage_titlepage.pl 
b/tp/t/results/regions/format_in_titlepage_titlepage.pl
index 688c09c..b06098c 100644
--- a/tp/t/results/regions/format_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage_titlepage.pl
@@ -330,10 +330,9 @@ ul.no-bullet {list-style: none}
 
 <hr>
 
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 
-</div><hr></div>
+<hr></div>
 
 
 
diff --git a/tp/t/results/regions/ref_in_copying.pl 
b/tp/t/results/regions/ref_in_copying.pl
index d49e72d..95c4c00 100644
--- a/tp/t/results/regions/ref_in_copying.pl
+++ b/tp/t/results/regions/ref_in_copying.pl
@@ -703,8 +703,7 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="#GFDL" accesskey="n" rel="next">GFDL</a> &nbsp; </p>
 </div>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <p><a href="#GFDL">GFDL</a>
 </p>
@@ -712,16 +711,15 @@ Next: <a href="#GFDL" accesskey="n" rel="next">GFDL</a> 
&nbsp; </p>
 <ul class="section-toc">
 <li><a href="#GFDL" accesskey="1">GFDL</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="chapter" id="GFDL">
 <div class="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 class="node" id="GFDL-1">
-<h2 class="chapter">1 GFDL</h2>
+<span id="GFDL-1"></span><h2 class="chapter">1 GFDL</h2>
 
-</div><hr>
+<hr>
 </div>
 </div>
 
diff --git a/tp/t/results/regions/today_in_copying.pl 
b/tp/t/results/regions/today_in_copying.pl
index 8f52d6a..3606348 100644
--- a/tp/t/results/regions/today_in_copying.pl
+++ b/tp/t/results/regions/today_in_copying.pl
@@ -356,11 +356,10 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 <div class="top" id="Top">
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <p>a sunny day.
-</p></div><hr></div>
+</p><hr></div>
 </div>
 
 
diff --git a/tp/t/results/sectioning/anchor_in_footnote.pl 
b/tp/t/results/sectioning/anchor_in_footnote.pl
index f05543b..ca5b204 100644
--- a/tp/t/results/sectioning/anchor_in_footnote.pl
+++ b/tp/t/results/sectioning/anchor_in_footnote.pl
@@ -708,8 +708,7 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">Chap</a> &nbsp; </p>
 </div>
-<div class="node" id="Top-1">
-<h1 class="top">Top</h1>
+<span id="Top-1"></span><h1 class="top">Top</h1>
 
 <p>In top node<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
@@ -717,17 +716,16 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">Chap</a> &nbsp; </p>
 <ul class="section-toc">
 <li><a href="#chapter" accesskey="1">Chap</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="chapter" id="chapter">
 <div class="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 class="node" id="Chap">
-<h2 class="chapter">1 Chap</h2>
+<span id="Chap"></span><h2 class="chapter">1 Chap</h2>
 
 <p><a href="#Anchor-in-footnote">Anchor in footnote</a>.
-</p></div><div class="footnote">
+</p><div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
diff --git a/tp/t/results/sectioning/anchor_in_footnote_separate.pl 
b/tp/t/results/sectioning/anchor_in_footnote_separate.pl
index dbc757c..0d1d49c 100644
--- a/tp/t/results/sectioning/anchor_in_footnote_separate.pl
+++ b/tp/t/results/sectioning/anchor_in_footnote_separate.pl
@@ -746,8 +746,7 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">Chap</a> &nbsp; </p>
 </div>
-<div class="node" id="Top-1">
-<h1 class="top">Top</h1>
+<span id="Top-1"></span><h1 class="top">Top</h1>
 
 <p>In top node<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
@@ -755,17 +754,16 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">Chap</a> &nbsp; </p>
 <ul class="section-toc">
 <li><a href="#chapter" accesskey="1">Chap</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="chapter" id="chapter">
 <div class="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 class="node" id="Chap">
-<h2 class="chapter">1 Chap</h2>
+<span id="Chap"></span><h2 class="chapter">1 Chap</h2>
 
 <p><a href="#Anchor-in-footnote">Anchor in footnote</a>.
-</p></div><hr>
+</p><hr>
 </div>
 </div>
 
diff --git a/tp/t/results/sectioning/anchor_zero.pl 
b/tp/t/results/sectioning/anchor_zero.pl
index 08dbb3e..fc1814e 100644
--- a/tp/t/results/sectioning/anchor_zero.pl
+++ b/tp/t/results/sectioning/anchor_zero.pl
@@ -270,13 +270,12 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 
 <span id="g_t0"></span><p>.
 </p>
 <p>See <a href="#g_t0">0</a>.
-</p></div><hr></div>
+</p><hr></div>
 
 
 
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 9976be1..cb67b33 100644
--- a/tp/t/results/sectioning/chapter_before_and_after_part.pl
+++ b/tp/t/results/sectioning/chapter_before_and_after_part.pl
@@ -371,18 +371,15 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
-<h2 class="chapter">1 chapter</h2>
+<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
 
-</div><div class="part" id="part">
-<h1 class="part">part</h1>
+<span id="part"></span><h1 class="part">part</h1>
 <hr>
 
 <ul class="section-toc">
 <li><a href="#chapter-2" accesskey="1">chapter 2</a></li>
 </ul>
-</div><div class="chapter" id="chapter-2">
-<h2 class="chapter">2 chapter 2</h2>
+<span id="chapter-2"></span><h2 class="chapter">2 chapter 2</h2>
 
 <div class="Contents_element" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
@@ -398,7 +395,7 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 </div>
-</div><hr></div>
+<hr></div>
 
 
 
diff --git a/tp/t/results/sectioning/chapter_before_part.pl 
b/tp/t/results/sectioning/chapter_before_part.pl
index 131e250..eb25b7f 100644
--- a/tp/t/results/sectioning/chapter_before_part.pl
+++ b/tp/t/results/sectioning/chapter_before_part.pl
@@ -263,13 +263,11 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="chapter" id="chapter">
-<h2 class="chapter">1 chapter</h2>
+<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
 
-</div><div class="part" id="part">
-<h1 class="part">part</h1>
+<span id="part"></span><h1 class="part">part</h1>
 <hr>
-</div><hr></div>
+<hr></div>
 
 
 
diff --git a/tp/t/results/sectioning/chapter_between_nodes.pl 
b/tp/t/results/sectioning/chapter_between_nodes.pl
index d37bb63..dbcef83 100644
--- a/tp/t/results/sectioning/chapter_between_nodes.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes.pl
@@ -742,27 +742,24 @@ ul.no-bullet {list-style: none}
 <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>
 </div>
-<div class="node" id="top-section">
-<h1 class="top">top section</h1>
+<span id="top-section"></span><h1 class="top">top section</h1>
 <p>Top node
 </p>
 
-</div><div class="chapter" id="Chapter">
-<h2 class="chapter">1 Chapter</h2>
+<span id="Chapter"></span><h2 class="chapter">1 Chapter</h2>
 
 <p>In chapter
 </p>
 <ul class="section-toc">
 <li><a href="#section-node" accesskey="1">section</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="section" id="section-node">
 <div class="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>
 </div>
-<div class="node" id="section">
-<h3 class="section">1.1 section</h3>
+<span id="section"></span><h3 class="section">1.1 section</h3>
 
 <p>section.
 </p>
@@ -779,7 +776,7 @@ Previous: <a href="#Top" accesskey="p" rel="prev">top 
section</a>, Up: <a href="
 </ul>
 </div>
 </div>
-</div><hr>
+<hr>
 </div>
 </div>
 
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 05abe91..c510284 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
@@ -669,13 +669,11 @@ ul.no-bullet {list-style: none}
 <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>
 </div>
-<div class="node" id="chapter">
-<h2 class="chapter">1 chapter</h2>
+<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
 
 
-</div><hr>
-<div class="part" id="part">
-<div class="header">
+<hr>
+<span id="part"></span><div class="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>
 </div>
@@ -685,10 +683,9 @@ Previous: <a href="#Top" accesskey="p" 
rel="prev">chapter</a>, Up: <a href="#Top
 <ul class="section-toc">
 <li><a href="#after" accesskey="1">chapter 2</a></li>
 </ul>
-</div></div>
+</div>
 <div class="chapter" id="after">
-<div class="node" id="chapter-2">
-<h2 class="chapter">2 chapter 2</h2>
+<span id="chapter-2"></span><h2 class="chapter">2 chapter 2</h2>
 
 <div class="Contents_element" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
@@ -704,7 +701,7 @@ Previous: <a href="#Top" accesskey="p" 
rel="prev">chapter</a>, Up: <a href="#Top
 </ul>
 </div>
 </div>
-</div><hr>
+<hr>
 </div>
 
 
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 86d6b28..99dc584 100644
--- a/tp/t/results/sectioning/character_and_spaces_in_node.pl
+++ b/tp/t/results/sectioning/character_and_spaces_in_node.pl
@@ -595,41 +595,36 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="node" id="Top">
-<div class="header">
+<span id="Top"></span><div class="header">
 <p>
  &nbsp; </p>
 </div>
 <h1 class="node-heading">Top</h1>
-</div><hr>
-<div class="node" id="other-nodes">
-<div class="header">
+<hr>
+<span id="other-nodes"></span><div class="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>
-</div><hr>
-<div class="node" 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">
-<div class="header">
+<hr>
+<span 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></span><div
 class="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>
-</div><hr>
-<div class="node" 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e">
-<div class="header">
+<hr>
+<span 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></span><div
 class="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>
-</div><hr>
-<div class="node" id="local-node">
-<div class="header">
+<hr>
+<span id="local-node"></span><div class="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>
-</div><hr>
+<hr>
 
 
 
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 8901b96..89aa5f3 100644
--- a/tp/t/results/sectioning/character_and_spaces_in_refs.pl
+++ b/tp/t/results/sectioning/character_and_spaces_in_refs.pl
@@ -2013,22 +2013,19 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="#other-nodes" accesskey="n" rel="next">Chapter with nodes</a> 
&nbsp; </p>
 </div>
-<div class="node" id="Test-refs">
-<h1 class="top">Test refs</h1>
+<span id="Test-refs"></span><h1 class="top">Test refs</h1>
 
 
-<div class="subheading" id="Testing-distant-nodes">
-<h4 class="subheading">Testing distant nodes</h4>
-</div>
+<span id="Testing-distant-nodes"></span><h4 class="subheading">Testing distant 
nodes</h4>
+
 <p><a data-manual="manual" href="manual.html#a-node">(manual)a  node</a>
 <a data-manual="manual" href="manual.html#g_t_003a">(manual):</a>
 <a data-manual="manual" href="manual.html#Top">(manual)top</a>
 <a data-manual="texinfo" href="texinfo.html#Cross-References">(texinfo)Cross 
References</a>
 <a data-manual="../manual/doc" href="doc.html#node">(../manual/doc)node</a>
 </p>
-<div class="subheading" id="Testing-local-nodes">
-<h4 class="subheading">Testing local nodes</h4>
-</div>
+<span id="Testing-local-nodes"></span><h4 class="subheading">Testing local 
nodes</h4>
+
 <p><a 
href="#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">!_&quot;#$%&amp;\'()*+-.</a>
 <a 
href="#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e">/;&lt;=&gt;?[\\]^_`|~</a>
 <a href="#Top">Test refs</a>
@@ -2037,41 +2034,37 @@ Next: <a href="#other-nodes" accesskey="n" 
rel="next">Chapter with nodes</a> &nb
 <ul class="section-toc">
 <li><a href="#other-nodes" accesskey="1">Chapter with nodes</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="chapter" id="other-nodes">
 <div class="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>
 </div>
-<div class="node" id="Chapter-with-nodes">
-<h2 class="chapter">1 Chapter with nodes</h2>
+<span id="Chapter-with-nodes"></span><h2 class="chapter">1 Chapter with 
nodes</h2>
 
 
-</div><hr>
-<div class="node" 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">
-<div class="header">
+<hr>
+<span 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></span><div
 class="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>
 
-</div><hr>
-<div class="node" 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e">
-<div class="header">
+<hr>
+<span 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></span><div
 class="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>
 
-</div><hr>
-<div class="node" id="local-node">
-<div class="header">
+<hr>
+<span id="local-node"></span><div class="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>
 
-</div><hr>
+<hr>
 </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 b512aa8..5565b9e 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
@@ -37,15 +37,14 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">
-<div class="header">
+<span 
id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></span><div
 class="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>
 
-</div>
+
 
 
 </body>
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 314f795..1ccd5d2 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
@@ -37,15 +37,14 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e">
-<div class="header">
+<span 
id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></span><div
 class="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>
 
-</div>
+
 
 
 </body>
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 d23cfcb..ae779e8 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
@@ -41,22 +41,19 @@ ul.no-bullet {list-style: none}
 Next: <a href="other-nodes.html" accesskey="n" rel="next">Chapter with 
nodes</a> &nbsp; </p>
 </div>
 <hr>
-<div class="node" id="Test-refs">
-<h1 class="top">Test refs</h1>
+<span id="Test-refs"></span><h1 class="top">Test refs</h1>
 
 
-<div class="subheading" id="Testing-distant-nodes">
-<h4 class="subheading">Testing distant nodes</h4>
-</div>
+<span id="Testing-distant-nodes"></span><h4 class="subheading">Testing distant 
nodes</h4>
+
 <p><a data-manual="manual" href="../manual/a-node.html#a-node">(manual)a  
node</a>
 <a data-manual="manual" href="../manual/_003a.html#g_t_003a">(manual):</a>
 <a data-manual="manual" href="../manual/index.html#Top">(manual)top</a>
 <a data-manual="texinfo" 
href="../texinfo/Cross-References.html#Cross-References">(texinfo)Cross 
References</a>
 <a data-manual="../manual/doc" 
href="../doc/node.html#node">(../manual/doc)node</a>
 </p>
-<div class="subheading" id="Testing-local-nodes">
-<h4 class="subheading">Testing local nodes</h4>
-</div>
+<span id="Testing-local-nodes"></span><h4 class="subheading">Testing local 
nodes</h4>
+
 <p><a 
href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html">!_&quot;#$%&amp;'()*+-.</a>
 <a 
href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html">/;&lt;=&gt;?[\]^_`|~</a>
 <a href="#Top">Test refs</a>
@@ -65,7 +62,7 @@ Next: <a href="other-nodes.html" accesskey="n" 
rel="next">Chapter with nodes</a>
 <ul class="section-toc">
 <li><a href="other-nodes.html" accesskey="1">Chapter with nodes</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="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 711b28e..5758da4 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
@@ -36,15 +36,14 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="local-node">
-<div class="header">
+<span id="local-node"></span><div class="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>
 
-</div>
+
 
 
 </body>
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 6ff804f..1d7a9f3 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
@@ -43,11 +43,10 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="Chapter-with-nodes">
-<h2 class="chapter">1 Chapter with nodes</h2>
+<span id="Chapter-with-nodes"></span><h2 class="chapter">1 Chapter with 
nodes</h2>
 
 
-</div></div>
+</div>
 
 
 
diff --git a/tp/t/results/sectioning/contents.pl 
b/tp/t/results/sectioning/contents.pl
index 2cee6fd..c70659a 100644
--- a/tp/t/results/sectioning/contents.pl
+++ b/tp/t/results/sectioning/contents.pl
@@ -802,8 +802,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="top" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <div class="Contents_element" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
@@ -837,29 +836,24 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 </div>
-</div><div class="chapter" id="chapter">
-<h2 class="chapter">1 chapter</h2>
+<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
 
 <ul class="section-toc">
 <li><a href="#section" accesskey="1">section</a></li>
 </ul>
-</div><div class="section" id="section">
-<h3 class="section">1.1 section</h3>
+<span id="section"></span><h3 class="section">1.1 section</h3>
 
 <ul class="section-toc">
 <li><a href="#subsection" accesskey="1">subsection</a></li>
 </ul>
-</div><div class="subsection" id="subsection">
-<h4 class="subsection">1.1.1 subsection</h4>
+<span id="subsection"></span><h4 class="subsection">1.1.1 subsection</h4>
 
 <ul class="section-toc">
 <li><a href="#subsubsection" accesskey="1">subsubsection</a></li>
 </ul>
-</div><div class="subsubsection" id="subsubsection">
-<h4 class="subsubsection">1.1.1.1 subsubsection</h4>
+<span id="subsubsection"></span><h4 class="subsubsection">1.1.1.1 
subsubsection</h4>
 
-</div><div class="part" id="part">
-<h1 class="part">part</h1>
+<span id="part"></span><h1 class="part">part</h1>
 <hr>
 
 <ul class="section-toc">
@@ -867,25 +861,20 @@ ul.no-bullet {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><div class="chapter" id="chapter-in-part">
-<h2 class="chapter">2 chapter in part</h2>
+<span id="chapter-in-part"></span><h2 class="chapter">2 chapter in part</h2>
 
-</div><div class="chapter" id="second-chapter-in-part">
-<h2 class="chapter">3 second chapter in part</h2>
+<span id="second-chapter-in-part"></span><h2 class="chapter">3 second chapter 
in part</h2>
 
-</div><div class="unnumbered" id="unnumbered">
-<h2 class="unnumbered">unnumbered</h2>
+<span id="unnumbered"></span><h2 class="unnumbered">unnumbered</h2>
 
-</div><div class="appendix" id="appendix">
-<h2 class="appendix">Appendix A appendix</h2>
+<span id="appendix"></span><h2 class="appendix">Appendix A appendix</h2>
 
 <ul class="section-toc">
 <li><a href="#appendixsec" accesskey="1">appendixsec</a></li>
 </ul>
-</div><div class="appendixsec" id="appendixsec">
-<h3 class="appendixsec">A.1 appendixsec</h3>
+<span id="appendixsec"></span><h3 class="appendixsec">A.1 appendixsec</h3>
 
-</div><hr></div>
+<hr></div>
 
 
 
diff --git a/tp/t/results/sectioning/contents_and_shortcontents.pl 
b/tp/t/results/sectioning/contents_and_shortcontents.pl
index 0ed343e..70f54bb 100644
--- a/tp/t/results/sectioning/contents_and_shortcontents.pl
+++ b/tp/t/results/sectioning/contents_and_shortcontents.pl
@@ -838,8 +838,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="top" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <div class="Contents_element" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
@@ -891,29 +890,24 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 </div>
-</div><div class="chapter" id="chapter">
-<h2 class="chapter">1 chapter</h2>
+<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
 
 <ul class="section-toc">
 <li><a href="#section" accesskey="1">section</a></li>
 </ul>
-</div><div class="section" id="section">
-<h3 class="section">1.1 section</h3>
+<span id="section"></span><h3 class="section">1.1 section</h3>
 
 <ul class="section-toc">
 <li><a href="#subsection" accesskey="1">subsection</a></li>
 </ul>
-</div><div class="subsection" id="subsection">
-<h4 class="subsection">1.1.1 subsection</h4>
+<span id="subsection"></span><h4 class="subsection">1.1.1 subsection</h4>
 
 <ul class="section-toc">
 <li><a href="#subsubsection" accesskey="1">subsubsection</a></li>
 </ul>
-</div><div class="subsubsection" id="subsubsection">
-<h4 class="subsubsection">1.1.1.1 subsubsection</h4>
+<span id="subsubsection"></span><h4 class="subsubsection">1.1.1.1 
subsubsection</h4>
 
-</div><div class="part" id="part">
-<h1 class="part">part</h1>
+<span id="part"></span><h1 class="part">part</h1>
 <hr>
 
 <ul class="section-toc">
@@ -921,26 +915,21 @@ ul.no-bullet {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><div class="chapter" id="chapter-in-part">
-<h2 class="chapter">2 chapter in part</h2>
+<span id="chapter-in-part"></span><h2 class="chapter">2 chapter in part</h2>
 
-</div><div class="chapter" id="second-chapter-in-part">
-<h2 class="chapter">3 second chapter in part</h2>
+<span id="second-chapter-in-part"></span><h2 class="chapter">3 second chapter 
in part</h2>
 
-</div><div class="unnumbered" id="unnumbered">
-<h2 class="unnumbered">unnumbered</h2>
+<span id="unnumbered"></span><h2 class="unnumbered">unnumbered</h2>
 
-</div><div class="appendix" id="appendix">
-<h2 class="appendix">Appendix A appendix</h2>
+<span id="appendix"></span><h2 class="appendix">Appendix A appendix</h2>
 
 <ul class="section-toc">
 <li><a href="#appendixsec" accesskey="1">appendixsec</a></li>
 </ul>
-</div><div class="appendixsec" id="appendixsec">
-<h3 class="appendixsec">A.1 appendixsec</h3>
+<span id="appendixsec"></span><h3 class="appendixsec">A.1 appendixsec</h3>
 
 
-</div><hr></div>
+<hr></div>
 
 
 
diff --git a/tp/t/results/sectioning/contents_in_html_text.pl 
b/tp/t/results/sectioning/contents_in_html_text.pl
index b83f923..08f67da 100644
--- a/tp/t/results/sectioning/contents_in_html_text.pl
+++ b/tp/t/results/sectioning/contents_in_html_text.pl
@@ -315,20 +315,16 @@ $result_floats{'contents_in_html_text'} = {};
 
 
 
-$result_converted{'html_text'}->{'contents_in_html_text'} = '<div class="top" 
id="top">
-<h1 class="top">top</h1>
+$result_converted{'html_text'}->{'contents_in_html_text'} = '<span 
id="top"></span><h1 class="top">top</h1>
 
-</div><div class="chapter" id="Chap1">
-<h2 class="chapter">1 Chap1</h2>
+<span id="Chap1"></span><h2 class="chapter">1 Chap1</h2>
 
 <ul class="section-toc">
 <li><a href="#Sec-1" accesskey="1">Sec 1</a></li>
 </ul>
-</div><div class="section" id="Sec-1">
-<h3 class="section">1.1 Sec 1</h3>
+<span id="Sec-1"></span><h3 class="section">1.1 Sec 1</h3>
 
-</div><div class="chapter" id="Chap2">
-<h2 class="chapter">2 Chap2</h2>
+<span id="Chap2"></span><h2 class="chapter">2 Chap2</h2>
 
 <div class="Overview_element">
 <h2 class="shortcontents-heading">Short Table of Contents</h2>
@@ -354,7 +350,7 @@ $result_converted{'html_text'}->{'contents_in_html_text'} = 
'<div class="top" id
 </ul>
 </div>
 </div>
-</div><hr></div>
+<hr></div>
 ';
 
 1;
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 cb33c10..8eac952 100644
--- a/tp/t/results/sectioning/contents_with_only_top_node.pl
+++ b/tp/t/results/sectioning/contents_with_only_top_node.pl
@@ -174,10 +174,9 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 
-</div><hr></div>
+<hr></div>
 
 
 
diff --git a/tp/t/results/sectioning/double_node_anchor_float.pl 
b/tp/t/results/sectioning/double_node_anchor_float.pl
index 20bd03c..c4aea3b 100644
--- a/tp/t/results/sectioning/double_node_anchor_float.pl
+++ b/tp/t/results/sectioning/double_node_anchor_float.pl
@@ -901,15 +901,13 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="node1">
-<div class="header">
+<span id="node1"></span><div class="header">
 <p>
  &nbsp; </p>
 </div>
 <h4 class="node-heading">node1</h4>
 
-</div><hr>
-<div class="node">
+<hr>
 <div class="header">
 <p>
  &nbsp; </p>
@@ -917,8 +915,7 @@ ul.no-bullet {list-style: none}
 
 
 <span id="anchor1"></span>
-</div><hr>
-<div class="node">
+<hr>
 <div class="header">
 <p>
  &nbsp; </p>
@@ -933,13 +930,12 @@ ul.no-bullet {list-style: none}
 <div class="float"><span id="float1"></span>
 <div class="float-caption"><p><strong>Text 1
 </strong></p></div></div>
-</div><hr>
-<div class="node">
+<hr>
 <div class="header">
 <p>
  &nbsp; </p>
 </div>
-</div><hr>
+<hr>
 
 
 
diff --git a/tp/t/results/sectioning/double_part.pl 
b/tp/t/results/sectioning/double_part.pl
index b0a23fe..a884076 100644
--- a/tp/t/results/sectioning/double_part.pl
+++ b/tp/t/results/sectioning/double_part.pl
@@ -901,18 +901,15 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="#node-chapter" accesskey="n" rel="next">chapter after 2 
parts</a> &nbsp; </p>
 </div>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 
-</div><div class="part" id="part-first">
-<h1 class="part">part first</h1>
+<span id="part-first"></span><h1 class="part">part first</h1>
 <hr>
 
 <p>Text part first.
-</p></div><hr>
-<div class="part" id="part-second">
-<div class="header">
+</p><hr>
+<span id="part-second"></span><div class="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>
@@ -923,11 +920,10 @@ Previous: <a href="#Top" accesskey="p" 
rel="prev">top</a>, Up: <a href="#Top" ac
 <ul class="section-toc">
 <li><a href="#node-chapter" accesskey="1">chapter after 2 parts</a></li>
 </ul>
-</div><div class="chapter" id="node-chapter">
-<div class="node" id="chapter-after-2-parts">
-<h2 class="chapter">1 chapter after 2 parts</h2>
+<div class="chapter" id="node-chapter">
+<span id="chapter-after-2-parts"></span><h2 class="chapter">1 chapter after 2 
parts</h2>
 
-</div><hr>
+<hr>
 </div>
 </div>
 
diff --git a/tp/t/results/sectioning/double_top.pl 
b/tp/t/results/sectioning/double_top.pl
index 32ad084..6c30cc5 100644
--- a/tp/t/results/sectioning/double_top.pl
+++ b/tp/t/results/sectioning/double_top.pl
@@ -366,22 +366,20 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<div class="header">
+<span id="Top"></span><div class="header">
 <p>
 Next: <a href="#Top" accesskey="n" rel="next">ToP</a> &nbsp; </p>
 </div>
 <h1 class="node-heading">ToP</h1>
 
-</div><hr>
-<div class="node">
+<hr>
 <div class="header">
 <p>
  &nbsp; </p>
 </div>
 
 <p>.
-</p></div><hr>
+</p><hr>
 
 
 
diff --git a/tp/t/results/sectioning/empty_top_node_up.pl 
b/tp/t/results/sectioning/empty_top_node_up.pl
index 3d50a86..254bcec 100644
--- a/tp/t/results/sectioning/empty_top_node_up.pl
+++ b/tp/t/results/sectioning/empty_top_node_up.pl
@@ -465,18 +465,16 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="#first" accesskey="n" rel="next">first</a> &nbsp; </p>
 </div>
-<div class="node" id="empty-top-node-up">
-<h1 class="top">empty top node up</h1>
+<span id="empty-top-node-up"></span><h1 class="top">empty top node up</h1>
 
 
-</div><hr>
-<div class="node" id="first">
-<div class="header">
+<hr>
+<span id="first"></span><div class="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>
-</div><hr>
+<hr>
 </div>
 
 
diff --git a/tp/t/results/sectioning/equivalent_labels.pl 
b/tp/t/results/sectioning/equivalent_labels.pl
index 660341d..157a37c 100644
--- a/tp/t/results/sectioning/equivalent_labels.pl
+++ b/tp/t/results/sectioning/equivalent_labels.pl
@@ -701,8 +701,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 
 <span id="anch"></span><p>.
 </p>
@@ -710,7 +709,7 @@ ul.no-bullet {list-style: none}
 <p>In float
 </p><div class="float-caption"><p><strong>truc 1
 </strong></p></div></div>
-</div><hr></div>
+<hr></div>
 
 
 
diff --git a/tp/t/results/sectioning/equivalent_nodes.pl 
b/tp/t/results/sectioning/equivalent_nodes.pl
index 63ecacb..6addf2e 100644
--- a/tp/t/results/sectioning/equivalent_nodes.pl
+++ b/tp/t/results/sectioning/equivalent_nodes.pl
@@ -562,24 +562,22 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<div class="header">
+<span id="Top"></span><div class="header">
 <p>
 Next: <a href="#node" accesskey="n" 
rel="next">&lsquo;<samp>node</samp>&rsquo;</a> &nbsp; </p>
 </div>
 <h1 class="node-heading">Top</h1>
 
 
-</div><hr>
-<div class="node" id="node">
-<div class="header">
+<hr>
+<span id="node"></span><div class="header">
 <p>
 Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <h4 class="node-heading">&lsquo;<samp>node</samp>&rsquo;</h4>
 
 <p>See <a href="#node">&lsquo;<samp>node</samp>&rsquo;</a>.
-</p></div><hr>
+</p><hr>
 
 
 
diff --git a/tp/t/results/sectioning/explicit_node_directions.pl 
b/tp/t/results/sectioning/explicit_node_directions.pl
index 30e34db..690e35a 100644
--- a/tp/t/results/sectioning/explicit_node_directions.pl
+++ b/tp/t/results/sectioning/explicit_node_directions.pl
@@ -847,17 +847,15 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<div class="header">
+<span id="Top"></span><div class="header">
 <p>
 Next: <a href="#second-node" accesskey="n" rel="next">second node</a> &nbsp; 
</p>
 </div>
 <h1 class="node-heading">Top</h1>
 <p>Top node
 </p>
-</div><hr>
-<div class="node" id="second-node">
-<div class="header">
+<hr>
+<span id="second-node"></span><div class="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>
@@ -865,14 +863,13 @@ Next: <a href="#third-node" accesskey="n" 
rel="next">third node</a>, Previous: <
 
 <p>second node
 </p>
-</div><hr>
-<div class="node" id="third-node">
-<div class="header">
+<hr>
+<span id="third-node"></span><div class="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>
-</div><hr>
+<hr>
 
 
 
diff --git a/tp/t/results/sectioning/external_node_in_menu.pl 
b/tp/t/results/sectioning/external_node_in_menu.pl
index 323bc92..046c6ba 100644
--- a/tp/t/results/sectioning/external_node_in_menu.pl
+++ b/tp/t/results/sectioning/external_node_in_menu.pl
@@ -848,33 +848,30 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="#nchapter1" accesskey="n" rel="next">chap1</a> &nbsp; </p>
 </div>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 
 <ul class="section-toc">
 <li><a href="#nchapter1" accesskey="1">chap1</a></li>
 <li><a href="#nchapter2" accesskey="2">chap2</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="chapter" id="nchapter1">
 <div class="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>
 </div>
-<div class="node" id="chap1">
-<h2 class="chapter">1 chap1</h2>
+<span id="chap1"></span><h2 class="chapter">1 chap1</h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="nchapter2">
 <div class="header">
 <p>
 Previous: <a href="#nchapter1" accesskey="p" rel="prev">chap1</a>, Up: <a 
href="#Top" accesskey="u" rel="up">top</a> &nbsp; </p>
 </div>
-<div class="node" id="chap2">
-<h2 class="chapter">2 chap2</h2>
-</div><hr>
+<span id="chap2"></span><h2 class="chapter">2 chap2</h2>
+<hr>
 </div>
 </div>
 
diff --git a/tp/t/results/sectioning/internal_top_node_up.pl 
b/tp/t/results/sectioning/internal_top_node_up.pl
index 078fd1e..36bf476 100644
--- a/tp/t/results/sectioning/internal_top_node_up.pl
+++ b/tp/t/results/sectioning/internal_top_node_up.pl
@@ -573,18 +573,16 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="#first" accesskey="n" rel="next">first</a> &nbsp; </p>
 </div>
-<div class="node" id="internal-top-node-up">
-<h1 class="top">internal top node up</h1>
+<span id="internal-top-node-up"></span><h1 class="top">internal top node 
up</h1>
 
 
-</div><hr>
-<div class="node" id="first">
-<div class="header">
+<hr>
+<span id="first"></span><div class="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>
-</div><hr>
+<hr>
 </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 2998cc1..e2f9a29 100644
--- a/tp/t/results/sectioning/next_in_menu_is_below.pl
+++ b/tp/t/results/sectioning/next_in_menu_is_below.pl
@@ -1250,48 +1250,44 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; </p>
 </div>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 
 <ul class="section-toc">
 <li><a href="#chapter" accesskey="1">chapter</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="chapter" id="chapter">
 <div class="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 class="node" id="chapter-1">
-<h2 class="chapter">1 chapter</h2>
+<span id="chapter-1"></span><h2 class="chapter">1 chapter</h2>
 
 
 <ul class="section-toc">
 <li><a href="#section" accesskey="1">section</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="section" id="section">
 <div class="header">
 <p>
 Next: <a href="#subsection" accesskey="n" rel="next">subsection</a>, Up: <a 
href="#chapter" accesskey="u" rel="up">chapter</a> &nbsp; </p>
 </div>
-<div class="node" id="section-1">
-<h3 class="section">1.1 section</h3>
+<span id="section-1"></span><h3 class="section">1.1 section</h3>
 
 
 <ul class="section-toc">
 <li><a href="#subsection" accesskey="1">subsection</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="subsection" id="subsection">
 <div class="header">
 <p>
 Previous: <a href="#section" accesskey="p" rel="prev">section</a>, Up: <a 
href="#section" accesskey="u" rel="up">section</a> &nbsp; </p>
 </div>
-<div class="node" id="subsection-1">
-<h4 class="subsection">1.1.1 subsection</h4>
-</div><hr>
+<span id="subsection-1"></span><h4 class="subsection">1.1.1 subsection</h4>
+<hr>
 </div>
 </div>
 </div>
diff --git a/tp/t/results/sectioning/no_argument_and_contents.pl 
b/tp/t/results/sectioning/no_argument_and_contents.pl
index d06b05d..3c8494d 100644
--- a/tp/t/results/sectioning/no_argument_and_contents.pl
+++ b/tp/t/results/sectioning/no_argument_and_contents.pl
@@ -245,8 +245,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="top" id="for-example">
-<h1 class="top">for example</h1>
+<span id="for-example"></span><h1 class="top">for example</h1>
 
 <div class="Contents_element" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
@@ -258,10 +257,9 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 </div>
-</div><div class="chapter">
 <h2 class="chapter">1 </h2>
 
-</div><hr></div>
+<hr></div>
 
 
 
diff --git a/tp/t/results/sectioning/no_menu.pl 
b/tp/t/results/sectioning/no_menu.pl
index 7ba69e1..20e87a2 100644
--- a/tp/t/results/sectioning/no_menu.pl
+++ b/tp/t/results/sectioning/no_menu.pl
@@ -582,42 +582,38 @@ ul.no-bullet {list-style: none}
 <p>
  &nbsp; </p>
 </div>
-<div class="node" id="SEC_Top">
-
+<span id="SEC_Top"></span>
 <ul class="section-toc">
 <li><a href="#c1" accesskey="1">c1</a></li>
 <li><a href="#c2" accesskey="2">c2</a></li>
 <li><a href="#c3" accesskey="3">c3</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="chapter" id="c1">
 <div class="header">
 <p>
 Next: <a href="#c2" accesskey="n" rel="next">c2</a> &nbsp; </p>
 </div>
-<div class="node" id="c1-1">
-<h2 class="chapter">1 c1</h2>
+<span id="c1-1"></span><h2 class="chapter">1 c1</h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="c2">
 <div class="header">
 <p>
 Next: <a href="#c3" accesskey="n" rel="next">c3</a>, Previous: <a href="#c1" 
accesskey="p" rel="prev">c1</a> &nbsp; </p>
 </div>
-<div class="node" id="c2-1">
-<h2 class="chapter">2 c2</h2>
+<span id="c2-1"></span><h2 class="chapter">2 c2</h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="c3">
 <div class="header">
 <p>
 Previous: <a href="#c2" accesskey="p" rel="prev">c2</a> &nbsp; </p>
 </div>
-<div class="node" id="c3-1">
-<h2 class="chapter">3 c3</h2>
-</div><hr>
+<span id="c3-1"></span><h2 class="chapter">3 c3</h2>
+<hr>
 </div>
 </div>
 
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 8cc4ec1..5f71436 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
@@ -1113,8 +1113,7 @@ ul.no-bullet {list-style: none}
 <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>
 </div>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 
 <div class="Contents_element" id="SEC_Contents">
@@ -1134,34 +1133,31 @@ Next: <a href="#chapter-node" accesskey="n" 
rel="next">chapter node</a> &nbsp; [
 </ul>
 </div>
 </div>
-</div><hr>
+<hr>
 <div class="chapter" id="chapter-node">
 <div class="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>
 </div>
 
-<div class="node" id="chapter-node-1">
-<h2 class="chapter">1 chapter node</h2>
+<span id="chapter-node-1"></span><h2 class="chapter">1 chapter node</h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="part-chapter-node">
 <div class="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 class="part" id="part">
-<h1 class="part">part</h1>
+<span id="part"></span><h1 class="part">part</h1>
 <hr>
 
 <ul class="section-toc">
 <li><a href="#part-chapter-node" accesskey="1">chapter with part node</a></li>
 </ul>
-</div><div class="node" id="chapter-with-part-node">
-<h2 class="chapter">2 chapter with part node</h2>
+<span id="chapter-with-part-node"></span><h2 class="chapter">2 chapter with 
part node</h2>
 
-</div><hr>
+<hr>
 </div>
 </div>
 
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 471bdf2..1e0027e 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_top.pl
@@ -747,26 +747,23 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="#chapter-node" accesskey="n" rel="next">chapter</a> &nbsp; </p>
 </div>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 
-</div><hr>
+<hr>
 <div class="chapter" id="chapter-node">
 <div class="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 class="part" id="part">
-<h1 class="part">part</h1>
+<span id="part"></span><h1 class="part">part</h1>
 <hr>
 
 <ul class="section-toc">
 <li><a href="#chapter-node" accesskey="1">chapter</a></li>
 </ul>
-</div><div class="node" id="chapter">
-<h2 class="chapter">1 chapter</h2>
-</div><hr>
+<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
+<hr>
 </div>
 </div>
 
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 50c518d..46f5d98 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
@@ -211,9 +211,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
-</div><hr></div>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
+<hr></div>
 
 
 
diff --git a/tp/t/results/sectioning/node_up_external_node.pl 
b/tp/t/results/sectioning/node_up_external_node.pl
index 669d151..3b4d910 100644
--- a/tp/t/results/sectioning/node_up_external_node.pl
+++ b/tp/t/results/sectioning/node_up_external_node.pl
@@ -616,22 +616,20 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<div class="header">
+<span id="Top"></span><div class="header">
 <p>
 Next: <a href="#first" accesskey="n" rel="next">first</a> &nbsp; </p>
 </div>
 <h1 class="node-heading">Top</h1>
 
 
-</div><hr>
-<div class="node" id="first">
-<div class="header">
+<hr>
+<span id="first"></span><div class="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>
-</div><hr>
+<hr>
 
 
 
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 2bd1bc1..2c8f73a 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
@@ -926,17 +926,15 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<div class="header">
+<span id="Top"></span><div class="header">
 <p>
 Next: <a href="#second-node" accesskey="n" rel="next">second node</a> &nbsp; 
</p>
 </div>
 <h1 class="node-heading">Top</h1>
 <p>Top node
 </p>
-</div><hr>
-<div class="node" id="second-node">
-<div class="header">
+<hr>
+<span id="second-node"></span><div class="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>
@@ -944,15 +942,14 @@ Next: <a href="#third-node" accesskey="n" 
rel="next">chapter</a>, Previous: <a h
 
 <p>second node
 </p>
-</div><hr>
+<hr>
 <div class="chapter" id="third-node">
 <div class="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>
-<div class="node" id="chapter">
-<h2 class="chapter">1 chapter</h2>
-</div><hr>
+<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
+<hr>
 </div>
 
 
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 c817009..3f3f65d 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
@@ -729,17 +729,15 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<div class="header">
+<span id="Top"></span><div class="header">
 <p>
 Next: <a href="#second-node" accesskey="n" rel="next">second node</a> &nbsp; 
</p>
 </div>
 <h1 class="node-heading">Top</h1>
 <p>Top node
 </p>
-</div><hr>
-<div class="node" id="second-node">
-<div class="header">
+<hr>
+<span id="second-node"></span><div class="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>
@@ -747,15 +745,14 @@ Next: <a href="#third-node" accesskey="n" 
rel="next">chapter</a>, Previous: <a h
 
 <p>second node
 </p>
-</div><hr>
+<hr>
 <div class="chapter" id="third-node">
 <div class="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>
-<div class="node" id="chapter">
-<h2 class="chapter">1 chapter</h2>
-</div><hr>
+<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
+<hr>
 </div>
 
 
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 a0515d6..77eeffa 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
@@ -729,17 +729,15 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<div class="header">
+<span id="Top"></span><div class="header">
 <p>
  &nbsp; </p>
 </div>
 <h1 class="node-heading">Top</h1>
 <p>Top node
 </p>
-</div><hr>
-<div class="node" id="second-node">
-<div class="header">
+<hr>
+<span id="second-node"></span><div class="header">
 <p>
  &nbsp; </p>
 </div>
@@ -747,15 +745,14 @@ ul.no-bullet {list-style: none}
 
 <p>second node
 </p>
-</div><hr>
+<hr>
 <div class="chapter" id="third-node">
 <div class="header">
 <p>
  &nbsp; </p>
 </div>
-<div class="node" id="chapter">
-<h2 class="chapter">1 chapter</h2>
-</div><hr>
+<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
+<hr>
 </div>
 
 
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 2a48405..f90cdcd 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
@@ -834,17 +834,15 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<div class="header">
+<span id="Top"></span><div class="header">
 <p>
 Next: <a href="#second-node" accesskey="n" rel="next">second node</a> &nbsp; 
</p>
 </div>
 <h1 class="node-heading">Top</h1>
 <p>Top node
 </p>
-</div><hr>
-<div class="node" id="second-node">
-<div class="header">
+<hr>
+<span id="second-node"></span><div class="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>
@@ -852,15 +850,14 @@ Next: <a href="#third-node" accesskey="n" 
rel="next">chapter</a>, Previous: <a h
 
 <p>second node
 </p>
-</div><hr>
+<hr>
 <div class="chapter" id="third-node">
 <div class="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>
-<div class="node" id="chapter">
-<h2 class="chapter">1 chapter</h2>
-</div><hr>
+<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
+<hr>
 </div>
 
 
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 0a83e7b..c9f9773 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
@@ -928,17 +928,15 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<div class="header">
+<span id="Top"></span><div class="header">
 <p>
 Next: <a href="#second-node" accesskey="n" rel="next">second node</a> &nbsp; 
</p>
 </div>
 <h1 class="node-heading">Top</h1>
 <p>Top node
 </p>
-</div><hr>
-<div class="node" id="second-node">
-<div class="header">
+<hr>
+<span id="second-node"></span><div class="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>
@@ -946,15 +944,14 @@ Next: <a href="#third-node" accesskey="n" 
rel="next">subsection</a>, Previous: <
 
 <p>second node
 </p>
-</div><hr>
+<hr>
 <div class="subsection" id="third-node">
 <div class="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>
-<div class="node" id="subsection">
-<h4 class="subsection">1 subsection</h4>
-</div><hr>
+<span id="subsection"></span><h4 class="subsection">1 subsection</h4>
+<hr>
 </div>
 
 
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 e9f695b..dcce48e 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
@@ -836,17 +836,15 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<div class="header">
+<span id="Top"></span><div class="header">
 <p>
 Next: <a href="#second-node" accesskey="n" rel="next">second node</a> &nbsp; 
</p>
 </div>
 <h1 class="node-heading">Top</h1>
 <p>Top node
 </p>
-</div><hr>
-<div class="node" id="second-node">
-<div class="header">
+<hr>
+<span id="second-node"></span><div class="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>
@@ -854,15 +852,14 @@ Next: <a href="#third-node" accesskey="n" 
rel="next">subsection</a>, Previous: <
 
 <p>second node
 </p>
-</div><hr>
+<hr>
 <div class="subsection" id="third-node">
 <div class="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>
-<div class="node" id="subsection">
-<h4 class="subsection">1 subsection</h4>
-</div><hr>
+<span id="subsection"></span><h4 class="subsection">1 subsection</h4>
+<hr>
 </div>
 
 
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 421a92d..9b2c5d0 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
@@ -636,8 +636,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="first">
-<div class="header">
+<span id="first"></span><div class="header">
 <p>
 Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
 </div>
@@ -645,15 +644,14 @@ Up: <a href="dir.html#Top" accesskey="u" 
rel="up">(dir)</a> &nbsp; </p>
 <p>first node
 </p>
 
-</div><hr>
-<div class="node" id="second-node">
-<div class="header">
+<hr>
+<span id="second-node"></span><div class="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>
 <p>second node
-</p></div><hr>
+</p><hr>
 
 
 
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 baf8147..cf9ad13 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
@@ -924,18 +924,16 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="#first" accesskey="n" rel="next">first</a> &nbsp; </p>
 </div>
-<div class="node" id="internal-top-node-up">
-<h1 class="top">internal top node up</h1>
+<span id="internal-top-node-up"></span><h1 class="top">internal top node 
up</h1>
 
 
-</div><hr>
-<div class="node" id="first">
-<div class="header">
+<hr>
+<span id="first"></span><div class="header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">internal top node up</a> 
&nbsp; </p>
 </div>
 <h4 class="node-heading">first</h4>
-</div><hr>
+<hr>
 </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 41c60b2..ebd6db3 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
@@ -925,18 +925,16 @@ ul.no-bullet {list-style: none}
 <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>
 </div>
-<div class="node" id="internal-top-node-up">
-<h1 class="top">internal top node up</h1>
+<span id="internal-top-node-up"></span><h1 class="top">internal top node 
up</h1>
 
 
-</div><hr>
-<div class="node" id="first">
-<div class="header">
+<hr>
+<span id="first"></span><div class="header">
 <p>
 Previous: <a href="#Top" accesskey="p" rel="prev">internal top node up</a> 
&nbsp; </p>
 </div>
 <h4 class="node-heading">first</h4>
-</div><hr>
+<hr>
 </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 1b0263a..8f9291e 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
@@ -772,18 +772,16 @@ ul.no-bullet {list-style: none}
 <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>
 </div>
-<div class="node" id="internal-top-node-up">
-<h1 class="top">internal top node up</h1>
+<span id="internal-top-node-up"></span><h1 class="top">internal top node 
up</h1>
 
 
-</div><hr>
-<div class="node" id="first">
-<div class="header">
+<hr>
+<span id="first"></span><div class="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>
-</div><hr>
+<hr>
 </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 25ce063..6dd4b9a 100644
--- a/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
+++ b/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
@@ -358,14 +358,13 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="one-node">
-<h4 class="node-heading">one node</h4>
+<span id="one-node"></span><h4 class="node-heading">one node</h4>
 <p>Top node
 </p>
 <p>anchor ref <span id="ref"></span>.
 </p>
 <p>ref to ref <a href="#ref">ref</a>.
-</p></div><hr></div>
+</p><hr></div>
 
 
 
diff --git a/tp/t/results/sectioning/one_subsection.pl 
b/tp/t/results/sectioning/one_subsection.pl
index 04df519..4c59837 100644
--- a/tp/t/results/sectioning/one_subsection.pl
+++ b/tp/t/results/sectioning/one_subsection.pl
@@ -123,9 +123,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="subsection" id="The-subsection">
-<h4 class="subsection">1 The subsection</h4>
-</div><hr></div>
+<span id="The-subsection"></span><h4 class="subsection">1 The subsection</h4>
+<hr></div>
 
 
 
diff --git a/tp/t/results/sectioning/one_subsection_and_node.pl 
b/tp/t/results/sectioning/one_subsection_and_node.pl
index fc99a15..d1fa2fb 100644
--- a/tp/t/results/sectioning/one_subsection_and_node.pl
+++ b/tp/t/results/sectioning/one_subsection_and_node.pl
@@ -229,9 +229,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 <div class="subsection" id="one-node">
-<div class="node" id="The-subsection">
-<h4 class="subsection">1 The subsection</h4>
-</div><hr></div>
+<span id="The-subsection"></span><h4 class="subsection">1 The subsection</h4>
+<hr></div>
 </div>
 
 
diff --git a/tp/t/results/sectioning/part_before_chapter.pl 
b/tp/t/results/sectioning/part_before_chapter.pl
index a9c70ac..5c66e74 100644
--- a/tp/t/results/sectioning/part_before_chapter.pl
+++ b/tp/t/results/sectioning/part_before_chapter.pl
@@ -229,16 +229,14 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="part" id="part">
-<h1 class="part">part</h1>
+<span id="part"></span><h1 class="part">part</h1>
 <hr>
 
 <ul class="section-toc">
 <li><a href="#chapter" accesskey="1">chapter</a></li>
 </ul>
-</div><div class="chapter" id="chapter">
-<h2 class="chapter">1 chapter</h2>
-</div><hr></div>
+<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
+<hr></div>
 
 
 
diff --git a/tp/t/results/sectioning/part_before_section.pl 
b/tp/t/results/sectioning/part_before_section.pl
index 01e20ae..4b5761b 100644
--- a/tp/t/results/sectioning/part_before_section.pl
+++ b/tp/t/results/sectioning/part_before_section.pl
@@ -198,16 +198,14 @@ $result_directions_text{'part_before_section'} = 
'element: @section section
 ';
 
 
-$result_converted{'html_text'}->{'part_before_section'} = '<div class="part" 
id="part">
-<h1 class="part">part</h1>
+$result_converted{'html_text'}->{'part_before_section'} = '<span 
id="part"></span><h1 class="part">part</h1>
 <hr>
 
 <ul class="section-toc">
 <li><a href="#section" accesskey="1">section</a></li>
 </ul>
-</div><div class="section" id="section">
-<h2 class="chapter">1 section</h2>
-</div><hr></div>
+<span id="section"></span><h2 class="chapter">1 section</h2>
+<hr></div>
 ';
 
 
diff --git a/tp/t/results/sectioning/part_before_top.pl 
b/tp/t/results/sectioning/part_before_top.pl
index 3a18fc9..e9b4bde 100644
--- a/tp/t/results/sectioning/part_before_top.pl
+++ b/tp/t/results/sectioning/part_before_top.pl
@@ -236,13 +236,11 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="part" id="part">
-<h1 class="part">part</h1>
+<span id="part"></span><h1 class="part">part</h1>
 <hr>
 
-</div><div class="top" id="top">
-<h1 class="top">top</h1>
-</div><hr></div>
+<span id="top"></span><h1 class="top">top</h1>
+<hr></div>
 
 
 
diff --git a/tp/t/results/sectioning/part_chapter_after_top.pl 
b/tp/t/results/sectioning/part_chapter_after_top.pl
index 3835b13..8395485 100644
--- a/tp/t/results/sectioning/part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_chapter_after_top.pl
@@ -737,13 +737,11 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; </p>
 </div>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 
-</div><hr>
-<div class="part" id="part">
-<div class="header">
+<hr>
+<span id="part"></span><div class="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>
@@ -753,10 +751,9 @@ Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, 
Up: <a href="#Top" ac
 <ul class="section-toc">
 <li><a href="#chapter" accesskey="1">chapter</a></li>
 </ul>
-</div><div class="chapter" id="chapter">
-<div class="node" id="chapter-1">
-<h2 class="chapter">1 chapter</h2>
-</div><hr>
+<div class="chapter" id="chapter">
+<span id="chapter-1"></span><h2 class="chapter">1 chapter</h2>
+<hr>
 </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 b04a89c..a678fb5 100644
--- a/tp/t/results/sectioning/part_node_after_top.pl
+++ b/tp/t/results/sectioning/part_node_after_top.pl
@@ -647,21 +647,18 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="#part-node-after-top" accesskey="n" rel="next">part node after 
top</a> &nbsp; </p>
 </div>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 
-</div><hr>
-<div class="node" id="part-node-after-top">
-<div class="header">
+<hr>
+<span id="part-node-after-top"></span><div class="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>
-</div><div class="part" id="part">
-<h1 class="part">part</h1>
+<span id="part"></span><h1 class="part">part</h1>
+<hr>
 <hr>
-</div><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 20330f1..e127ba6 100644
--- a/tp/t/results/sectioning/part_node_before_top.pl
+++ b/tp/t/results/sectioning/part_node_before_top.pl
@@ -661,26 +661,23 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="part-node-before-top">
-<div class="header">
+<span id="part-node-before-top"></span><div class="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>
-</div><hr>
-<div class="part" id="part">
-<div class="header">
+<hr>
+<span id="part"></span><div class="header">
 <p>
 Next: <a href="#part-node-before-top" accesskey="n" rel="next">part node 
before top</a> &nbsp; </p>
 </div>
 <h1 class="part">part</h1>
 <hr>
 
-</div><div class="top" id="Top">
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<div class="top" id="Top">
+<span id="top"></span><h1 class="top">top</h1>
 
-</div><hr>
+<hr>
 </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 9357549..64745d9 100644
--- a/tp/t/results/sectioning/part_node_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_node_chapter_after_top.pl
@@ -1040,13 +1040,11 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="#a-node-after-part" accesskey="n" rel="next">a node after 
part</a> &nbsp; </p>
 </div>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 
-</div><hr>
-<div class="part" id="part">
-<div class="header">
+<hr>
+<span id="part"></span><div class="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>
 </div>
@@ -1056,19 +1054,17 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">chapter</a>, Previous: <a href
 <ul class="section-toc">
 <li><a href="#chapter" accesskey="1">chapter</a></li>
 </ul>
-</div><div class="node" id="a-node-after-part">
-<h4 class="node-heading">a node after part</h4>
+<span id="a-node-after-part"></span><h4 class="node-heading">a node after 
part</h4>
 <p>After a node after part
 </p>
-</div><hr>
+<hr>
 <div class="chapter" id="chapter">
 <div class="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>
 </div>
-<div class="node" id="chapter-1">
-<h2 class="chapter">1 chapter</h2>
-</div><hr>
+<span id="chapter-1"></span><h2 class="chapter">1 chapter</h2>
+<hr>
 </div>
 </div>
 
diff --git a/tp/t/results/sectioning/part_node_chapter_appendix.pl 
b/tp/t/results/sectioning/part_node_chapter_appendix.pl
index 66e2d6a..9ac76b4 100644
--- a/tp/t/results/sectioning/part_node_chapter_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_appendix.pl
@@ -852,13 +852,11 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="#chapter-node" accesskey="n" rel="next">chapter</a> &nbsp; </p>
 </div>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 
-</div><hr>
-<div class="part" id="Part-1">
-<div class="header">
+<hr>
+<span id="Part-1"></span><div class="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>
@@ -868,13 +866,11 @@ Previous: <a href="#Top" accesskey="p" 
rel="prev">top</a>, Up: <a href="#Top" ac
 <ul class="section-toc">
 <li><a href="#chapter-node" accesskey="1">chapter</a></li>
 </ul>
-</div><div class="chapter" id="chapter-node">
-<div class="node" id="chapter">
-<h2 class="chapter">1 chapter</h2>
+<div class="chapter" id="chapter-node">
+<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
 
-</div><div class="appendix" id="Appendix">
-<h2 class="appendix">Appendix A Appendix</h2>
-</div><hr>
+<span id="Appendix"></span><h2 class="appendix">Appendix A Appendix</h2>
+<hr>
 </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 6255f3d..3bbb08d 100644
--- a/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
@@ -1046,13 +1046,11 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="#chapter-node" accesskey="n" rel="next">chapter</a> &nbsp; </p>
 </div>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 
-</div><hr>
-<div class="part" id="Part-1">
-<div class="header">
+<hr>
+<span id="Part-1"></span><div class="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>
 </div>
@@ -1062,20 +1060,18 @@ Next: <a href="#appendix-node" accesskey="n" 
rel="next">Appendix</a>, Previous:
 <ul class="section-toc">
 <li><a href="#chapter-node" accesskey="1">chapter</a></li>
 </ul>
-</div><div class="chapter" id="chapter-node">
-<div class="node" id="chapter">
-<h2 class="chapter">1 chapter</h2>
+<div class="chapter" id="chapter-node">
+<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="appendix" id="appendix-node">
 <div class="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 class="node" id="Appendix">
-<h2 class="appendix">Appendix A Appendix</h2>
-</div><hr>
+<span id="Appendix"></span><h2 class="appendix">Appendix A Appendix</h2>
+<hr>
 </div>
 </div>
 
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 f796254..b29e10a 100644
--- a/tp/t/results/sectioning/part_node_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_node_part_appendix.pl
@@ -1130,13 +1130,11 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="#chapter-node" accesskey="n" rel="next">chapter</a> &nbsp; </p>
 </div>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 
-</div><hr>
-<div class="part" id="Part-1">
-<div class="header">
+<hr>
+<span id="Part-1"></span><div class="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>
 </div>
@@ -1146,27 +1144,24 @@ Next: <a href="#appendix-part" accesskey="n" 
rel="next">Appendix</a>, Previous:
 <ul class="section-toc">
 <li><a href="#chapter-node" accesskey="1">chapter</a></li>
 </ul>
-</div><div class="chapter" id="chapter-node">
-<div class="node" id="chapter">
-<h2 class="chapter">1 chapter</h2>
+<div class="chapter" id="chapter-node">
+<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
 
-</div><hr>
+<hr>
 </div>
 <div class="appendix" id="appendix-part">
 <div class="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 class="part" id="Part-Appendix">
-<h1 class="part">Part Appendix</h1>
+<span id="Part-Appendix"></span><h1 class="part">Part Appendix</h1>
 <hr>
 
 <ul class="section-toc">
 <li><a href="#appendix-part" accesskey="1">Appendix</a></li>
 </ul>
-</div><div class="node" id="Appendix">
-<h2 class="appendix">Appendix A Appendix</h2>
-</div><hr>
+<span id="Appendix"></span><h2 class="appendix">Appendix A Appendix</h2>
+<hr>
 </div>
 </div>
 
diff --git a/tp/t/results/sectioning/part_node_part_appendix.pl 
b/tp/t/results/sectioning/part_node_part_appendix.pl
index 0022b99..a3f6d04 100644
--- a/tp/t/results/sectioning/part_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_appendix.pl
@@ -919,13 +919,11 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="#chapter-node" accesskey="n" rel="next">chapter</a> &nbsp; </p>
 </div>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 
-</div><hr>
-<div class="part" id="Part-1">
-<div class="header">
+<hr>
+<span id="Part-1"></span><div class="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>
@@ -935,20 +933,17 @@ Previous: <a href="#Top" accesskey="p" 
rel="prev">top</a>, Up: <a href="#Top" ac
 <ul class="section-toc">
 <li><a href="#chapter-node" accesskey="1">chapter</a></li>
 </ul>
-</div><div class="chapter" id="chapter-node">
-<div class="node" id="chapter">
-<h2 class="chapter">1 chapter</h2>
+<div class="chapter" id="chapter-node">
+<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
 
-</div><div class="part" id="Part-Appendix">
-<h1 class="part">Part Appendix</h1>
+<span id="Part-Appendix"></span><h1 class="part">Part Appendix</h1>
 <hr>
 
 <ul class="section-toc">
 <li><a href="#Appendix" accesskey="1">Appendix</a></li>
 </ul>
-</div><div class="appendix" id="Appendix">
-<h2 class="appendix">Appendix A Appendix</h2>
-</div><hr>
+<span id="Appendix"></span><h2 class="appendix">Appendix A Appendix</h2>
+<hr>
 </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 8669bcc..d403965 100644
--- a/tp/t/results/sectioning/part_node_part_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_node_appendix.pl
@@ -1120,13 +1120,11 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="#chapter-node" accesskey="n" rel="next">chapter</a> &nbsp; </p>
 </div>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 
-</div><hr>
-<div class="part" id="Part-1">
-<div class="header">
+<hr>
+<span id="Part-1"></span><div class="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>
 </div>
@@ -1136,13 +1134,11 @@ Next: <a href="#appendix-node" accesskey="n" 
rel="next">Appendix</a>, Previous:
 <ul class="section-toc">
 <li><a href="#chapter-node" accesskey="1">chapter</a></li>
 </ul>
-</div><div class="chapter" id="chapter-node">
-<div class="node" id="chapter">
-<h2 class="chapter">1 chapter</h2>
+<div class="chapter" id="chapter-node">
+<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
 
-</div><hr>
-<div class="part" id="Part-Appendix">
-<div class="header">
+<hr>
+<span id="Part-Appendix"></span><div class="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>
@@ -1152,11 +1148,10 @@ Previous: <a href="#chapter-node" accesskey="p" 
rel="prev">chapter</a>, Up: <a h
 <ul class="section-toc">
 <li><a href="#appendix-node" accesskey="1">Appendix</a></li>
 </ul>
-</div></div>
+</div>
 <div class="appendix" id="appendix-node">
-<div class="node" id="Appendix">
-<h2 class="appendix">Appendix A Appendix</h2>
-</div><hr>
+<span id="Appendix"></span><h2 class="appendix">Appendix A Appendix</h2>
+<hr>
 </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 8106de4..027c29f 100644
--- a/tp/t/results/sectioning/placed_things_before_element.pl
+++ b/tp/t/results/sectioning/placed_things_before_element.pl
@@ -1130,15 +1130,14 @@ ul.no-bullet {list-style: none}
 
 <span id="index-index-entry"></span>
 
-<div class="section" id="section">
-<h3 class="section">1 section</h3>
+<span id="section"></span><h3 class="section">1 section</h3>
 
 <p>Ref to anchor
 <a href="#An-anchor">An anchor</a>
 </p>
 <p>Ref to footnote anchor
 <a href="#Anchor-in-footnote">Anchor in footnote</a>
-</p></div><div class="footnote">
+</p><div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
diff --git a/tp/t/results/sectioning/placed_things_before_node.pl 
b/tp/t/results/sectioning/placed_things_before_node.pl
index 335cda5..38c8d9f 100644
--- a/tp/t/results/sectioning/placed_things_before_node.pl
+++ b/tp/t/results/sectioning/placed_things_before_node.pl
@@ -1197,15 +1197,14 @@ ul.no-bullet {list-style: none}
 <span id="index-index-entry"></span>
 
 <div class="top" id="Top">
-<div class="node" id="top-section">
-<h1 class="top">top section</h1>
+<span id="top-section"></span><h1 class="top">top section</h1>
 
 <p>Ref to anchor
 <a href="#An-anchor">An anchor</a>
 </p>
 <p>Ref to footnote anchor
 <a href="#Anchor-in-footnote">Anchor in footnote</a>
-</p></div><div class="footnote">
+</p><div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
diff --git a/tp/t/results/sectioning/protected_node_parentheses.pl 
b/tp/t/results/sectioning/protected_node_parentheses.pl
index 38fa825..2832a54 100644
--- a/tp/t/results/sectioning/protected_node_parentheses.pl
+++ b/tp/t/results/sectioning/protected_node_parentheses.pl
@@ -698,13 +698,11 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="#g_t_0028manual_0029-name" accesskey="n" rel="next">(manual) 
name</a> &nbsp; </p>
 </div>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 
-</div><hr>
-<div class="node" id="g_t_0028manual_0029-name">
-<div class="header">
+<hr>
+<span id="g_t_0028manual_0029-name"></span><div class="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>
@@ -712,7 +710,7 @@ Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, 
Up: <a href="#Top" ac
 
 <span id="g_t_0028manual2_0029-name2"></span>
 <p><a href="#g_t_0028manual2_0029-name2">(manual2) name2</a>.
-</p></div><hr>
+</p><hr>
 </div>
 
 
diff --git a/tp/t/results/sectioning/ref_to_top.pl 
b/tp/t/results/sectioning/ref_to_top.pl
index 2c25524..3aac265 100644
--- a/tp/t/results/sectioning/ref_to_top.pl
+++ b/tp/t/results/sectioning/ref_to_top.pl
@@ -299,11 +299,10 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 <div class="top" id="Top">
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <p>See <a href="#Top">top</a>.
-</p></div><hr></div>
+</p><hr></div>
 </div>
 
 
diff --git a/tp/t/results/sectioning/section_before_part.pl 
b/tp/t/results/sectioning/section_before_part.pl
index da8690f..0580863 100644
--- a/tp/t/results/sectioning/section_before_part.pl
+++ b/tp/t/results/sectioning/section_before_part.pl
@@ -239,11 +239,9 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="section" id="section">
-<h3 class="section">1 section</h3>
+<span id="section"></span><h3 class="section">1 section</h3>
 
-</div><div class="part" id="part">
-<h1 class="part">part</h1>
+<span id="part"></span><h1 class="part">part</h1>
 <hr>
 
 <div class="Contents_element" id="SEC_Contents">
@@ -257,7 +255,7 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 </div>
-</div><hr></div>
+<hr></div>
 
 
 
diff --git a/tp/t/results/sectioning/section_before_top.pl 
b/tp/t/results/sectioning/section_before_top.pl
index 7cee50c..a5492fa 100644
--- a/tp/t/results/sectioning/section_before_top.pl
+++ b/tp/t/results/sectioning/section_before_top.pl
@@ -577,20 +577,18 @@ ul.no-bullet {list-style: none}
 <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 class="node" id="section">
-<h3 class="section">1 section</h3>
+<span id="section"></span><h3 class="section">1 section</h3>
 
-</div><hr>
+<hr>
 </div>
 <div class="top" id="Top">
 <div class="header">
 <p>
 Next: <a href="#section-node" accesskey="n" rel="next">section</a> &nbsp; </p>
 </div>
-<div class="node" id="top">
-<h3 class="unnumberedsec">top</h3>
+<span id="top"></span><h3 class="unnumberedsec">top</h3>
 
-</div><hr>
+<hr>
 </div>
 
 
diff --git a/tp/t/results/sectioning/section_below_unnumbered.pl 
b/tp/t/results/sectioning/section_below_unnumbered.pl
index 2296c84..1b49141 100644
--- a/tp/t/results/sectioning/section_below_unnumbered.pl
+++ b/tp/t/results/sectioning/section_below_unnumbered.pl
@@ -937,8 +937,7 @@ ul.no-bullet {list-style: none}
 <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>
 </div>
-<div class="node" id="Top-1">
-<h1 class="top">Top</h1>
+<span id="Top-1"></span><h1 class="top">Top</h1>
 
 <p>Top node.
 </p>
@@ -957,31 +956,29 @@ Next: <a href="#Unn" accesskey="n" rel="next">Unn</a> 
&nbsp; [<a href="#SEC_Cont
 </ul>
 </div>
 </div>
-</div><hr>
+<hr>
 <div class="unnumbered" id="Unn">
 <div class="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>
 </div>
-<div class="node" id="Unn-1">
-<h2 class="unnumbered">Unn</h2>
+<span id="Unn-1"></span><h2 class="unnumbered">Unn</h2>
 
 
 <ul class="section-toc">
 <li><a href="#Sec" accesskey="1">Sec</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="section" id="Sec">
 <div class="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>
 </div>
-<div class="node" id="Sec-1">
-<h3 class="section">Sec</h3>
+<span id="Sec-1"></span><h3 class="section">Sec</h3>
 
 <p>Should be unnumbered.
 </p>
-</div><hr>
+<hr>
 </div>
 </div>
 </div>
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 bebe009..adb5245 100644
--- a/tp/t/results/sectioning/section_below_unnumbered_no_top.pl
+++ b/tp/t/results/sectioning/section_below_unnumbered_no_top.pl
@@ -171,14 +171,12 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="unnumbered" id="U">
-<h2 class="unnumbered">U</h2>
+<span id="U"></span><h2 class="unnumbered">U</h2>
 <ul class="section-toc">
 <li><a href="#S" accesskey="1">S</a></li>
 </ul>
-</div><div class="section" id="S">
-<h3 class="section">S</h3>
-</div><hr></div>
+<span id="S"></span><h3 class="section">S</h3>
+<hr></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 879a537..0fcc957 100644
--- a/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
+++ b/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
@@ -895,32 +895,29 @@ ul.no-bullet {list-style: none}
 <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>
 </div>
-<div class="node" id="section">
-<h3 class="section">1 section</h3>
+<span id="section"></span><h3 class="section">1 section</h3>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="chapter-node">
 <div class="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>
-<div class="node" id="chapter">
-<h3 class="section">2 chapter</h3>
+<span id="chapter"></span><h3 class="section">2 chapter</h3>
 
 
-</div><hr>
+<hr>
 </div>
 <div class="top" id="Top">
 <div class="header">
 <p>
 Next: <a href="#chapter-node" accesskey="n" rel="next">chapter</a> &nbsp; </p>
 </div>
-<div class="node" id="top">
-<h3 class="unnumberedsec">top</h3>
+<span id="top"></span><h3 class="unnumberedsec">top</h3>
 
 
-</div><hr>
+<hr>
 </div>
 
 
diff --git a/tp/t/results/sectioning/section_in_unnumbered_info.pl 
b/tp/t/results/sectioning/section_in_unnumbered_info.pl
index 8f679fc..a738c8e 100644
--- a/tp/t/results/sectioning/section_in_unnumbered_info.pl
+++ b/tp/t/results/sectioning/section_in_unnumbered_info.pl
@@ -8266,8 +8266,7 @@ ul.no-bullet {list-style: none}
 <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>
 </div>
-<div class="node" id="Test-section-in-unnumbered">
-<h1 class="top">Test section in unnumbered</h1>
+<span id="Test-section-in-unnumbered"></span><h1 class="top">Test section in 
unnumbered</h1>
 
 
 <p>Menu:
@@ -8337,29 +8336,27 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">chapter</a> &nbsp; [<a href="#
 </ul>
 </div>
 </div>
-</div><hr>
+<hr>
 <div class="chapter" id="chapter">
 <div class="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>
 </div>
-<div class="node" id="chapter-1">
-<h2 class="chapter">1 chapter</h2>
+<span id="chapter-1"></span><h2 class="chapter">1 chapter</h2>
 
 
 <ul class="section-toc">
 <li><a href="#section-in-chapter" accesskey="1">section in chapter</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="section" id="section-in-chapter">
 <div class="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>
 </div>
-<div class="node" id="section-in-chapter-1">
-<h3 class="section">1.1 section in chapter</h3>
+<span id="section-in-chapter-1"></span><h3 class="section">1.1 section in 
chapter</h3>
 
-</div><hr>
+<hr>
 </div>
 </div>
 <div class="unnumbered" id="unnumbered">
@@ -8367,23 +8364,21 @@ Up: <a href="#chapter" accesskey="u" 
rel="up">chapter</a> &nbsp; [<a href="#SEC_
 <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>
 </div>
-<div class="node" id="unnumbered-1">
-<h2 class="unnumbered">unnumbered</h2>
+<span id="unnumbered-1"></span><h2 class="unnumbered">unnumbered</h2>
 
 
 <ul class="section-toc">
 <li><a href="#section-in-unnumbered" accesskey="1">section in 
unnumbered</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="section" id="section-in-unnumbered">
 <div class="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>
 </div>
-<div class="node" id="section-in-unnumbered-1">
-<h3 class="section">section in unnumbered</h3>
+<span id="section-in-unnumbered-1"></span><h3 class="section">section in 
unnumbered</h3>
 
-</div><hr>
+<hr>
 </div>
 </div>
 <div class="chapter" id="chapter-2">
@@ -8391,22 +8386,20 @@ Up: <a href="#unnumbered" accesskey="u" 
rel="up">unnumbered</a> &nbsp; [<a href=
 <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>
 </div>
-<div class="node" id="chapter-2-1">
-<h2 class="chapter">2 chapter 2</h2>
+<span id="chapter-2-1"></span><h2 class="chapter">2 chapter 2</h2>
 
 
 <ul class="section-toc">
 <li><a href="#unnumberedsec-2" accesskey="1">unnumbered section 2</a></li>
 <li><a href="#unnumberedsec-2_002d1" accesskey="2">unnumberedsec 2-1</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="unnumberedsec" id="unnumberedsec-2">
 <div class="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>
 </div>
-<div class="node" id="unnumbered-section-2">
-<h3 class="unnumberedsec">unnumbered section 2</h3>
+<span id="unnumbered-section-2"></span><h3 class="unnumberedsec">unnumbered 
section 2</h3>
 
 
 <ul class="section-toc">
@@ -8415,46 +8408,42 @@ Next: <a href="#unnumberedsec-2_002d1" accesskey="n" 
rel="next">unnumberedsec 2-
 <li><a href="#unnumbered-sub2-2" accesskey="3">unnumbered subsection2 
2</a></li>
 <li><a href="#numbered-sub2-2" accesskey="4">numbered subsection2 2</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="unnumberedsubsec" id="unnumbered-sub-2">
 <div class="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>
 </div>
-<div class="node" id="unnumbered-subsection-2">
-<h4 class="unnumberedsubsec">unnumbered subsection 2</h4>
+<span id="unnumbered-subsection-2"></span><h4 
class="unnumberedsubsec">unnumbered subsection 2</h4>
 
-</div><hr>
+<hr>
 </div>
 <div class="subsection" id="numbered-sub-2">
 <div class="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>
 </div>
-<div class="node" id="numbered-subsection-2">
-<h4 class="subsection">numbered subsection 2</h4>
+<span id="numbered-subsection-2"></span><h4 class="subsection">numbered 
subsection 2</h4>
 
-</div><hr>
+<hr>
 </div>
 <div class="unnumberedsubsec" id="unnumbered-sub2-2">
 <div class="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>
 </div>
-<div class="node" id="unnumbered-subsection2-2">
-<h4 class="unnumberedsubsec">unnumbered subsection2 2</h4>
+<span id="unnumbered-subsection2-2"></span><h4 
class="unnumberedsubsec">unnumbered subsection2 2</h4>
 
-</div><hr>
+<hr>
 </div>
 <div class="subsection" id="numbered-sub2-2">
 <div class="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>
 </div>
-<div class="node" id="numbered-subsection2-2">
-<h4 class="subsection">numbered subsection2 2</h4>
+<span id="numbered-subsection2-2"></span><h4 class="subsection">numbered 
subsection2 2</h4>
 
-</div><hr>
+<hr>
 </div>
 </div>
 <div class="unnumberedsec" id="unnumberedsec-2_002d1">
@@ -8462,24 +8451,22 @@ Previous: <a href="#unnumbered-sub2-2" accesskey="p" 
rel="prev">unnumbered subse
 <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>
 </div>
-<div class="node" id="unnumberedsec-2_002d1-1">
-<h3 class="unnumberedsec">unnumberedsec 2-1</h3>
+<span id="unnumberedsec-2_002d1-1"></span><h3 
class="unnumberedsec">unnumberedsec 2-1</h3>
 
 
 <ul class="section-toc">
 <li><a href="#numbered-sub-2_002d1" accesskey="1">numbered subsection 
2-1</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="subsection" id="numbered-sub-2_002d1">
 <div class="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>
 </div>
-<div class="node" id="numbered-subsection-2_002d1">
-<h4 class="subsection">numbered subsection 2-1</h4>
+<span id="numbered-subsection-2_002d1"></span><h4 class="subsection">numbered 
subsection 2-1</h4>
 
 
-</div><hr>
+<hr>
 </div>
 </div>
 </div>
@@ -8488,8 +8475,7 @@ Up: <a href="#unnumberedsec-2_002d1" accesskey="u" 
rel="up">unnumberedsec 2-1</a
 <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>
 </div>
-<div class="node" id="chapter-3-1">
-<h2 class="chapter">3 chapter 3</h2>
+<span id="chapter-3-1"></span><h2 class="chapter">3 chapter 3</h2>
 
 
 <ul class="section-toc">
@@ -8499,14 +8485,13 @@ Next: <a href="#unnumbered-4" accesskey="n" 
rel="next">unnumbered  4</a>, Previo
 <li><a href="#section-3_002d3" accesskey="4">section 3-3</a></li>
 <li><a href="#unnumberedsec-3_002d4" accesskey="5">unnumberedsec 3-4</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="unnumberedsec" id="unnumberedsec-3">
 <div class="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>
 </div>
-<div class="node" id="unnumbered-section-3">
-<h3 class="unnumberedsec">unnumbered section 3</h3>
+<span id="unnumbered-section-3"></span><h3 class="unnumberedsec">unnumbered 
section 3</h3>
 
 
 <ul class="section-toc">
@@ -8515,46 +8500,42 @@ Next: <a href="#section-3_002d1" accesskey="n" 
rel="next">section 3-1</a>, Up: <
 <li><a href="#unnumbered-sub2-3" accesskey="3">unnumbered subsection2 
3</a></li>
 <li><a href="#numbered-sub2-3" accesskey="4">numbered subsection2 3</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="unnumberedsubsec" id="unnumbered-sub-3">
 <div class="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>
 </div>
-<div class="node" id="unnumbered-subsection-3">
-<h4 class="unnumberedsubsec">unnumbered subsection 3</h4>
+<span id="unnumbered-subsection-3"></span><h4 
class="unnumberedsubsec">unnumbered subsection 3</h4>
 
-</div><hr>
+<hr>
 </div>
 <div class="subsection" id="numbered-sub-3">
 <div class="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>
 </div>
-<div class="node" id="numbered-subsection-3">
-<h4 class="subsection">numbered subsection 3</h4>
+<span id="numbered-subsection-3"></span><h4 class="subsection">numbered 
subsection 3</h4>
 
-</div><hr>
+<hr>
 </div>
 <div class="unnumberedsubsec" id="unnumbered-sub2-3">
 <div class="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>
 </div>
-<div class="node" id="unnumbered-subsection2-3">
-<h4 class="unnumberedsubsec">unnumbered subsection2 3</h4>
+<span id="unnumbered-subsection2-3"></span><h4 
class="unnumberedsubsec">unnumbered subsection2 3</h4>
 
-</div><hr>
+<hr>
 </div>
 <div class="subsection" id="numbered-sub2-3">
 <div class="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>
 </div>
-<div class="node" id="numbered-subsection2-3">
-<h4 class="subsection">numbered subsection2 3</h4>
+<span id="numbered-subsection2-3"></span><h4 class="subsection">numbered 
subsection2 3</h4>
 
-</div><hr>
+<hr>
 </div>
 </div>
 <div class="section" id="section-3_002d1">
@@ -8562,33 +8543,30 @@ Previous: <a href="#unnumbered-sub2-3" accesskey="p" 
rel="prev">unnumbered subse
 <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>
 </div>
-<div class="node" id="section-3_002d1-1">
-<h3 class="section">3.1 section 3-1</h3>
+<span id="section-3_002d1-1"></span><h3 class="section">3.1 section 3-1</h3>
 
-</div><hr>
+<hr>
 </div>
 <div class="unnumberedsec" id="unnumberedsec-3_002d2">
 <div class="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>
 </div>
-<div class="node" id="unnumberedsec-3_002d2-1">
-<h3 class="unnumberedsec">unnumberedsec 3-2</h3>
+<span id="unnumberedsec-3_002d2-1"></span><h3 
class="unnumberedsec">unnumberedsec 3-2</h3>
 
 
 <ul class="section-toc">
 <li><a href="#numbered-sub-3_002d2" accesskey="1">numbered subsection 
3-2</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="subsection" id="numbered-sub-3_002d2">
 <div class="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>
 </div>
-<div class="node" id="numbered-subsection-3_002d2">
-<h4 class="subsection">numbered subsection 3-2</h4>
+<span id="numbered-subsection-3_002d2"></span><h4 class="subsection">numbered 
subsection 3-2</h4>
 
-</div><hr>
+<hr>
 </div>
 </div>
 <div class="section" id="section-3_002d3">
@@ -8596,23 +8574,21 @@ Up: <a href="#unnumberedsec-3_002d2" accesskey="u" 
rel="up">unnumberedsec 3-2</a
 <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>
 </div>
-<div class="node" id="section-3_002d3-1">
-<h3 class="section">3.2 section 3-3</h3>
+<span id="section-3_002d3-1"></span><h3 class="section">3.2 section 3-3</h3>
 
 
 <ul class="section-toc">
 <li><a href="#subsection-3_002d3" accesskey="1">subsection 3-3</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="subsection" id="subsection-3_002d3">
 <div class="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>
 </div>
-<div class="node" id="subsection-3_002d3-1">
-<h4 class="subsection">3.2.1 subsection 3-3</h4>
+<span id="subsection-3_002d3-1"></span><h4 class="subsection">3.2.1 subsection 
3-3</h4>
 
-</div><hr>
+<hr>
 </div>
 </div>
 <div class="unnumberedsec" id="unnumberedsec-3_002d4">
@@ -8620,23 +8596,21 @@ Up: <a href="#section-3_002d3" accesskey="u" 
rel="up">section 3-3</a> &nbsp; [<a
 <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>
 </div>
-<div class="node" id="unnumberedsec-3_002d4-1">
-<h3 class="unnumberedsec">unnumberedsec 3-4</h3>
+<span id="unnumberedsec-3_002d4-1"></span><h3 
class="unnumberedsec">unnumberedsec 3-4</h3>
 
 
 <ul class="section-toc">
 <li><a href="#numbered-sub-3_002d4" accesskey="1">numbered subsection 
3-4</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="subsection" id="numbered-sub-3_002d4">
 <div class="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>
 </div>
-<div class="node" id="numbered-subsection-3_002d4">
-<h4 class="subsection">numbered subsection 3-4</h4>
+<span id="numbered-subsection-3_002d4"></span><h4 class="subsection">numbered 
subsection 3-4</h4>
 
-</div><hr>
+<hr>
 </div>
 </div>
 </div>
@@ -8645,21 +8619,19 @@ Up: <a href="#unnumberedsec-3_002d4" accesskey="u" 
rel="up">unnumberedsec 3-4</a
 <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>
 </div>
-<div class="node" id="unnumbered-4-1">
-<h2 class="unnumbered">unnumbered  4</h2>
+<span id="unnumbered-4-1"></span><h2 class="unnumbered">unnumbered  4</h2>
 
 
 <ul class="section-toc">
 <li><a href="#unnumberedsec-4" accesskey="1">unnumbered section 4</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="unnumberedsec" id="unnumberedsec-4">
 <div class="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>
 </div>
-<div class="node" id="unnumbered-section-4">
-<h3 class="unnumberedsec">unnumbered section 4</h3>
+<span id="unnumbered-section-4"></span><h3 class="unnumberedsec">unnumbered 
section 4</h3>
 
 
 <ul class="section-toc">
@@ -8668,45 +8640,41 @@ Up: <a href="#unnumbered-4" accesskey="u" 
rel="up">unnumbered  4</a> &nbsp; [<a
 <li><a href="#unnumbered-sub2-4" accesskey="3">unnumbered subsection2 
4</a></li>
 <li><a href="#numbered-sub2-4" accesskey="4">numbered subsection2 4</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="unnumberedsubsec" id="unnumbered-sub-4">
 <div class="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>
 </div>
-<div class="node" id="unnumbered-subsection-4">
-<h4 class="unnumberedsubsec">unnumbered subsection 4</h4>
+<span id="unnumbered-subsection-4"></span><h4 
class="unnumberedsubsec">unnumbered subsection 4</h4>
 
-</div><hr>
+<hr>
 </div>
 <div class="subsection" id="numbered-sub-4">
 <div class="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>
 </div>
-<div class="node" id="numbered-subsection-4">
-<h4 class="subsection">numbered subsection 4</h4>
+<span id="numbered-subsection-4"></span><h4 class="subsection">numbered 
subsection 4</h4>
 
-</div><hr>
+<hr>
 </div>
 <div class="unnumberedsubsec" id="unnumbered-sub2-4">
 <div class="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>
 </div>
-<div class="node" id="unnumbered-subsection2-4">
-<h4 class="unnumberedsubsec">unnumbered subsection2 4</h4>
+<span id="unnumbered-subsection2-4"></span><h4 
class="unnumberedsubsec">unnumbered subsection2 4</h4>
 
-</div><hr>
+<hr>
 </div>
 <div class="subsection" id="numbered-sub2-4">
 <div class="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>
 </div>
-<div class="node" id="numbered-subsection2-4">
-<h4 class="subsection">numbered subsection2 4</h4>
-</div><hr>
+<span id="numbered-subsection2-4"></span><h4 class="subsection">numbered 
subsection2 4</h4>
+<hr>
 </div>
 </div>
 </div>
diff --git a/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl 
b/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
index 5fa784a..06ef739 100644
--- a/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
+++ b/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
@@ -8088,8 +8088,7 @@ ul.no-bullet {list-style: none}
 <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>
 </div>
-<div class="node" id="Test-section-in-unnumbered">
-<h1 class="top">Test section in unnumbered</h1>
+<span id="Test-section-in-unnumbered"></span><h1 class="top">Test section in 
unnumbered</h1>
 
 
 <p>Menu:
@@ -8159,29 +8158,27 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">chapter</a> &nbsp; [<a href="#
 </ul>
 </div>
 </div>
-</div><hr>
+<hr>
 <div class="chapter" id="chapter">
 <div class="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>
 </div>
-<div class="node" id="chapter-1">
-<h2 class="chapter">1 chapter</h2>
+<span id="chapter-1"></span><h2 class="chapter">1 chapter</h2>
 
 
 <ul class="section-toc">
 <li><a href="#section-in-chapter" accesskey="1">section in chapter</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="section" id="section-in-chapter">
 <div class="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>
 </div>
-<div class="node" id="section-in-chapter-1">
-<h3 class="section">1.1 section in chapter</h3>
+<span id="section-in-chapter-1"></span><h3 class="section">1.1 section in 
chapter</h3>
 
-</div><hr>
+<hr>
 </div>
 </div>
 <div class="unnumbered" id="unnumbered">
@@ -8189,23 +8186,21 @@ Up: <a href="#chapter" accesskey="u" 
rel="up">chapter</a> &nbsp; [<a href="#SEC_
 <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>
 </div>
-<div class="node" id="unnumbered-1">
-<h2 class="unnumbered">unnumbered</h2>
+<span id="unnumbered-1"></span><h2 class="unnumbered">unnumbered</h2>
 
 
 <ul class="section-toc">
 <li><a href="#section-in-unnumbered" accesskey="1">section in 
unnumbered</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="section" id="section-in-unnumbered">
 <div class="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>
 </div>
-<div class="node" id="section-in-unnumbered-1">
-<h3 class="section">section in unnumbered</h3>
+<span id="section-in-unnumbered-1"></span><h3 class="section">section in 
unnumbered</h3>
 
-</div><hr>
+<hr>
 </div>
 </div>
 <div class="chapter" id="chapter-2">
@@ -8213,22 +8208,20 @@ Up: <a href="#unnumbered" accesskey="u" 
rel="up">unnumbered</a> &nbsp; [<a href=
 <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>
 </div>
-<div class="node" id="chapter-2-1">
-<h2 class="chapter">2 chapter 2</h2>
+<span id="chapter-2-1"></span><h2 class="chapter">2 chapter 2</h2>
 
 
 <ul class="section-toc">
 <li><a href="#unnumberedsec-2" accesskey="1">unnumbered section 2</a></li>
 <li><a href="#unnumberedsec-2_002d1" accesskey="2">unnumberedsec 2-1</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="unnumberedsec" id="unnumberedsec-2">
 <div class="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>
 </div>
-<div class="node" id="unnumbered-section-2">
-<h3 class="unnumberedsec">unnumbered section 2</h3>
+<span id="unnumbered-section-2"></span><h3 class="unnumberedsec">unnumbered 
section 2</h3>
 
 
 <ul class="section-toc">
@@ -8237,46 +8230,42 @@ Next: <a href="#unnumberedsec-2_002d1" accesskey="n" 
rel="next">unnumberedsec 2-
 <li><a href="#unnumbered-sub2-2" accesskey="3">unnumbered subsection2 
2</a></li>
 <li><a href="#numbered-sub2-2" accesskey="4">numbered subsection2 2</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="unnumberedsubsec" id="unnumbered-sub-2">
 <div class="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>
 </div>
-<div class="node" id="unnumbered-subsection-2">
-<h4 class="unnumberedsubsec">unnumbered subsection 2</h4>
+<span id="unnumbered-subsection-2"></span><h4 
class="unnumberedsubsec">unnumbered subsection 2</h4>
 
-</div><hr>
+<hr>
 </div>
 <div class="subsection" id="numbered-sub-2">
 <div class="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>
 </div>
-<div class="node" id="numbered-subsection-2">
-<h4 class="subsection">numbered subsection 2</h4>
+<span id="numbered-subsection-2"></span><h4 class="subsection">numbered 
subsection 2</h4>
 
-</div><hr>
+<hr>
 </div>
 <div class="unnumberedsubsec" id="unnumbered-sub2-2">
 <div class="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>
 </div>
-<div class="node" id="unnumbered-subsection2-2">
-<h4 class="unnumberedsubsec">unnumbered subsection2 2</h4>
+<span id="unnumbered-subsection2-2"></span><h4 
class="unnumberedsubsec">unnumbered subsection2 2</h4>
 
-</div><hr>
+<hr>
 </div>
 <div class="subsection" id="numbered-sub2-2">
 <div class="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>
 </div>
-<div class="node" id="numbered-subsection2-2">
-<h4 class="subsection">numbered subsection2 2</h4>
+<span id="numbered-subsection2-2"></span><h4 class="subsection">numbered 
subsection2 2</h4>
 
-</div><hr>
+<hr>
 </div>
 </div>
 <div class="unnumberedsec" id="unnumberedsec-2_002d1">
@@ -8284,24 +8273,22 @@ Previous: <a href="#unnumbered-sub2-2" accesskey="p" 
rel="prev">unnumbered subse
 <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>
 </div>
-<div class="node" id="unnumberedsec-2_002d1-1">
-<h3 class="unnumberedsec">unnumberedsec 2-1</h3>
+<span id="unnumberedsec-2_002d1-1"></span><h3 
class="unnumberedsec">unnumberedsec 2-1</h3>
 
 
 <ul class="section-toc">
 <li><a href="#numbered-sub-2_002d1" accesskey="1">numbered subsection 
2-1</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="subsection" id="numbered-sub-2_002d1">
 <div class="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>
 </div>
-<div class="node" id="numbered-subsection-2_002d1">
-<h4 class="subsection">numbered subsection 2-1</h4>
+<span id="numbered-subsection-2_002d1"></span><h4 class="subsection">numbered 
subsection 2-1</h4>
 
 
-</div><hr>
+<hr>
 </div>
 </div>
 </div>
@@ -8310,8 +8297,7 @@ Up: <a href="#unnumberedsec-2_002d1" accesskey="u" 
rel="up">unnumberedsec 2-1</a
 <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>
 </div>
-<div class="node" id="chapter-3-1">
-<h2 class="chapter">3 chapter 3</h2>
+<span id="chapter-3-1"></span><h2 class="chapter">3 chapter 3</h2>
 
 
 <ul class="section-toc">
@@ -8321,14 +8307,13 @@ Next: <a href="#unnumbered-4" accesskey="n" 
rel="next">unnumbered  4</a>, Previo
 <li><a href="#section-3_002d3" accesskey="4">section 3-3</a></li>
 <li><a href="#unnumberedsec-3_002d4" accesskey="5">unnumberedsec 3-4</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="unnumberedsec" id="unnumberedsec-3">
 <div class="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>
 </div>
-<div class="node" id="unnumbered-section-3">
-<h3 class="unnumberedsec">unnumbered section 3</h3>
+<span id="unnumbered-section-3"></span><h3 class="unnumberedsec">unnumbered 
section 3</h3>
 
 
 <ul class="section-toc">
@@ -8337,46 +8322,42 @@ Next: <a href="#section-3_002d1" accesskey="n" 
rel="next">section 3-1</a>, Up: <
 <li><a href="#unnumbered-sub2-3" accesskey="3">unnumbered subsection2 
3</a></li>
 <li><a href="#numbered-sub2-3" accesskey="4">numbered subsection2 3</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="unnumberedsubsec" id="unnumbered-sub-3">
 <div class="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>
 </div>
-<div class="node" id="unnumbered-subsection-3">
-<h4 class="unnumberedsubsec">unnumbered subsection 3</h4>
+<span id="unnumbered-subsection-3"></span><h4 
class="unnumberedsubsec">unnumbered subsection 3</h4>
 
-</div><hr>
+<hr>
 </div>
 <div class="subsection" id="numbered-sub-3">
 <div class="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>
 </div>
-<div class="node" id="numbered-subsection-3">
-<h4 class="subsection">numbered subsection 3</h4>
+<span id="numbered-subsection-3"></span><h4 class="subsection">numbered 
subsection 3</h4>
 
-</div><hr>
+<hr>
 </div>
 <div class="unnumberedsubsec" id="unnumbered-sub2-3">
 <div class="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>
 </div>
-<div class="node" id="unnumbered-subsection2-3">
-<h4 class="unnumberedsubsec">unnumbered subsection2 3</h4>
+<span id="unnumbered-subsection2-3"></span><h4 
class="unnumberedsubsec">unnumbered subsection2 3</h4>
 
-</div><hr>
+<hr>
 </div>
 <div class="subsection" id="numbered-sub2-3">
 <div class="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>
 </div>
-<div class="node" id="numbered-subsection2-3">
-<h4 class="subsection">numbered subsection2 3</h4>
+<span id="numbered-subsection2-3"></span><h4 class="subsection">numbered 
subsection2 3</h4>
 
-</div><hr>
+<hr>
 </div>
 </div>
 <div class="section" id="section-3_002d1">
@@ -8384,33 +8365,30 @@ Previous: <a href="#unnumbered-sub2-3" accesskey="p" 
rel="prev">unnumbered subse
 <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>
 </div>
-<div class="node" id="section-3_002d1-1">
-<h3 class="section">3.1 section 3-1</h3>
+<span id="section-3_002d1-1"></span><h3 class="section">3.1 section 3-1</h3>
 
-</div><hr>
+<hr>
 </div>
 <div class="unnumberedsec" id="unnumberedsec-3_002d2">
 <div class="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>
 </div>
-<div class="node" id="unnumberedsec-3_002d2-1">
-<h3 class="unnumberedsec">unnumberedsec 3-2</h3>
+<span id="unnumberedsec-3_002d2-1"></span><h3 
class="unnumberedsec">unnumberedsec 3-2</h3>
 
 
 <ul class="section-toc">
 <li><a href="#numbered-sub-3_002d2" accesskey="1">numbered subsection 
3-2</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="subsection" id="numbered-sub-3_002d2">
 <div class="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>
 </div>
-<div class="node" id="numbered-subsection-3_002d2">
-<h4 class="subsection">numbered subsection 3-2</h4>
+<span id="numbered-subsection-3_002d2"></span><h4 class="subsection">numbered 
subsection 3-2</h4>
 
-</div><hr>
+<hr>
 </div>
 </div>
 <div class="section" id="section-3_002d3">
@@ -8418,23 +8396,21 @@ Up: <a href="#unnumberedsec-3_002d2" accesskey="u" 
rel="up">unnumberedsec 3-2</a
 <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>
 </div>
-<div class="node" id="section-3_002d3-1">
-<h3 class="section">3.2 section 3-3</h3>
+<span id="section-3_002d3-1"></span><h3 class="section">3.2 section 3-3</h3>
 
 
 <ul class="section-toc">
 <li><a href="#subsection-3_002d3" accesskey="1">subsection 3-3</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="subsection" id="subsection-3_002d3">
 <div class="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>
 </div>
-<div class="node" id="subsection-3_002d3-1">
-<h4 class="subsection">3.2.1 subsection 3-3</h4>
+<span id="subsection-3_002d3-1"></span><h4 class="subsection">3.2.1 subsection 
3-3</h4>
 
-</div><hr>
+<hr>
 </div>
 </div>
 <div class="unnumberedsec" id="unnumberedsec-3_002d4">
@@ -8442,23 +8418,21 @@ Up: <a href="#section-3_002d3" accesskey="u" 
rel="up">section 3-3</a> &nbsp; [<a
 <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>
 </div>
-<div class="node" id="unnumberedsec-3_002d4-1">
-<h3 class="unnumberedsec">unnumberedsec 3-4</h3>
+<span id="unnumberedsec-3_002d4-1"></span><h3 
class="unnumberedsec">unnumberedsec 3-4</h3>
 
 
 <ul class="section-toc">
 <li><a href="#numbered-sub-3_002d4" accesskey="1">numbered subsection 
3-4</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="subsection" id="numbered-sub-3_002d4">
 <div class="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>
 </div>
-<div class="node" id="numbered-subsection-3_002d4">
-<h4 class="subsection">numbered subsection 3-4</h4>
+<span id="numbered-subsection-3_002d4"></span><h4 class="subsection">numbered 
subsection 3-4</h4>
 
-</div><hr>
+<hr>
 </div>
 </div>
 </div>
@@ -8467,21 +8441,19 @@ Up: <a href="#unnumberedsec-3_002d4" accesskey="u" 
rel="up">unnumberedsec 3-4</a
 <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>
 </div>
-<div class="node" id="unnumbered-4-1">
-<h2 class="unnumbered">unnumbered  4</h2>
+<span id="unnumbered-4-1"></span><h2 class="unnumbered">unnumbered  4</h2>
 
 
 <ul class="section-toc">
 <li><a href="#unnumberedsec-4" accesskey="1">unnumbered section 4</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="unnumberedsec" id="unnumberedsec-4">
 <div class="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>
 </div>
-<div class="node" id="unnumbered-section-4">
-<h3 class="unnumberedsec">unnumbered section 4</h3>
+<span id="unnumbered-section-4"></span><h3 class="unnumberedsec">unnumbered 
section 4</h3>
 
 
 <ul class="section-toc">
@@ -8490,45 +8462,41 @@ Up: <a href="#unnumbered-4" accesskey="u" 
rel="up">unnumbered  4</a> &nbsp; [<a
 <li><a href="#unnumbered-sub2-4" accesskey="3">unnumbered subsection2 
4</a></li>
 <li><a href="#numbered-sub2-4" accesskey="4">numbered subsection2 4</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="unnumberedsubsec" id="unnumbered-sub-4">
 <div class="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>
 </div>
-<div class="node" id="unnumbered-subsection-4">
-<h4 class="unnumberedsubsec">unnumbered subsection 4</h4>
+<span id="unnumbered-subsection-4"></span><h4 
class="unnumberedsubsec">unnumbered subsection 4</h4>
 
-</div><hr>
+<hr>
 </div>
 <div class="subsection" id="numbered-sub-4">
 <div class="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>
 </div>
-<div class="node" id="numbered-subsection-4">
-<h4 class="subsection">numbered subsection 4</h4>
+<span id="numbered-subsection-4"></span><h4 class="subsection">numbered 
subsection 4</h4>
 
-</div><hr>
+<hr>
 </div>
 <div class="unnumberedsubsec" id="unnumbered-sub2-4">
 <div class="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>
 </div>
-<div class="node" id="unnumbered-subsection2-4">
-<h4 class="unnumberedsubsec">unnumbered subsection2 4</h4>
+<span id="unnumbered-subsection2-4"></span><h4 
class="unnumberedsubsec">unnumbered subsection2 4</h4>
 
-</div><hr>
+<hr>
 </div>
 <div class="subsection" id="numbered-sub2-4">
 <div class="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>
 </div>
-<div class="node" id="numbered-subsection2-4">
-<h4 class="subsection">numbered subsection2 4</h4>
-</div><hr>
+<span id="numbered-subsection2-4"></span><h4 class="subsection">numbered 
subsection2 4</h4>
+<hr>
 </div>
 </div>
 </div>
diff --git a/tp/t/results/sectioning/section_node_before_part.pl 
b/tp/t/results/sectioning/section_node_before_part.pl
index 4d305b8..fb78736 100644
--- a/tp/t/results/sectioning/section_node_before_part.pl
+++ b/tp/t/results/sectioning/section_node_before_part.pl
@@ -304,13 +304,11 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 <div class="section" id="Top">
-<div class="node" id="section">
-<h3 class="section">1 section</h3>
+<span id="section"></span><h3 class="section">1 section</h3>
 
-</div><div class="part" id="part">
-<h1 class="part">part</h1>
+<span id="part"></span><h1 class="part">part</h1>
 <hr>
-</div><hr></div>
+<hr></div>
 </div>
 
 
diff --git a/tp/t/results/sectioning/sections_test.pl 
b/tp/t/results/sectioning/sections_test.pl
index 48a94a7..42df79e 100644
--- a/tp/t/results/sectioning/sections_test.pl
+++ b/tp/t/results/sectioning/sections_test.pl
@@ -760,35 +760,29 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="top" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <ul class="section-toc">
 <li><a href="#chapter" accesskey="1">chapter</a></li>
 </ul>
-</div><div class="chapter" id="chapter">
-<h2 class="chapter">1 chapter</h2>
+<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
 
 <ul class="section-toc">
 <li><a href="#section" accesskey="1">section</a></li>
 </ul>
-</div><div class="section" id="section">
-<h3 class="section">1.1 section</h3>
+<span id="section"></span><h3 class="section">1.1 section</h3>
 
 <ul class="section-toc">
 <li><a href="#subsection" accesskey="1">subsection</a></li>
 </ul>
-</div><div class="subsection" id="subsection">
-<h4 class="subsection">1.1.1 subsection</h4>
+<span id="subsection"></span><h4 class="subsection">1.1.1 subsection</h4>
 
 <ul class="section-toc">
 <li><a href="#subsubsection" accesskey="1">subsubsection</a></li>
 </ul>
-</div><div class="subsubsection" id="subsubsection">
-<h4 class="subsubsection">1.1.1.1 subsubsection</h4>
+<span id="subsubsection"></span><h4 class="subsubsection">1.1.1.1 
subsubsection</h4>
 
-</div><div class="part" id="part">
-<h1 class="part">part</h1>
+<span id="part"></span><h1 class="part">part</h1>
 <hr>
 
 <ul class="section-toc">
@@ -796,24 +790,19 @@ ul.no-bullet {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><div class="chapter" id="chapter-in-part">
-<h2 class="chapter">2 chapter in part</h2>
+<span id="chapter-in-part"></span><h2 class="chapter">2 chapter in part</h2>
 
-</div><div class="chapter" id="second-chapter-in-part">
-<h2 class="chapter">3 second chapter in part</h2>
+<span id="second-chapter-in-part"></span><h2 class="chapter">3 second chapter 
in part</h2>
 
-</div><div class="unnumbered" id="unnumbered">
-<h2 class="unnumbered">unnumbered</h2>
+<span id="unnumbered"></span><h2 class="unnumbered">unnumbered</h2>
 
-</div><div class="appendix" id="appendix">
-<h2 class="appendix">Appendix A appendix</h2>
+<span id="appendix"></span><h2 class="appendix">Appendix A appendix</h2>
 
 <ul class="section-toc">
 <li><a href="#appendixsec" accesskey="1">appendixsec</a></li>
 </ul>
-</div><div class="appendixsec" id="appendixsec">
-<h3 class="appendixsec">A.1 appendixsec</h3>
-</div><hr></div>
+<span id="appendixsec"></span><h3 class="appendixsec">A.1 appendixsec</h3>
+<hr></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 2d5a7b0..d77ce34 100644
--- a/tp/t/results/sectioning/sections_test_no_use_nodes.pl
+++ b/tp/t/results/sectioning/sections_test_no_use_nodes.pl
@@ -761,8 +761,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="top" id="top">
-<div class="header">
+<span id="top"></span><div class="header">
 <p>
 Next: <a href="#chapter-in-part" accesskey="n" rel="next">chapter in part</a> 
&nbsp; </p>
 </div>
@@ -771,9 +770,8 @@ Next: <a href="#chapter-in-part" accesskey="n" 
rel="next">chapter in part</a> &n
 <ul class="section-toc">
 <li><a href="#chapter" accesskey="1">chapter</a></li>
 </ul>
-</div><hr>
-<div class="chapter" id="chapter">
-<div class="header">
+<hr>
+<span id="chapter"></span><div class="header">
 <p>
  Up : <a href="#top" accesskey="u" rel="up">top</a> &nbsp; </p>
 </div>
@@ -782,9 +780,8 @@ Next: <a href="#chapter-in-part" accesskey="n" 
rel="next">chapter in part</a> &n
 <ul class="section-toc">
 <li><a href="#section" accesskey="1">section</a></li>
 </ul>
-</div><hr>
-<div class="section" id="section">
-<div class="header">
+<hr>
+<span id="section"></span><div class="header">
 <p>
  Up : <a href="#chapter" accesskey="u" rel="up">chapter</a> &nbsp; </p>
 </div>
@@ -793,9 +790,8 @@ Next: <a href="#chapter-in-part" accesskey="n" 
rel="next">chapter in part</a> &n
 <ul class="section-toc">
 <li><a href="#subsection" accesskey="1">subsection</a></li>
 </ul>
-</div><hr>
-<div class="subsection" id="subsection">
-<div class="header">
+<hr>
+<span id="subsection"></span><div class="header">
 <p>
  Up : <a href="#section" accesskey="u" rel="up">section</a> &nbsp; </p>
 </div>
@@ -804,17 +800,15 @@ Next: <a href="#chapter-in-part" accesskey="n" 
rel="next">chapter in part</a> &n
 <ul class="section-toc">
 <li><a href="#subsubsection" accesskey="1">subsubsection</a></li>
 </ul>
-</div><hr>
-<div class="subsubsection" id="subsubsection">
-<div class="header">
+<hr>
+<span id="subsubsection"></span><div class="header">
 <p>
  Up : <a href="#subsection" accesskey="u" rel="up">subsection</a> &nbsp; </p>
 </div>
 <h4 class="subsubsection">1.1.1.1 subsubsection</h4>
 
-</div><hr>
-<div class="part" id="part">
-<div class="header">
+<hr>
+<span id="part"></span><div class="header">
 <p>
 Next: <a href="#second-chapter-in-part" accesskey="n" rel="next">second 
chapter in part</a> &nbsp; </p>
 </div>
@@ -826,28 +820,24 @@ 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><div class="chapter" id="chapter-in-part">
-<h2 class="chapter">2 chapter in part</h2>
+<span id="chapter-in-part"></span><h2 class="chapter">2 chapter in part</h2>
 
-</div><hr>
-<div class="chapter" id="second-chapter-in-part">
-<div class="header">
+<hr>
+<span id="second-chapter-in-part"></span><div class="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>
 </div>
 <h2 class="chapter">3 second chapter in part</h2>
 
-</div><hr>
-<div class="unnumbered" id="unnumbered">
-<div class="header">
+<hr>
+<span id="unnumbered"></span><div class="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>
 </div>
 <h2 class="unnumbered">unnumbered</h2>
 
-</div><hr>
-<div class="appendix" id="appendix">
-<div class="header">
+<hr>
+<span id="appendix"></span><div class="header">
 <p>
 Prev: <a href="#chapter-in-part" accesskey="p" rel="prev">chapter in part</a> 
&nbsp; </p>
 </div>
@@ -856,14 +846,13 @@ Prev: <a href="#chapter-in-part" accesskey="p" 
rel="prev">chapter in part</a> &n
 <ul class="section-toc">
 <li><a href="#appendixsec" accesskey="1">appendixsec</a></li>
 </ul>
-</div><hr>
-<div class="appendixsec" id="appendixsec">
-<div class="header">
+<hr>
+<span id="appendixsec"></span><div class="header">
 <p>
  Up : <a href="#appendix" accesskey="u" rel="up">appendix</a> &nbsp; </p>
 </div>
 <h3 class="appendixsec">A.1 appendixsec</h3>
-</div><hr>
+<hr>
 
 
 
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 7bf7f11..5750f07 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
@@ -761,8 +761,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="top" id="top">
-<div class="header">
+<span id="top"></span><div class="header">
 <p>
  &nbsp; </p>
 </div>
@@ -771,9 +770,8 @@ ul.no-bullet {list-style: none}
 <ul class="section-toc">
 <li><a href="#chapter" accesskey="1">chapter</a></li>
 </ul>
-</div><hr>
-<div class="chapter" id="chapter">
-<div class="header">
+<hr>
+<span id="chapter"></span><div class="header">
 <p>
  &nbsp; </p>
 </div>
@@ -782,9 +780,8 @@ ul.no-bullet {list-style: none}
 <ul class="section-toc">
 <li><a href="#section" accesskey="1">section</a></li>
 </ul>
-</div><hr>
-<div class="section" id="section">
-<div class="header">
+<hr>
+<span id="section"></span><div class="header">
 <p>
  &nbsp; </p>
 </div>
@@ -793,9 +790,8 @@ ul.no-bullet {list-style: none}
 <ul class="section-toc">
 <li><a href="#subsection" accesskey="1">subsection</a></li>
 </ul>
-</div><hr>
-<div class="subsection" id="subsection">
-<div class="header">
+<hr>
+<span id="subsection"></span><div class="header">
 <p>
  &nbsp; </p>
 </div>
@@ -804,17 +800,15 @@ ul.no-bullet {list-style: none}
 <ul class="section-toc">
 <li><a href="#subsubsection" accesskey="1">subsubsection</a></li>
 </ul>
-</div><hr>
-<div class="subsubsection" id="subsubsection">
-<div class="header">
+<hr>
+<span id="subsubsection"></span><div class="header">
 <p>
  &nbsp; </p>
 </div>
 <h4 class="subsubsection">1.1.1.1 subsubsection</h4>
 
-</div><hr>
-<div class="part" id="part">
-<div class="header">
+<hr>
+<span id="part"></span><div class="header">
 <p>
  &nbsp; </p>
 </div>
@@ -826,28 +820,24 @@ ul.no-bullet {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><div class="chapter" id="chapter-in-part">
-<h2 class="chapter">2 chapter in part</h2>
+<span id="chapter-in-part"></span><h2 class="chapter">2 chapter in part</h2>
 
-</div><hr>
-<div class="chapter" id="second-chapter-in-part">
-<div class="header">
+<hr>
+<span id="second-chapter-in-part"></span><div class="header">
 <p>
  &nbsp; </p>
 </div>
 <h2 class="chapter">3 second chapter in part</h2>
 
-</div><hr>
-<div class="unnumbered" id="unnumbered">
-<div class="header">
+<hr>
+<span id="unnumbered"></span><div class="header">
 <p>
  &nbsp; </p>
 </div>
 <h2 class="unnumbered">unnumbered</h2>
 
-</div><hr>
-<div class="appendix" id="appendix">
-<div class="header">
+<hr>
+<span id="appendix"></span><div class="header">
 <p>
  &nbsp; </p>
 </div>
@@ -856,14 +846,13 @@ ul.no-bullet {list-style: none}
 <ul class="section-toc">
 <li><a href="#appendixsec" accesskey="1">appendixsec</a></li>
 </ul>
-</div><hr>
-<div class="appendixsec" id="appendixsec">
-<div class="header">
+<hr>
+<span id="appendixsec"></span><div class="header">
 <p>
  &nbsp; </p>
 </div>
 <h3 class="appendixsec">A.1 appendixsec</h3>
-</div><hr>
+<hr>
 
 
 
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 5a63f7d..e068c24 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
@@ -317,10 +317,9 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 <div class="top" id="Top">
-<div class="node" id="In-top-">
-<h1 class="top">In top </h1>
+<span id="In-top-"></span><h1 class="top">In top </h1>
 
-</div><hr></div>
+<hr></div>
 </div>
 
 
diff --git a/tp/t/results/sectioning/shortcontents.pl 
b/tp/t/results/sectioning/shortcontents.pl
index 32f5b0e..66dd203 100644
--- a/tp/t/results/sectioning/shortcontents.pl
+++ b/tp/t/results/sectioning/shortcontents.pl
@@ -797,8 +797,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="top" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <div class="Overview_element" id="SEC_Overview">
 <h2 class="shortcontents-heading">Short Table of Contents</h2>
@@ -818,29 +817,24 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 </div>
-</div><div class="chapter" id="chapter">
-<h2 class="chapter">1 chapter</h2>
+<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
 
 <ul class="section-toc">
 <li><a href="#section" accesskey="1">section</a></li>
 </ul>
-</div><div class="section" id="section">
-<h3 class="section">1.1 section</h3>
+<span id="section"></span><h3 class="section">1.1 section</h3>
 
 <ul class="section-toc">
 <li><a href="#subsection" accesskey="1">subsection</a></li>
 </ul>
-</div><div class="subsection" id="subsection">
-<h4 class="subsection">1.1.1 subsection</h4>
+<span id="subsection"></span><h4 class="subsection">1.1.1 subsection</h4>
 
 <ul class="section-toc">
 <li><a href="#subsubsection" accesskey="1">subsubsection</a></li>
 </ul>
-</div><div class="subsubsection" id="subsubsection">
-<h4 class="subsubsection">1.1.1.1 subsubsection</h4>
+<span id="subsubsection"></span><h4 class="subsubsection">1.1.1.1 
subsubsection</h4>
 
-</div><div class="part" id="part">
-<h1 class="part">part</h1>
+<span id="part"></span><h1 class="part">part</h1>
 <hr>
 
 <ul class="section-toc">
@@ -848,25 +842,20 @@ ul.no-bullet {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><div class="chapter" id="chapter-in-part">
-<h2 class="chapter">2 chapter in part</h2>
+<span id="chapter-in-part"></span><h2 class="chapter">2 chapter in part</h2>
 
-</div><div class="chapter" id="second-chapter-in-part">
-<h2 class="chapter">3 second chapter in part</h2>
+<span id="second-chapter-in-part"></span><h2 class="chapter">3 second chapter 
in part</h2>
 
-</div><div class="unnumbered" id="unnumbered">
-<h2 class="unnumbered">unnumbered</h2>
+<span id="unnumbered"></span><h2 class="unnumbered">unnumbered</h2>
 
-</div><div class="appendix" id="appendix">
-<h2 class="appendix">Appendix A appendix</h2>
+<span id="appendix"></span><h2 class="appendix">Appendix A appendix</h2>
 
 <ul class="section-toc">
 <li><a href="#appendixsec" accesskey="1">appendixsec</a></li>
 </ul>
-</div><div class="appendixsec" id="appendixsec">
-<h3 class="appendixsec">A.1 appendixsec</h3>
+<span id="appendixsec"></span><h3 class="appendixsec">A.1 appendixsec</h3>
 
-</div><hr></div>
+<hr></div>
 
 
 
diff --git a/tp/t/results/sectioning/space_in_node.pl 
b/tp/t/results/sectioning/space_in_node.pl
index 67461e7..fd0f8cf 100644
--- a/tp/t/results/sectioning/space_in_node.pl
+++ b/tp/t/results/sectioning/space_in_node.pl
@@ -745,38 +745,34 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="node" id="Top">
-<div class="header">
+<span id="Top"></span><div class="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>
 
 
-</div><hr>
-<div class="node" id="Chap-first-here">
-<div class="header">
+<hr>
+<span id="Chap-first-here"></span><div class="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>
 
-</div><hr>
-<div class="node" id="Test-title">
-<div class="header">
+<hr>
+<span id="Test-title"></span><div class="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>
 
-</div><hr>
-<div class="node" id="Last-with-spaces">
-<div class="header">
+<hr>
+<span id="Last-with-spaces"></span><div class="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>
-</div><hr>
+<hr>
 
 
 
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 0928c35..95906c4 100644
--- a/tp/t/results/sectioning/top_no_argument_and_content.pl
+++ b/tp/t/results/sectioning/top_no_argument_and_content.pl
@@ -132,10 +132,9 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="top" id="SEC_Top">
-
+<span id="SEC_Top"></span>
 <p>A.
-</p></div><hr></div>
+</p><hr></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 6dfbb8e..d4a07a8 100644
--- a/tp/t/results/sectioning/top_no_argument_and_node.pl
+++ b/tp/t/results/sectioning/top_no_argument_and_node.pl
@@ -210,8 +210,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 <div class="top" id="start">
-<div class="node" id="SEC_Top">
-</div><hr></div>
+<span id="SEC_Top"></span><hr></div>
 </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 614ba80..0ab031d 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
@@ -200,8 +200,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 <div class="top" id="Top">
-<div class="node" id="SEC_Top">
-</div><hr></div>
+<span id="SEC_Top"></span><hr></div>
 </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 4b3a573..8f653ed 100644
--- a/tp/t/results/sectioning/top_node_no_menu_direction.pl
+++ b/tp/t/results/sectioning/top_node_no_menu_direction.pl
@@ -546,22 +546,20 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<div class="header">
+<span id="Top"></span><div class="header">
 <p>
 Next: <a href="#second-node" accesskey="n" rel="next">second node</a> &nbsp; 
</p>
 </div>
 <h1 class="node-heading">Top</h1>
 
 
-</div><hr>
-<div class="node" id="second-node">
-<div class="header">
+<hr>
+<span id="second-node"></span><div class="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>
-</div><hr>
+<hr>
 
 
 
diff --git a/tp/t/results/sectioning/top_node_part_top.pl 
b/tp/t/results/sectioning/top_node_part_top.pl
index 86128c5..c44ba24 100644
--- a/tp/t/results/sectioning/top_node_part_top.pl
+++ b/tp/t/results/sectioning/top_node_part_top.pl
@@ -367,13 +367,11 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 <div class="top" id="Top">
 
-<div class="part" id="part">
-<h1 class="part">part</h1>
+<span id="part"></span><h1 class="part">part</h1>
 <hr>
 
-</div><div class="node" id="top">
-<h1 class="top">top</h1>
-</div><hr></div>
+<span id="top"></span><h1 class="top">top</h1>
+<hr></div>
 </div>
 
 
diff --git a/tp/t/results/sectioning/top_node_up_url.pl 
b/tp/t/results/sectioning/top_node_up_url.pl
index 1b7a700..60147d9 100644
--- a/tp/t/results/sectioning/top_node_up_url.pl
+++ b/tp/t/results/sectioning/top_node_up_url.pl
@@ -574,18 +574,16 @@ ul.no-bullet {list-style: none}
 <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>
 </div>
-<div class="node" id="internal-top-node-up">
-<h1 class="top">internal top node up</h1>
+<span id="internal-top-node-up"></span><h1 class="top">internal top node 
up</h1>
 
 
-</div><hr>
-<div class="node" id="first">
-<div class="header">
+<hr>
+<span id="first"></span><div class="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>
-</div><hr>
+<hr>
 </div>
 
 
diff --git a/tp/t/results/sectioning/top_without_node_nodes.pl 
b/tp/t/results/sectioning/top_without_node_nodes.pl
index f9b8bcd..55626e8 100644
--- a/tp/t/results/sectioning/top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/top_without_node_nodes.pl
@@ -442,19 +442,17 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="top" id="top-section">
-<h1 class="top">top section</h1>
+<span id="top-section"></span><h1 class="top">top section</h1>
 <p>Top section
 </p>
 <ul class="section-toc">
 <li><a href="#second" accesskey="1">Chapter</a></li>
 </ul>
-</div><div class="chapter" id="second">
-<div class="node" id="Chapter">
-<h2 class="chapter">1 Chapter</h2>
+<div class="chapter" id="second">
+<span id="Chapter"></span><h2 class="chapter">1 Chapter</h2>
 
 <p>Text of chapter
-</p></div><hr></div>
+</p><hr></div>
 </div>
 
 
diff --git a/tp/t/results/sectioning/top_without_node_sections.pl 
b/tp/t/results/sectioning/top_without_node_sections.pl
index d491bfc..c8f8a20 100644
--- a/tp/t/results/sectioning/top_without_node_sections.pl
+++ b/tp/t/results/sectioning/top_without_node_sections.pl
@@ -490,19 +490,17 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="top" id="top-section">
-<h1 class="top">top section</h1>
+<span id="top-section"></span><h1 class="top">top section</h1>
 <p>Top section
 </p>
 <ul class="section-toc">
 <li><a href="#second" accesskey="1">Chapter</a></li>
 </ul>
-</div><div class="chapter" id="second">
-<div class="node" id="Chapter">
-<h2 class="chapter">1 Chapter</h2>
+<div class="chapter" id="second">
+<span id="Chapter"></span><h2 class="chapter">1 Chapter</h2>
 
 <p>Text of chapter
-</p></div><hr></div>
+</p><hr></div>
 </div>
 
 
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 d9fa7d2..38fcd09 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
@@ -37,21 +37,19 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="g_t_00e3">
-<div class="header">
+<span id="g_t_00e3"></span><div class="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>
 
-</div><div class="node" id="g_t_00e2">
-<div class="header">
+<span id="g_t_00e2"></span><div class="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>
-</div>
+
 
 
 </body>
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 7d82445..21cc50b 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
@@ -35,8 +35,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="Top">
-<div class="header">
+<span id="Top"></span><div class="header">
 <p>
 Next: <a href="a.html#g_t_00e3" accesskey="n" rel="next">&atilde;</a> &nbsp; 
</p>
 </div>
@@ -44,7 +43,7 @@ Next: <a href="a.html#g_t_00e3" accesskey="n" 
rel="next">&atilde;</a> &nbsp; </p
 <h1 class="node-heading">Top</h1>
 
 
-</div><hr>
+<hr>
 <div class="header">
 <p>
 Next: <a href="a.html#g_t_00e3" accesskey="n" rel="next">&atilde;</a> &nbsp; 
</p>
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 c513723..4b27ce7 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
@@ -37,15 +37,14 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="n">
-<div class="header">
+<span id="n"></span><div class="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>
 
-</div>
+
 
 
 </body>
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 422b7e2..accd320 100644
--- a/tp/t/results/sectioning/two_nodes_at_the_end.pl
+++ b/tp/t/results/sectioning/two_nodes_at_the_end.pl
@@ -1036,38 +1036,34 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="#chapter-1" accesskey="n" rel="next">chapter c1</a> &nbsp; </p>
 </div>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 
 <ul class="section-toc">
 <li><a href="#chapter-1" accesskey="1">chapter c1</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="chapter" id="chapter-1">
 <div class="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>
 </div>
-<div class="node" id="chapter-c1">
-<h2 class="chapter">1 chapter c1</h2>
+<span id="chapter-c1"></span><h2 class="chapter">1 chapter c1</h2>
 
-</div><hr>
-<div class="node" id="node-after-chapter-1">
-<div class="header">
+<hr>
+<span id="node-after-chapter-1"></span><div class="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>
 
-</div><hr>
-<div class="node" id="node-after-chapter-2">
-<div class="header">
+<hr>
+<span id="node-after-chapter-2"></span><div class="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>
-</div><hr>
+<hr>
 </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 6b455b7..58bffe8 100644
--- a/tp/t/results/sectioning/two_nodes_between_chapters.pl
+++ b/tp/t/results/sectioning/two_nodes_between_chapters.pl
@@ -1194,41 +1194,37 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="#chapter-1" accesskey="n" rel="next">chapter c1</a> &nbsp; </p>
 </div>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 
 <ul class="section-toc">
 <li><a href="#chapter-1" accesskey="1">chapter c1</a></li>
 <li><a href="#chapter-2" accesskey="2">chapter c2</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="chapter" id="chapter-1">
 <div class="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>
 </div>
-<div class="node" id="chapter-c1">
-<h2 class="chapter">1 chapter c1</h2>
+<span id="chapter-c1"></span><h2 class="chapter">1 chapter c1</h2>
 
-</div><hr>
-<div class="node" id="node-between-chapters">
-<div class="header">
+<hr>
+<span id="node-between-chapters"></span><div class="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>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="chapter-2">
 <div class="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>
 </div>
-<div class="node" id="chapter-c2">
-<h2 class="chapter">2 chapter c2</h2>
-</div><hr>
+<span id="chapter-c2"></span><h2 class="chapter">2 chapter c2</h2>
+<hr>
 </div>
 </div>
 
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 97d8331..2e69002 100644
--- a/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
+++ b/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
@@ -425,16 +425,14 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="unnumbered" id="before-nodes">
-<h2 class="unnumbered">before nodes</h2>
+<span id="before-nodes"></span><h2 class="unnumbered">before nodes</h2>
 
 <p>in unnumbered
 </p>
-</div><div class="top" id="Top">
-<div class="node" id="top-section">
-<h2 class="unnumbered">top section</h2>
+<div class="top" id="Top">
+<span id="top-section"></span><h2 class="unnumbered">top section</h2>
 <p>Top node
-</p></div><hr></div>
+</p><hr></div>
 </div>
 
 
diff --git a/tp/t/results/sectioning/unnumbered_before_top_node.pl 
b/tp/t/results/sectioning/unnumbered_before_top_node.pl
index 2b8c2b3..772d641 100644
--- a/tp/t/results/sectioning/unnumbered_before_top_node.pl
+++ b/tp/t/results/sectioning/unnumbered_before_top_node.pl
@@ -308,15 +308,13 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="unnumbered" id="before-nodes">
-<h2 class="unnumbered">before nodes</h2>
+<span id="before-nodes"></span><h2 class="unnumbered">before nodes</h2>
 
-</div><div class="node" id="Top">
-<h1 class="node-heading">Top</h1>
+<span id="Top"></span><h1 class="node-heading">Top</h1>
 <p>Top node
 </p>
 <h1 class="titlefont">Title titlefont</h1>
-</div><hr></div>
+<hr></div>
 
 
 
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 4f245e2..efec6a6 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
@@ -721,27 +721,24 @@ ul.no-bullet {list-style: none}
 <p>
 Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
 </div>
-<div class="node" id="unnumbered">
-<h2 class="unnumbered">unnumbered</h2>
+<span id="unnumbered"></span><h2 class="unnumbered">unnumbered</h2>
 
 <p>in unnumbered
 </p>
-</div><div class="top" id="top-section">
-<h2 class="unnumbered">top section</h2>
+<span id="top-section"></span><h2 class="unnumbered">top section</h2>
 <p>Top section
 </p>
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="second">
 <div class="header">
 <p>
 Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
 </div>
-<div class="node" id="Chapter">
-<h2 class="chapter">1 Chapter</h2>
+<span id="Chapter"></span><h2 class="chapter">1 Chapter</h2>
 
 <p>Text of chapter
-</p></div><hr>
+</p><hr>
 </div>
 
 
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 8b2d9c6..a5da912 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
@@ -775,27 +775,24 @@ ul.no-bullet {list-style: none}
 <p>
 Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
 </div>
-<div class="node" id="unnumbered">
-<h2 class="unnumbered">unnumbered</h2>
+<span id="unnumbered"></span><h2 class="unnumbered">unnumbered</h2>
 
 <p>in unnumbered
 </p>
-</div><div class="top" id="top-section">
-<h2 class="unnumbered">top section</h2>
+<span id="top-section"></span><h2 class="unnumbered">top section</h2>
 <p>Top section
 </p>
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="second">
 <div class="header">
 <p>
 Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
 </div>
-<div class="node" id="Chapter">
-<h2 class="chapter">1 Chapter</h2>
+<span id="Chapter"></span><h2 class="chapter">1 Chapter</h2>
 
 <p>Text of chapter
-</p></div><hr>
+</p><hr>
 </div>
 
 
diff --git a/tp/t/results/xtable/block_commands_in_table.pl 
b/tp/t/results/xtable/block_commands_in_table.pl
index 9fad0ed..7e39a8e 100644
--- a/tp/t/results/xtable/block_commands_in_table.pl
+++ b/tp/t/results/xtable/block_commands_in_table.pl
@@ -1725,8 +1725,7 @@ _second item_
 
 
 $result_converted{'html_text'}->{'block_commands_in_table'} = '<div 
class="top" id="Top">
-<div class="node" id="Element">
-<h1 class="top">Element</h1>
+<span id="Element"></span><h1 class="top">Element</h1>
 
 <dl compact="compact">
 <dt><span><em>first item</em></span></dt>
@@ -1788,7 +1787,7 @@ end example.
 </p></dd>
 </dl>
 <p>After table.
-</p></div><hr></div>
+</p><hr></div>
 ';
 
 
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 3630ad9..230e024 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
@@ -44,8 +44,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#chapter-1-node">1 chapter 
1</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
@@ -56,9 +55,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
-<div class="part" id="part-1_003a-part-1">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr size="6">
+<span id="part-1_003a-part-1"></span><table class="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>
@@ -76,11 +74,10 @@ ul.no-bullet {list-style: none}
 <h1 class="part">part 1: part 1</h1>
 <hr>
 
-</div><div class="chapter" id="chapter-1-node">
-<div class="node" id="chapter-1">
-<h1 class="chapter">1 chapter 1</h1>
+<div class="chapter" id="chapter-1-node">
+<span id="chapter-1"></span><h1 class="chapter">1 chapter 1</h1>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="chapter-2-node">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -98,12 +95,10 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="chapter-2">
-<h1 class="chapter">2 chapter 2</h1>
+<span id="chapter-2"></span><h1 class="chapter">2 chapter 2</h1>
 
-</div><hr>
-<div class="part" id="part2_003a-part2">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr>
+<span id="part2_003a-part2"></span><table class="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>
 <td valign="middle" align="left">[<a href="#Top" title="Up section"> Up 
</a>]</td>
@@ -121,13 +116,12 @@ ul.no-bullet {list-style: none}
 <h1 class="part">part2: part2</h1>
 <hr>
 
-</div></div>
+</div>
 <div class="chapter" id="chapter-3-node">
-<div class="node" id="chapter-3">
-<h1 class="chapter">3 chapter 3</h1>
+<span id="chapter-3"></span><h1 class="chapter">3 chapter 3</h1>
 
 
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="Contents_element" id="SEC_Contents">
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 d659748..60ec462 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
@@ -45,8 +45,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Contents-at-beginning">
-<h1 class="top">Contents at beginning</h1>
+<span id="Contents-at-beginning"></span><h1 class="top">Contents at 
beginning</h1>
 
 <p>Content at the beginning.
 </p>
@@ -55,7 +54,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -72,12 +71,11 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Chapter-1">
-<h1 class="chapter">1 Chapter 1</h1>
+<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="Contents_element" id="SEC_Contents">
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 45bf5fd..b96d99a 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
@@ -55,8 +55,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Contents-at-beginning">
-<h1 class="top">Contents at beginning</h1>
+<span id="Contents-at-beginning"></span><h1 class="top">Contents at 
beginning</h1>
 
 <p>Content at the beginning.
 </p>
@@ -65,7 +64,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -82,12 +81,11 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Chapter-1">
-<h1 class="chapter">1 Chapter 1</h1>
+<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="About_element" id="SEC_About">
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 3775c81..81955fe 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
@@ -45,8 +45,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Contents-at-end">
-<h1 class="top">Contents at end</h1>
+<span id="Contents-at-end"></span><h1 class="top">Contents at end</h1>
 
 <p>Content at end.
 </p>
@@ -55,7 +54,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -72,12 +71,11 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Chapter-1">
-<h1 class="chapter">1 Chapter 1</h1>
+<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="Contents_element" id="SEC_Contents">
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 ba14ebc..2894a3d 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
@@ -45,8 +45,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Contents-at-end">
-<h1 class="top">Contents at end</h1>
+<span id="Contents-at-end"></span><h1 class="top">Contents at end</h1>
 
 <p>Content at end.
 </p>
@@ -55,7 +54,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -72,8 +71,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Chapter-1">
-<h1 class="chapter">1 Chapter 1</h1>
+<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
@@ -87,7 +85,7 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 </div>
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="About_element" id="SEC_About">
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 45b2652..0f4216b 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
@@ -45,8 +45,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Contents-in-chapter">
-<h1 class="top">Contents in chapter</h1>
+<span id="Contents-in-chapter"></span><h1 class="top">Contents in chapter</h1>
 
 <p>Content in chapter.
 </p>
@@ -55,7 +54,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -72,8 +71,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Chapter-1">
-<h1 class="chapter">1 Chapter 1</h1>
+<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter with contents
 </p>
@@ -82,7 +80,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="section" id="section">
 <table class="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>
@@ -99,12 +97,11 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="section-1">
-<h2 class="section">1.1 section</h2>
+<span id="section-1"></span><h2 class="section">1.1 section</h2>
 
 <p>Section.
 </p>
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 </div>
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 8eda3a5..f20f4c1 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
@@ -45,8 +45,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Contents-in-chapter">
-<h1 class="top">Contents in chapter</h1>
+<span id="Contents-in-chapter"></span><h1 class="top">Contents in chapter</h1>
 
 <p>Content in chapter.
 </p>
@@ -55,7 +54,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -72,8 +71,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Chapter-1">
-<h1 class="chapter">1 Chapter 1</h1>
+<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter with contents
 </p><div class="Contents_element" id="SEC_Contents">
@@ -95,7 +93,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="section" id="section">
 <table class="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>
@@ -112,12 +110,11 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="section-1">
-<h2 class="section">1.1 section</h2>
+<span id="section-1"></span><h2 class="section">1.1 section</h2>
 
 <p>Section.
 </p>
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 </div>
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 ee2a727..8620066 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
@@ -45,8 +45,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Contents-in-section">
-<h1 class="top">Contents in section</h1>
+<span id="Contents-in-section"></span><h1 class="top">Contents in section</h1>
 
 <p>Content in section.
 </p>
@@ -55,7 +54,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -72,8 +71,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Chapter-1">
-<h1 class="chapter">1 Chapter 1</h1>
+<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
 
 
 <table class="menu" border="0" cellspacing="0">
@@ -83,7 +81,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="section" id="section">
 <table class="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>
@@ -100,12 +98,11 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="section-1">
-<h2 class="section">1.1 section</h2>
+<span id="section-1"></span><h2 class="section">1.1 section</h2>
 
 <p>The section with contents
 </p>
-</div><hr>
+<hr>
 </div>
 <div class="section" id="section1">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -123,12 +120,11 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="section-1-1">
-<h2 class="section">1.2 section 1</h2>
+<span id="section-1-1"></span><h2 class="section">1.2 section 1</h2>
 
 <p>Section 1.
 </p>
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 </div>
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 be4c87d..c87be34 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
@@ -45,8 +45,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Contents-in-section">
-<h1 class="top">Contents in section</h1>
+<span id="Contents-in-section"></span><h1 class="top">Contents in section</h1>
 
 <p>Content in section.
 </p>
@@ -55,7 +54,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -72,8 +71,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Chapter-1">
-<h1 class="chapter">1 Chapter 1</h1>
+<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
 
 
 <table class="menu" border="0" cellspacing="0">
@@ -83,7 +81,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="section" id="section">
 <table class="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>
@@ -100,8 +98,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="section-1">
-<h2 class="section">1.1 section</h2>
+<span id="section-1"></span><h2 class="section">1.1 section</h2>
 
 <p>The section with contents
 </p><div class="Contents_element" id="SEC_Contents">
@@ -119,7 +116,7 @@ ul.no-bullet {list-style: none}
 </div>
 </div>
 
-</div><hr>
+<hr>
 </div>
 <div class="section" id="section1">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -137,12 +134,11 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="section-1-1">
-<h2 class="section">1.2 section 1</h2>
+<span id="section-1-1"></span><h2 class="section">1.2 section 1</h2>
 
 <p>Section 1.
 </p>
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 </div>
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 d9bde76..9e33fe9 100644
--- a/tp/tests/contents/res_parser/double_contents/double_contents.html
+++ b/tp/tests/contents/res_parser/double_contents/double_contents.html
@@ -45,8 +45,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Double-contents">
-<h1 class="top">Double contents</h1>
+<span id="Double-contents"></span><h1 class="top">Double contents</h1>
 
 <p>Double contents.
 </p>
@@ -55,7 +54,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -72,8 +71,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Chapter-1">
-<h1 class="chapter">1 Chapter 1</h1>
+<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
@@ -82,7 +80,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="section" id="section">
 <table class="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>
@@ -99,10 +97,9 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="section-with-contents">
-<h2 class="section">1.1 section with contents</h2>
+<span id="section-with-contents"></span><h2 class="section">1.1 section with 
contents</h2>
 
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 </div>
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 19a7e27..371f7f6 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
@@ -59,8 +59,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Double-contents">
-<h1 class="top">Double contents</h1>
+<span id="Double-contents"></span><h1 class="top">Double contents</h1>
 
 <p>Double contents.
 </p>
@@ -69,7 +68,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -86,8 +85,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Chapter-1">
-<h1 class="chapter">1 Chapter 1</h1>
+<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
@@ -96,7 +94,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="section" id="section">
 <table class="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>
@@ -113,10 +111,9 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="section-with-contents">
-<h2 class="section">1.1 section with contents</h2>
+<span id="section-with-contents"></span><h2 class="section">1.1 section with 
contents</h2>
 
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 </div>
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 19a7e27..371f7f6 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
@@ -59,8 +59,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Double-contents">
-<h1 class="top">Double contents</h1>
+<span id="Double-contents"></span><h1 class="top">Double contents</h1>
 
 <p>Double contents.
 </p>
@@ -69,7 +68,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -86,8 +85,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Chapter-1">
-<h1 class="chapter">1 Chapter 1</h1>
+<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
@@ -96,7 +94,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="section" id="section">
 <table class="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>
@@ -113,10 +111,9 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="section-with-contents">
-<h2 class="section">1.1 section with contents</h2>
+<span id="section-with-contents"></span><h2 class="section">1.1 section with 
contents</h2>
 
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 </div>
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 1e1c530..1cff080 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
@@ -50,8 +50,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Chapter-1">
-<h1 class="chapter">1 Chapter 1</h1>
+<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
@@ -60,7 +59,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="section" id="section">
 <table class="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>
@@ -77,10 +76,9 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="section-with-contents">
-<h2 class="section">1.1 section with contents</h2>
+<span id="section-with-contents"></span><h2 class="section">1.1 section with 
contents</h2>
 
-</div><hr>
+<hr>
 <table class="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">[ &gt;&gt; ]</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 2419eee..64dbf51 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
@@ -59,8 +59,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Double-contents">
-<h1 class="top">Double contents</h1>
+<span id="Double-contents"></span><h1 class="top">Double contents</h1>
 
 <p>Double contents.
 </p>
@@ -69,7 +68,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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 449a61f..cb90835 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
@@ -44,8 +44,7 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="Chapter-1">
-<h2 class="chapter">1 Chapter 1</h2>
+<span id="Chapter-1"></span><h2 class="chapter">1 Chapter 1</h2>
 
 <p>The chapter
 </p>
@@ -53,7 +52,7 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">Double contents</a>, Up:
 <ul class="section-toc">
 <li><a href="section.html" accesskey="1">section with contents</a></li>
 </ul>
-</div></div>
+</div>
 
 
 
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 2d36735..aab833e 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
@@ -59,8 +59,7 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="Double-contents">
-<h1 class="top">Double contents</h1>
+<span id="Double-contents"></span><h1 class="top">Double contents</h1>
 
 <p>Double contents.
 </p>
@@ -68,7 +67,7 @@ Next: <a href="chapter.html" accesskey="n" rel="next">Chapter 
1</a> &nbsp; [<a h
 <ul class="section-toc">
 <li><a href="chapter.html" accesskey="1">Chapter 1</a></li>
 </ul>
-</div><hr>
+<hr>
 <div class="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 5c2734a..2604d1c 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
@@ -43,10 +43,9 @@ ul.no-bullet {list-style: none}
 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>
 </div>
 <hr>
-<div class="node" id="section-with-contents">
-<h3 class="section">1.1 section with contents</h3>
+<span id="section-with-contents"></span><h3 class="section">1.1 section with 
contents</h3>
 
-</div></div>
+</div>
 
 
 
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 89d1d8b..b0f733e 100644
--- a/tp/tests/contents/res_parser/double_contents_chapter/chapter.html
+++ b/tp/tests/contents/res_parser/double_contents_chapter/chapter.html
@@ -50,8 +50,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Chapter-1">
-<h1 class="chapter">1 Chapter 1</h1>
+<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
@@ -60,7 +59,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="section" id="section">
 <table class="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>
@@ -77,10 +76,9 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="section-with-contents">
-<h2 class="section">1.1 section with contents</h2>
+<span id="section-with-contents"></span><h2 class="section">1.1 section with 
contents</h2>
 
-</div><hr>
+<hr>
 <table class="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">[ &gt;&gt; ]</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 2be7f20..6e4898b 100644
--- a/tp/tests/contents/res_parser/double_contents_chapter/index.html
+++ b/tp/tests/contents/res_parser/double_contents_chapter/index.html
@@ -45,8 +45,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Double-contents">
-<h1 class="top">Double contents</h1>
+<span id="Double-contents"></span><h1 class="top">Double contents</h1>
 
 <p>Double contents.
 </p>
@@ -55,7 +54,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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 673ef74..218de3e 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
@@ -58,8 +58,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Double-contents">
-<h1 class="top">Double contents</h1>
+<span id="Double-contents"></span><h1 class="top">Double contents</h1>
 
 <p>Double contents.
 </p>
@@ -68,7 +67,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -85,8 +84,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Chapter-1">
-<h1 class="chapter">1 Chapter 1</h1>
+<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
 
 <div class="Contents_element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
@@ -108,7 +106,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="section" id="section">
 <table class="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>
@@ -125,8 +123,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="section-with-contents">
-<h2 class="section">1.1 section with contents</h2>
+<span id="section-with-contents"></span><h2 class="section">1.1 section with 
contents</h2>
 <div class="Contents_element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
@@ -141,7 +138,7 @@ ul.no-bullet {list-style: none}
 </div>
 </div>
 
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 </div>
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 39aaaeb..d7a17fc 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
@@ -50,8 +50,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Chapter-1">
-<h1 class="chapter">1 Chapter 1</h1>
+<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
 
 <div class="Contents_element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
@@ -73,7 +72,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="section" id="section">
 <table class="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>
@@ -90,8 +89,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="section-with-contents">
-<h2 class="section">1.1 section with contents</h2>
+<span id="section-with-contents"></span><h2 class="section">1.1 section with 
contents</h2>
 <div class="Contents_element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
@@ -106,7 +104,7 @@ ul.no-bullet {list-style: none}
 </div>
 </div>
 
-</div><hr>
+<hr>
 <table class="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">[ &gt;&gt; ]</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 cc006a3..177b977 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
@@ -58,8 +58,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Double-contents">
-<h1 class="top">Double contents</h1>
+<span id="Double-contents"></span><h1 class="top">Double contents</h1>
 
 <p>Double contents.
 </p>
@@ -68,7 +67,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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 43b53bb..25c8e76 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
@@ -51,8 +51,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="Chapter-1">
-<h1 class="chapter">1 Chapter 1</h1>
+<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
 
 <div class="Contents_element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
@@ -74,7 +73,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 51086fb..2735a60 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
@@ -59,8 +59,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="Double-contents">
-<h1 class="top">Double contents</h1>
+<span id="Double-contents"></span><h1 class="top">Double contents</h1>
 
 <p>Double contents.
 </p>
@@ -69,7 +68,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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 4941852..f952169 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
@@ -51,8 +51,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="section-with-contents">
-<h2 class="section">1.1 section with contents</h2>
+<span id="section-with-contents"></span><h2 class="section">1.1 section with 
contents</h2>
 <div class="Contents_element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
@@ -67,7 +66,7 @@ ul.no-bullet {list-style: none}
 </div>
 </div>
 
-</div><hr>
+<hr>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 e06cac2..206ede1 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
@@ -50,8 +50,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Chapter-1">
-<h1 class="chapter">1 Chapter 1</h1>
+<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
 
 <div class="Contents_element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
@@ -73,7 +72,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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 0967a85..515d06d 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
@@ -58,8 +58,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Double-contents">
-<h1 class="top">Double contents</h1>
+<span id="Double-contents"></span><h1 class="top">Double contents</h1>
 
 <p>Double contents.
 </p>
@@ -68,7 +67,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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 f307ba0..a8d654b 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
@@ -50,8 +50,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="section-with-contents">
-<h2 class="section">1.1 section with contents</h2>
+<span id="section-with-contents"></span><h2 class="section">1.1 section with 
contents</h2>
 <div class="Contents_element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
@@ -66,7 +65,7 @@ ul.no-bullet {list-style: none}
 </div>
 </div>
 
-</div><hr>
+<hr>
 <table class="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 3bc498f..d17445a 100644
--- a/tp/tests/contents/res_parser/double_contents_nodes/chapter.html
+++ b/tp/tests/contents/res_parser/double_contents_nodes/chapter.html
@@ -51,8 +51,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="Chapter-1">
-<h1 class="chapter">1 Chapter 1</h1>
+<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
@@ -61,7 +60,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 e62b3a0..428c7b8 100644
--- a/tp/tests/contents/res_parser/double_contents_nodes/index.html
+++ b/tp/tests/contents/res_parser/double_contents_nodes/index.html
@@ -46,8 +46,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="Double-contents">
-<h1 class="top">Double contents</h1>
+<span id="Double-contents"></span><h1 class="top">Double contents</h1>
 
 <p>Double contents.
 </p>
@@ -56,7 +55,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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 873b9f8..059c96e 100644
--- a/tp/tests/contents/res_parser/double_contents_nodes/section.html
+++ b/tp/tests/contents/res_parser/double_contents_nodes/section.html
@@ -51,10 +51,9 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="section-with-contents">
-<h2 class="section">1.1 section with contents</h2>
+<span id="section-with-contents"></span><h2 class="section">1.1 section with 
contents</h2>
 
-</div><hr>
+<hr>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 e84d608..ec406b5 100644
--- a/tp/tests/contents/res_parser/double_contents_section/chapter.html
+++ b/tp/tests/contents/res_parser/double_contents_section/chapter.html
@@ -50,8 +50,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Chapter-1">
-<h1 class="chapter">1 Chapter 1</h1>
+<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
@@ -60,7 +59,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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 fde9ddf..d687f9c 100644
--- a/tp/tests/contents/res_parser/double_contents_section/index.html
+++ b/tp/tests/contents/res_parser/double_contents_section/index.html
@@ -45,8 +45,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Double-contents">
-<h1 class="top">Double contents</h1>
+<span id="Double-contents"></span><h1 class="top">Double contents</h1>
 
 <p>Double contents.
 </p>
@@ -55,7 +54,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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 74070c1..6d834c1 100644
--- a/tp/tests/contents/res_parser/double_contents_section/section.html
+++ b/tp/tests/contents/res_parser/double_contents_section/section.html
@@ -50,10 +50,9 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="section-with-contents">
-<h2 class="section">1.1 section with contents</h2>
+<span id="section-with-contents"></span><h2 class="section">1.1 section with 
contents</h2>
 
-</div><hr>
+<hr>
 <table class="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 6ffa4ef..97383d3 100644
--- a/tp/tests/contents/res_parser/no_content/no_content.html
+++ b/tp/tests/contents/res_parser/no_content/no_content.html
@@ -44,8 +44,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="No-ccontent">
-<h1 class="top">No ccontent</h1>
+<span id="No-ccontent"></span><h1 class="top">No ccontent</h1>
 
 <p>No content.
 </p>
@@ -54,7 +53,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -71,12 +70,11 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Chapter-1">
-<h1 class="chapter">1 Chapter 1</h1>
+<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="About_element" id="SEC_About">
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 b4f22e0..3909753 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
@@ -44,8 +44,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="No-ccontent">
-<h1 class="top">No ccontent</h1>
+<span id="No-ccontent"></span><h1 class="top">No ccontent</h1>
 
 <p>No content.
 </p>
@@ -54,7 +53,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -71,12 +70,11 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Chapter-1">
-<h1 class="chapter">1 Chapter 1</h1>
+<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="Contents_element" id="SEC_Contents">
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 6ffa4ef..97383d3 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
@@ -44,8 +44,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="No-ccontent">
-<h1 class="top">No ccontent</h1>
+<span id="No-ccontent"></span><h1 class="top">No ccontent</h1>
 
 <p>No content.
 </p>
@@ -54,7 +53,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -71,12 +70,11 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Chapter-1">
-<h1 class="chapter">1 Chapter 1</h1>
+<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="About_element" id="SEC_About">
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 6ffa4ef..97383d3 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
@@ -44,8 +44,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="No-ccontent">
-<h1 class="top">No ccontent</h1>
+<span id="No-ccontent"></span><h1 class="top">No ccontent</h1>
 
 <p>No content.
 </p>
@@ -54,7 +53,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -71,12 +70,11 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Chapter-1">
-<h1 class="chapter">1 Chapter 1</h1>
+<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="About_element" id="SEC_About">
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 6ffa4ef..97383d3 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
@@ -44,8 +44,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="No-ccontent">
-<h1 class="top">No ccontent</h1>
+<span id="No-ccontent"></span><h1 class="top">No ccontent</h1>
 
 <p>No content.
 </p>
@@ -54,7 +53,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -71,12 +70,11 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Chapter-1">
-<h1 class="chapter">1 Chapter 1</h1>
+<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="About_element" id="SEC_About">
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 b4f22e0..3909753 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
@@ -44,8 +44,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="No-ccontent">
-<h1 class="top">No ccontent</h1>
+<span id="No-ccontent"></span><h1 class="top">No ccontent</h1>
 
 <p>No content.
 </p>
@@ -54,7 +53,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -71,12 +70,11 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Chapter-1">
-<h1 class="chapter">1 Chapter 1</h1>
+<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="Contents_element" id="SEC_Contents">
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 6ffa4ef..97383d3 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
@@ -44,8 +44,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="No-ccontent">
-<h1 class="top">No ccontent</h1>
+<span id="No-ccontent"></span><h1 class="top">No ccontent</h1>
 
 <p>No content.
 </p>
@@ -54,7 +53,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -71,12 +70,11 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Chapter-1">
-<h1 class="chapter">1 Chapter 1</h1>
+<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="About_element" id="SEC_About">
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 6ffa4ef..97383d3 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
@@ -44,8 +44,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="No-ccontent">
-<h1 class="top">No ccontent</h1>
+<span id="No-ccontent"></span><h1 class="top">No ccontent</h1>
 
 <p>No content.
 </p>
@@ -54,7 +53,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -71,12 +70,11 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Chapter-1">
-<h1 class="chapter">1 Chapter 1</h1>
+<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="About_element" id="SEC_About">
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 ddb3d84..fa63867 100644
--- a/tp/tests/formatting/res_parser/simplest_test_css/simplest.html
+++ b/tp/tests/formatting/res_parser/simplest_test_css/simplest.html
@@ -47,11 +47,10 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="node" id="Top">
-
+<span id="Top"></span>
 <p>This is a very simple texi manual &nbsp; &lt;&gt;.
 </p>
-</div><hr></div>
+<hr></div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
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 7e1a63f..43e50a2 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
@@ -36,14 +36,13 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 <div class="top" id="Top">
-<div class="node" id="Test-need">
-<h1 class="top">Test need</h1>
+<span id="Test-need"></span><h1 class="top">Test need</h1>
 
 <p>@need <!-- need: 0.1 on line following -->
 @need <!-- need: 0.1 -->
 </p>
 
-</div><hr></div>
+<hr></div>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 4f581f3..0f3a8e3 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
@@ -44,8 +44,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="#index-node" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Test-index-entry-with-node-name-clash">
-<h1 class="top">Test index entry with node name clash</h1>
+<span id="Test-index-entry-with-node-name-clash"></span><h1 class="top">Test 
index entry with node name clash</h1>
 
 <p>Text.
 </p>
@@ -56,7 +55,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="index-node">
 <table class="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>
@@ -73,8 +72,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="#index-node" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="index-node-1">
-<h1 class="chapter">1 index node</h1>
+<span id="index-node-1"></span><h1 class="chapter">1 index node</h1>
 
 <p>in index node node, with the same (croo_ref) name than index entry.
 </p>
@@ -92,7 +90,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="About_element" id="SEC_About">
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 d41a3ec..0e67911 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
@@ -44,8 +44,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="#Index" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="index_005fentry_005fin_005ffootnote">
-<h1 class="top">index_entry_in_footnote</h1>
+<span id="index_005fentry_005fin_005ffootnote"></span><h1 
class="top">index_entry_in_footnote</h1>
 
 <p>Top node<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
@@ -54,7 +53,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="appendix" id="Index">
 <table class="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>
@@ -71,8 +70,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="#Index" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="index">
-<h1 class="appendix">Appendix A index</h1>
+<span id="index"></span><h1 class="appendix">Appendix A index</h1>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#index_cp_letter-I"><b>I</b></a>
  &nbsp; 
@@ -88,7 +86,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="Footnotes_element" id="SEC_Foot">
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 c6434c9..2744339 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
@@ -83,8 +83,7 @@ ul.no-bullet {list-style: none}
 </td></tr></table>
 
 
-<div class="unnumbered" id="unnumbered">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="unnumbered"></span><table class="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">[ Up ]</td>
@@ -150,9 +149,8 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
-<div class="unnumbered" id="top-_0028chapter_0029-section">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr>
+<span id="top-_0028chapter_0029-section"></span><table class="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>
 <td valign="middle" align="left">[ Up ]</td>
@@ -225,9 +223,8 @@ ul.no-bullet {list-style: none}
 <span id="index-top-section1"></span>
 
 
-</div><hr>
-<div class="section" id="second">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr>
+<span id="second"></span><table class="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>
 <td valign="middle" align="left">[<a href="#top-_0028chapter_0029-section" 
title="Up section"> Up </a>]</td>
@@ -336,9 +333,8 @@ ul.no-bullet {list-style: none}
 <a class="summary-letter" href="#second_cp_letter-U"><b>U</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr>
-<div class="chapter" id="Chapter">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr>
+<span id="Chapter"></span><table class="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>
 <td valign="middle" align="left">[ Up ]</td>
@@ -403,9 +399,8 @@ ul.no-bullet {list-style: none}
 <p>Text of chapter
 <span id="index-Chapter2"></span>
 </p>
-</div><hr>
-<div class="chapter" id="Chapter-2">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr>
+<span id="Chapter-2"></span><table class="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">[ Up ]</td>
@@ -424,7 +419,7 @@ ul.no-bullet {list-style: none}
 
 <p>In chapter 2
 </p>
-</div><hr size="6">
+<hr size="6">
 <div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#unnumbered" title="Cover (top) 
of document">Top</a>]</td>
diff --git a/tp/tests/indices/res_parser/index_nodes/index_nodes.html 
b/tp/tests/indices/res_parser/index_nodes/index_nodes.html
index 96f9bc2..5164664 100644
--- a/tp/tests/indices/res_parser/index_nodes/index_nodes.html
+++ b/tp/tests/indices/res_parser/index_nodes/index_nodes.html
@@ -35,8 +35,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="node" id="Top">
-<span id="index-entry-a"></span>
+<span id="Top"></span><span id="index-entry-a"></span>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#t_h_cp_symbol-1"><b>!</b></a>
  &nbsp; 
@@ -155,8 +154,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><div class="node" id="first">
-<p>Text and then index entries
+<span id="first"></span><p>Text and then index entries
 <span id="index-entry-in-node"></span>
 <span id="index-_0021-entry-in-node"></span>
 <span id="index-fun-in-node"></span>
@@ -208,8 +206,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><div class="node" id="second">
-<table class="menu" border="0" cellspacing="0">
+<span id="second"></span><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>
 <tr><td align="left" valign="top">&bull; <a 
href="#another">another</a></td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top">
@@ -244,14 +241,12 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><div class="node" id="another">
-
+<span id="another"></span>
 <span id="index-something"></span>
 <span id="index-somewhere"></span>
 <span id="index-another"></span>
 
-</div><div class="node" id="a-node">
-<span id="index-entry-after-printindex"></span>
+<span id="a-node"></span><span id="index-entry-after-printindex"></span>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#t_h_cp_symbol-1"><b>!</b></a>
  &nbsp; 
@@ -338,7 +333,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr></div>
+<hr></div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
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 14652d4..09e1bfa 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
@@ -34,8 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="a-node">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="a-node"></span><table class="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>
@@ -139,7 +138,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
+<hr>
 <table class="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>
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 84ce262..7dcd582 100644
--- a/tp/tests/indices/res_parser/index_nodes_nodes/another.html
+++ b/tp/tests/indices/res_parser/index_nodes_nodes/another.html
@@ -34,8 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="another">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="another"></span><table class="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>
@@ -57,7 +56,7 @@ ul.no-bullet {list-style: none}
 <span id="index-somewhere"></span>
 <span id="index-another"></span>
 
-</div><hr>
+<hr>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
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 4f9c290..85884ff 100644
--- a/tp/tests/indices/res_parser/index_nodes_nodes/first.html
+++ b/tp/tests/indices/res_parser/index_nodes_nodes/first.html
@@ -34,8 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="first">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="first"></span><table class="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>
@@ -104,7 +103,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
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 e01f587..bce02c6 100644
--- a/tp/tests/indices/res_parser/index_nodes_nodes/index.html
+++ b/tp/tests/indices/res_parser/index_nodes_nodes/index.html
@@ -35,8 +35,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="node" id="Top">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="Top"></span><table class="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>
@@ -165,7 +164,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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/tests/indices/res_parser/index_nodes_nodes/second.html 
b/tp/tests/indices/res_parser/index_nodes_nodes/second.html
index e190a7c..ddad382 100644
--- a/tp/tests/indices/res_parser/index_nodes_nodes/second.html
+++ b/tp/tests/indices/res_parser/index_nodes_nodes/second.html
@@ -34,8 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="node" id="second">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="second"></span><table class="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>
@@ -87,7 +86,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
+<hr>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
diff --git a/tp/tests/indices/res_parser/index_one_node/index_one_node.html 
b/tp/tests/indices/res_parser/index_one_node/index_one_node.html
index 1c94428..1b52870 100644
--- a/tp/tests/indices/res_parser/index_one_node/index_one_node.html
+++ b/tp/tests/indices/res_parser/index_one_node/index_one_node.html
@@ -38,8 +38,7 @@ ul.no-bullet {list-style: none}
 <p>Garbage
 <span id="index-before-nodes"></span>
 </p>
-<div class="node" id="one-node">
-<p>Top node
+<span id="one-node"></span><p>Top node
 <span id="index-Top-node"></span>
 </p>
 <p>anchor ref <span id="ref"></span>.
@@ -75,7 +74,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr></div>
+<hr></div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
 </font></p>
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 ef70352..863aed8 100644
--- a/tp/tests/indices/res_parser/index_special_region/Chapter.html
+++ b/tp/tests/indices/res_parser/index_special_region/Chapter.html
@@ -40,8 +40,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="chapter" id="Chapter">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="Chapter"></span><table class="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>
 <td valign="middle" align="left">[<a href="index.html" title="Up section"> Up 
</a>]</td>
@@ -115,7 +114,7 @@ and titlepage, and various wrong index entries.
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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="Copying-and-indices.html" 
title="Next chapter"> &gt;&gt; </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 ab2c375..31c6679 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
@@ -56,8 +56,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="Chapter.html" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a 
href="index_special_region_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Copying-and-indices-1">
-<h1 class="appendix">Appendix A Copying and indices</h1>
+<span id="Copying-and-indices-1"></span><h1 class="appendix">Appendix A 
Copying and indices</h1>
 
 <p>In the appendix, we print the indices and references.
 </p>
@@ -159,7 +158,7 @@ domain<a id="DOCF1_2" 
href="index_special_region_fot.html#FOOT1_2"><sup>2</sup><
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
+<hr>
 <table class="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">[ &gt;&gt; ]</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 f368d39..6e3768a 100644
--- a/tp/tests/indices/res_parser/index_special_region/index.html
+++ b/tp/tests/indices/res_parser/index_special_region/index.html
@@ -52,9 +52,8 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="Chapter.html" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a 
href="index_special_region_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Top-1">
-<h1 class="top">Top</h1>
-</div><hr>
+<span id="Top-1"></span><h1 class="top">Top</h1>
+<hr>
 <table class="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 ae1a581..3a3e2ab 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
@@ -40,8 +40,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="chapter" id="Chapter">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="Chapter"></span><table class="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>
 <td valign="middle" align="left">[<a href="index.html" title="Up section"> Up 
</a>]</td>
@@ -115,7 +114,7 @@ and titlepage, and various wrong index entries.
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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="Copying-and-indices.html" 
title="Next chapter"> &gt;&gt; </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 33d35ec..193fdab 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
@@ -56,8 +56,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="index.html" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a 
href="index_special_region_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Copying-and-indices-1">
-<h1 class="appendix">Appendix A Copying and indices</h1>
+<span id="Copying-and-indices-1"></span><h1 class="appendix">Appendix A 
Copying and indices</h1>
 
 <p>In the appendix, we print the indices and references.
 </p>
@@ -159,7 +158,7 @@ domain<a id="DOCF1_4" 
href="index_special_region_fot.html#FOOT1_4"><sup>4</sup><
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
+<hr>
 <table class="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">[ &gt;&gt; ]</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 a5d56ab..fb8b34e 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
@@ -94,9 +94,8 @@ domain<a id="DOCF1" 
href="index_special_region_fot.html#FOOT1"><sup>2</sup></a>.
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a 
href="index_special_region_abt.html#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Top-1">
-<h1 class="top">Top</h1>
-</div><hr>
+<span id="Top-1"></span><h1 class="top">Top</h1>
+<hr>
 <table class="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 d849aba..d65830f 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
@@ -40,8 +40,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="chapter" id="Chapter">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="Chapter"></span><table class="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>
 <td valign="middle" align="left">[<a href="index.html" title="Up section"> Up 
</a>]</td>
@@ -79,7 +78,7 @@ and titlepage, and various wrong index entries.
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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="Copying-and-indices.html" 
title="Next chapter"> &gt;&gt; </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 083771c..1e5180e 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
@@ -56,8 +56,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a 
href="index_special_region_no_insertcopying_abt.html#SEC_About" title="About 
(help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Copying-and-indices-1">
-<h1 class="appendix">Appendix A Copying and indices</h1>
+<span id="Copying-and-indices-1"></span><h1 class="appendix">Appendix A 
Copying and indices</h1>
 
 <p>In the appendix, we print the indices and references.
 </p>
@@ -123,7 +122,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
+<hr>
 <table class="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">[ &gt;&gt; ]</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 beeeca8..eacfeed 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
@@ -52,9 +52,8 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a 
href="index_special_region_no_insertcopying_abt.html#SEC_About" title="About 
(help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Top-1">
-<h1 class="top">Top</h1>
-</div><hr>
+<span id="Top-1"></span><h1 class="top">Top</h1>
+<hr>
 <table class="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 59b3842..a58f21e 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
@@ -40,8 +40,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="chapter" id="Chapter">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="Chapter"></span><table class="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>
 <td valign="middle" align="left">[<a href="index.html" title="Up section"> Up 
</a>]</td>
@@ -79,7 +78,7 @@ and titlepage, and various wrong index entries.
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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="Copying-and-indices.html" 
title="Next chapter"> &gt;&gt; </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 039a8b1..0eea074 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
@@ -56,8 +56,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="index.html" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a 
href="index_special_region_no_insertcopying_abt.html#SEC_About" title="About 
(help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Copying-and-indices-1">
-<h1 class="appendix">Appendix A Copying and indices</h1>
+<span id="Copying-and-indices-1"></span><h1 class="appendix">Appendix A 
Copying and indices</h1>
 
 <p>In the appendix, we print the indices and references.
 </p>
@@ -123,7 +122,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
+<hr>
 <table class="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">[ &gt;&gt; ]</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 a391926..e2d9851 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
@@ -94,9 +94,8 @@ domain<a id="DOCF1" 
href="index_special_region_no_insertcopying_fot.html#FOOT1">
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a 
href="index_special_region_no_insertcopying_abt.html#SEC_About" title="About 
(help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Top-1">
-<h1 class="top">Top</h1>
-</div><hr>
+<span id="Top-1"></span><h1 class="top">Top</h1>
+<hr>
 <table class="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 984cf9f..b76be75 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
@@ -40,8 +40,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="chapter" id="Chapter">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="Chapter"></span><table class="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>
 <td valign="middle" align="left">[<a href="index.html" title="Up section"> Up 
</a>]</td>
@@ -79,7 +78,7 @@ and titlepage, and various wrong index entries.
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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="Copying-and-indices.html" 
title="Next chapter"> &gt;&gt; </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 188efe7..84b3176 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
@@ -56,8 +56,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a 
href="index_special_region_no_region_abt.html#SEC_About" title="About (help)"> 
? </a>]</td>
 </tr></table>
-<div class="node" id="Copying-and-indices-1">
-<h1 class="appendix">Appendix A Copying and indices</h1>
+<span id="Copying-and-indices-1"></span><h1 class="appendix">Appendix A 
Copying and indices</h1>
 
 <p>In the appendix, we print the indices and references.
 </p>
@@ -123,7 +122,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
+<hr>
 <table class="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">[ &gt;&gt; ]</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 0df83b7..083aa50 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
@@ -52,10 +52,9 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a 
href="index_special_region_no_region_abt.html#SEC_About" title="About (help)"> 
? </a>]</td>
 </tr></table>
-<div class="node" id="Top-1">
-<h1 class="top">Top</h1>
+<span id="Top-1"></span><h1 class="top">Top</h1>
 
-</div><hr>
+<hr>
 <table class="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 aa7bd72..ea3e1f4 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
@@ -40,8 +40,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="chapter" id="Chapter">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="Chapter"></span><table class="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>
 <td valign="middle" align="left">[<a href="index.html" title="Up section"> Up 
</a>]</td>
@@ -79,7 +78,7 @@ and titlepage, and various wrong index entries.
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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="Copying-and-indices.html" 
title="Next chapter"> &gt;&gt; </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 ed750fd..e5be669 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
@@ -56,8 +56,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="index.html" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a 
href="index_special_region_no_region_abt.html#SEC_About" title="About (help)"> 
? </a>]</td>
 </tr></table>
-<div class="node" id="Copying-and-indices-1">
-<h1 class="appendix">Appendix A Copying and indices</h1>
+<span id="Copying-and-indices-1"></span><h1 class="appendix">Appendix A 
Copying and indices</h1>
 
 <p>In the appendix, we print the indices and references.
 </p>
@@ -123,7 +122,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
+<hr>
 <table class="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">[ &gt;&gt; ]</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 ffe2afa..5d21de4 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
@@ -94,10 +94,9 @@ domain<a id="DOCF1" 
href="index_special_region_no_region_fot.html#FOOT1"><sup>2<
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a 
href="index_special_region_no_region_abt.html#SEC_About" title="About (help)"> 
? </a>]</td>
 </tr></table>
-<div class="node" id="Top-1">
-<h1 class="top">Top</h1>
+<span id="Top-1"></span><h1 class="top">Top</h1>
 
-</div><hr>
+<hr>
 <table class="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 ec9b407..b52cf65 100644
--- a/tp/tests/indices/res_parser/index_table/index.html
+++ b/tp/tests/indices/res_parser/index_table/index.html
@@ -43,8 +43,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="node-with-printindex.html" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="index_table_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Test-for-indices">
-<h1 class="top">Test for indices</h1>
+<span id="Test-for-indices"></span><h1 class="top">Test for indices</h1>
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="node-with-ftable-and-vtable.html">1 
first node chapter, with ftable and vtable</a></td><td>&nbsp;&nbsp;</td><td 
align="left" valign="top">
 </td></tr>
@@ -54,7 +53,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <table class="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 936f6dc..51b671a 100644
--- a/tp/tests/indices/res_parser/index_table/indices-refs.html
+++ b/tp/tests/indices/res_parser/index_table/indices-refs.html
@@ -50,8 +50,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="node-with-printindex.html" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="index_table_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Indices-refs">
-<h1 class="chapter">3 Indices refs</h1>
+<span id="Indices-refs"></span><h1 class="chapter">3 Indices refs</h1>
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#node">3.1 
node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 </table>
@@ -509,7 +508,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
+<hr>
 <div class="section" id="node">
 <table class="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>
@@ -526,12 +525,11 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="node-with-printindex.html" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="index_table_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="node-1">
-<h2 class="section">3.1 node</h2>
+<span id="node-1"></span><h2 class="section">3.1 node</h2>
 
 <p>A section following the indices.
 </p>
-</div><hr>
+<hr>
 <table class="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">[ &gt;&gt; ]</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 46e50c1..4001383 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
@@ -50,8 +50,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="node-with-printindex.html" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="index_table_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="first-node-chapter_002c-with-ftable-and-vtable">
-<h1 class="chapter">1 first node chapter, with ftable and vtable</h1>
+<span id="first-node-chapter_002c-with-ftable-and-vtable"></span><h1 
class="chapter">1 first node chapter, with ftable and vtable</h1>
 
 <span id="index-index-entry-in-node"></span>
 
@@ -78,7 +77,7 @@ ul.no-bullet {list-style: none}
 </p></dd>
 </dl>
 
-</div><hr>
+<hr>
 <table class="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="node-with-printindex.html" 
title="Next chapter"> &gt;&gt; </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 ca8be84..77f73ed 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
@@ -50,8 +50,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="#node-with-printindex" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="index_table_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="node-with-printindex-1">
-<h1 class="chapter">2 node with printindex</h1>
+<span id="node-with-printindex-1"></span><h1 class="chapter">2 node with 
printindex</h1>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#node-with-printindex-1_fn_letter-F"><b>F</b></a>
  &nbsp; 
@@ -413,7 +412,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
+<hr>
 <table class="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="indices-refs.html#indices-refs" 
title="Next chapter"> &gt;&gt; </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 b7b4049..6c1b5b8 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
@@ -50,8 +50,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="index.html" 
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>
-<div class="node" id="A-chapter">
-<h1 class="chapter">1 A chapter</h1>
+<span id="A-chapter"></span><h1 class="chapter">1 A chapter</h1>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#A-chapter_cp_symbol-1"><b>!</b></a>
  &nbsp; 
@@ -122,11 +121,10 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><div class="node" id="node-in-chapter">
-
+<span id="node-in-chapter"></span>
 <span id="index-node-in-chapter"></span>
 
-</div><hr>
+<hr>
 <table class="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>
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 5af3a6e..e63c73c 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
@@ -36,8 +36,7 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<div class="node" id="first-before-top">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="first-before-top"></span><table class="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>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -191,8 +190,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><div class="node" id="node-in-menu-before-top">
-
+<span id="node-in-menu-before-top"></span>
 <span id="index-node-in-menu-before-top"></span>
 <p>between node in menu before top and printindex
 </p><table><tr><th valign="top">Jump to: &nbsp; </th><td><a 
class="summary-letter" href="#top-section_cp_symbol-1"><b>!</b></a>
@@ -268,7 +266,7 @@ ul.no-bullet {list-style: none}
 <span id="index-printindex-node-in-menu-before-top"></span>
 
 
-</div><div class="top" id="Top">
+<div class="top" id="Top">
 <span id="index-entry-a"></span>
 <p>in top node.
 </p><table><tr><th valign="top">Jump to: &nbsp; </th><td><a 
class="summary-letter" href="#top-section_cp_symbol-1"><b>!</b></a>
@@ -439,8 +437,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<div class="node" id="top-section">
-<h1 class="top">top section</h1>
+<span id="top-section"></span><h1 class="top">top section</h1>
 <span id="index-top-section"></span>
 
 <p>in top section
@@ -454,8 +451,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><div class="node" id="first">
-<p>Text and then index entries
+<span id="first"></span><p>Text and then index entries
 <span id="index-_0021-entry-in-node"></span>
 <span id="index-fun-in-node"></span>
 <span id="index-entry-in-node"></span>
@@ -534,8 +530,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><div class="node" id="second">
-<table class="menu" border="0" cellspacing="0">
+<span id="second"></span><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>
 <tr><td align="left" valign="top">&bull; <a 
href="#another">another</a></td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top">
@@ -570,14 +565,12 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><div class="node" id="another">
-
+<span id="another"></span>
 <span id="index-something"></span>
 <span id="index-somewhere"></span>
 <span id="index-another"></span>
 
-</div><div class="node" id="a-node">
-<span id="index-entry-after-printindex"></span>
+<span id="a-node"></span><span id="index-entry-after-printindex"></span>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#top-section_cp_symbol-1"><b>!</b></a>
  &nbsp; 
@@ -720,7 +713,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
+<hr>
 <table class="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/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 66c30a8..d274c2e 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
@@ -50,8 +50,7 @@ ul.no-bullet {list-style: none}
 <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>
-<div class="node" id="A-chapter">
-<h1 class="chapter">1 A chapter</h1>
+<span id="A-chapter"></span><h1 class="chapter">1 A chapter</h1>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#chapter_cp_symbol-1"><b>!</b></a>
  &nbsp; 
@@ -122,9 +121,8 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
-<div class="node" id="node-in-chapter">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr>
+<span id="node-in-chapter"></span><table class="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>
@@ -143,7 +141,7 @@ ul.no-bullet {list-style: none}
 
 <span id="index-node-in-chapter"></span>
 
-</div><hr>
+<hr>
 <table class="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">[ &gt;&gt; ]</td>
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 67fa19b..91a69c1 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
@@ -36,8 +36,7 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<div class="node" id="first-before-top">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="first-before-top"></span><table class="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>
@@ -199,9 +198,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
-<div class="node" id="node-in-menu-before-top">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr>
+<span id="node-in-menu-before-top"></span><table class="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>
@@ -293,7 +291,7 @@ ul.no-bullet {list-style: none}
 <span id="index-printindex-node-in-menu-before-top"></span>
 
 
-</div><hr>
+<hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
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 e6362f2..28e1273 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
@@ -213,8 +213,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<div class="node" id="top-section">
-<h1 class="top">top section</h1>
+<span id="top-section"></span><h1 class="top">top section</h1>
 <span id="index-top-section"></span>
 
 <p>in top section
@@ -228,9 +227,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
-<div class="node" id="first">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr size="6">
+<span id="first"></span><table class="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>
@@ -325,9 +323,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
-<div class="node" id="second">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr>
+<span id="second"></span><table class="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>
@@ -378,9 +375,8 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
-<div class="node" id="another">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr>
+<span id="another"></span><table class="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>
@@ -401,9 +397,8 @@ ul.no-bullet {list-style: none}
 <span id="index-somewhere"></span>
 <span id="index-another"></span>
 
-</div><hr>
-<div class="node" id="a-node">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr>
+<span id="a-node"></span><table class="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>
@@ -562,7 +557,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
+<hr>
 <table class="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="chapter.html#chapter" title="Next 
chapter"> &gt;&gt; </a>]</td>
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 76cf89e..eccb7ca 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
@@ -44,8 +44,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="#node-chap1" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <span id="index-top1"></span>
 <span id="index-top1-1"></span>
@@ -70,7 +69,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="node-chap1">
 <table class="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>
@@ -87,15 +86,14 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="#node-chap1" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="chapter-1">
-<h1 class="chapter">1 chapter 1</h1>
+<span id="chapter-1"></span><h1 class="chapter">1 chapter 1</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#node-sec1" rel="index">1.1 
section1</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="section" id="node-sec1">
 <table class="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>
@@ -146,10 +144,9 @@ ul.no-bullet {list-style: none}
 <a class="summary-letter" href="#section1_cp_letter-T"><b>T</b></a>
  &nbsp; 
 </td></tr></table>
-<div class="node" id="section1">
-<h2 class="section">1.1 section1</h2>
+<span id="section1"></span><h2 class="section">1.1 section1</h2>
 
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 </div>
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 4bc0b9b..91e28f0 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
@@ -44,8 +44,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="#node-chap1" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="top">
-<h1 class="top">top</h1>
+<span id="top"></span><h1 class="top">top</h1>
 
 <span id="index-top1"></span>
 <span id="index-top1-1"></span>
@@ -72,9 +71,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
-<div class="part" id="Part-1">
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<hr size="6">
+<span id="Part-1"></span><table class="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>
@@ -127,11 +125,10 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><div class="chapter" id="node-chap1">
-<div class="node" id="chapter-1">
-<h1 class="chapter">1 chapter 1</h1>
+<div class="chapter" id="node-chap1">
+<span id="chapter-1"></span><h1 class="chapter">1 chapter 1</h1>
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="node-chap2">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -149,10 +146,9 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="#node-chap1" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="chapter-2">
-<h1 class="chapter">2 chapter 2</h1>
+<span id="chapter-2"></span><h1 class="chapter">2 chapter 2</h1>
 
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="About_element" id="SEC_About">
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 0ffae88..113b0b4 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
@@ -50,8 +50,7 @@ ul.no-bullet {list-style: none}
 <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#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>][<a href="index.html" title="Index" 
rel="index">Index</a>]</p>
 </div>
-<div class="node" id="Copying-and-indices-1">
-<h2 class="appendix">Appendix A Copying and indices</h2>
+<span id="Copying-and-indices-1"></span><h2 class="appendix">Appendix A 
Copying and indices</h2>
 
 <p>In the appendix, we print the indices and references.
 </p>
@@ -153,7 +152,7 @@ domain<a id="DOCF1_2" href="#FOOT1_2"><sup>2</sup></a>.
  &nbsp; 
 </td></tr></table>
 
-</div><div class="footnote">
+<div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
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 bacb0ac..1920264 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
@@ -52,8 +52,7 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="Copying-and-indices.html" accesskey="n" rel="next">Copying and 
indices</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>][<a href="#Top" title="Index" 
rel="index">Index</a>]</p>
 </div>
-<div class="node" id="Top-1">
-<h1 class="top">Top</h1>
+<span id="Top-1"></span><h1 class="top">Top</h1>
 <div class="Contents_element" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
@@ -65,8 +64,7 @@ Next: <a href="Copying-and-indices.html" accesskey="n" 
rel="next">Copying and in
 </ul>
 </div>
 </div>
-</div><div class="chapter" id="Chapter">
-<h2 class="chapter">1 Chapter</h2>
+<span id="Chapter"></span><h2 class="chapter">1 Chapter</h2>
 
 
 <span id="index-copying-Copying-this-document"></span>
@@ -121,7 +119,7 @@ and titlepage, and various wrong index entries.
 </dl>
 
 
-</div><div class="footnote">
+<div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
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 b56425e..85a608e 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
@@ -49,8 +49,7 @@ ul.no-bullet {list-style: none}
 <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#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
 </div>
-<div class="node" id="Copying-and-indices-1">
-<h2 class="appendix">Appendix A Copying and indices</h2>
+<span id="Copying-and-indices-1"></span><h2 class="appendix">Appendix A 
Copying and indices</h2>
 
 <p>In the appendix, we print the indices and references.
 </p>
@@ -116,7 +115,7 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">Top</a>, Up: <a href="in
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
+<hr>
 <div class="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#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 21d8caa..8cd4a86 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
@@ -51,8 +51,7 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="Copying-and-indices.html" accesskey="n" rel="next">Copying and 
indices</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
 </div>
-<div class="node" id="Top-1">
-<h1 class="top">Top</h1>
+<span id="Top-1"></span><h1 class="top">Top</h1>
 <div class="Contents_element" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
@@ -64,8 +63,7 @@ Next: <a href="Copying-and-indices.html" accesskey="n" 
rel="next">Copying and in
 </ul>
 </div>
 </div>
-</div><div class="chapter" id="Chapter">
-<h2 class="chapter">1 Chapter</h2>
+<span id="Chapter"></span><h2 class="chapter">1 Chapter</h2>
 
 
 <p>This test demonstrates @anchor and indices in @copying
@@ -84,7 +82,7 @@ and titlepage, and various wrong index entries.
 </dl>
 
 
-</div><hr>
+<hr>
 <div class="header">
 <p>
 Next: <a href="Copying-and-indices.html" accesskey="n" rel="next">Copying and 
indices</a> &nbsp; [<a href="#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/Copying-and-indices.html
 
b/tp/tests/indices/res_parser_info/index_special_region_no_region_html/Copying-and-indices.html
index b56425e..85a608e 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
@@ -49,8 +49,7 @@ ul.no-bullet {list-style: none}
 <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#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
 </div>
-<div class="node" id="Copying-and-indices-1">
-<h2 class="appendix">Appendix A Copying and indices</h2>
+<span id="Copying-and-indices-1"></span><h2 class="appendix">Appendix A 
Copying and indices</h2>
 
 <p>In the appendix, we print the indices and references.
 </p>
@@ -116,7 +115,7 @@ Previous: <a href="index.html" accesskey="p" 
rel="prev">Top</a>, Up: <a href="in
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
+<hr>
 <div class="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#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 7a5a21c..d9a1827 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
@@ -51,8 +51,7 @@ ul.no-bullet {list-style: none}
 <p>
 Next: <a href="Copying-and-indices.html" accesskey="n" rel="next">Copying and 
indices</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
 </div>
-<div class="node" id="Top-1">
-<h1 class="top">Top</h1>
+<span id="Top-1"></span><h1 class="top">Top</h1>
 
 <div class="Contents_element" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
@@ -65,8 +64,7 @@ Next: <a href="Copying-and-indices.html" accesskey="n" 
rel="next">Copying and in
 </ul>
 </div>
 </div>
-</div><div class="chapter" id="Chapter">
-<h2 class="chapter">1 Chapter</h2>
+<span id="Chapter"></span><h2 class="chapter">1 Chapter</h2>
 
 
 <p>This test demonstrates @anchor and indices in @copying
@@ -85,7 +83,7 @@ and titlepage, and various wrong index entries.
 </dl>
 
 
-</div><hr>
+<hr>
 <div class="header">
 <p>
 Next: <a href="Copying-and-indices.html" accesskey="n" rel="next">Copying and 
indices</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
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 4f436d0..1dfee40 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
@@ -43,8 +43,7 @@ ul.no-bullet {list-style: none}
 <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>
 </div>
-<div class="node" id="A-chapter">
-<h2 class="chapter">1 A chapter</h2>
+<span id="A-chapter"></span><h2 class="chapter">1 A chapter</h2>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#chapter_cp_symbol-1"><b>!</b></a>
  &nbsp; 
@@ -115,9 +114,8 @@ Next: <a href="#node-in-chapter" accesskey="n" 
rel="next">node in chapter</a>, U
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
-<div class="node" id="node-in-chapter">
-<div class="header">
+<hr>
+<span id="node-in-chapter"></span><div class="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>
@@ -125,7 +123,7 @@ Previous: <a href="#chapter" accesskey="p" rel="prev">A 
chapter</a>, Up: <a href
 
 <span id="index-node-in-chapter"></span>
 
-</div><hr>
+<hr>
 <div class="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>
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 b7de102..55e588d 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
@@ -40,8 +40,7 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<div class="node" id="first-before-top">
-<div class="header">
+<span id="first-before-top"></span><div class="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>
@@ -188,9 +187,8 @@ Next: <a href="index.html#Top" accesskey="n" rel="next">top 
section</a>, Up: <a
 </td></tr></table>
 <p>after second printindex in first node
 </p>
-</div><hr>
-<div class="node" id="node-in-menu-before-top">
-<div class="header">
+<hr>
+<span id="node-in-menu-before-top"></span><div class="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>
@@ -271,7 +269,7 @@ Up: <a href="#first-before-top" accesskey="u" 
rel="up">first before top</a> &nbs
 <span id="index-printindex-node-in-menu-before-top"></span>
 
 
-</div><hr>
+<hr>
 <div class="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>
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 424c0df..6cc77c4 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
@@ -212,8 +212,7 @@ Previous: <a href="first-before-top.html#first-before-top" 
accesskey="p" rel="pr
  &nbsp; 
 </td></tr></table>
 
-<div class="node" id="top-section">
-<h1 class="top">top section</h1>
+<span id="top-section"></span><h1 class="top">top section</h1>
 <span id="index-top-section"></span>
 
 <p>in top section
@@ -222,9 +221,8 @@ Previous: <a href="first-before-top.html#first-before-top" 
accesskey="p" rel="pr
 <ul class="section-toc">
 <li><a href="chapter.html#chapter" accesskey="1">A chapter</a></li>
 </ul>
-</div><hr>
-<div class="node" id="first">
-<div class="header">
+<hr>
+<span id="first"></span><div class="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>
@@ -304,9 +302,8 @@ Previous: <a href="#Top" accesskey="p" rel="prev">top 
section</a>, Up: <a href="
 </td></tr></table>
 
 
-</div><hr>
-<div class="node" id="second">
-<div class="header">
+<hr>
+<span id="second"></span><div class="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>
@@ -340,9 +337,8 @@ Up: <a href="#first" accesskey="u" rel="up">first</a> 
&nbsp; [<a href="first-bef
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
-<div class="node" id="another">
-<div class="header">
+<hr>
+<span id="another"></span><div class="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>
@@ -352,9 +348,8 @@ Previous: <a href="#a-node" accesskey="p" rel="prev">a 
node</a>, Up: <a href="#s
 <span id="index-somewhere"></span>
 <span id="index-another"></span>
 
-</div><hr>
-<div class="node" id="a-node">
-<div class="header">
+<hr>
+<span id="a-node"></span><div class="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>
@@ -502,7 +497,7 @@ Next: <a href="#another" accesskey="n" 
rel="next">another</a>, Up: <a href="#sec
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
+<hr>
 <div class="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>
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 4f436d0..1dfee40 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
@@ -43,8 +43,7 @@ ul.no-bullet {list-style: none}
 <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>
 </div>
-<div class="node" id="A-chapter">
-<h2 class="chapter">1 A chapter</h2>
+<span id="A-chapter"></span><h2 class="chapter">1 A chapter</h2>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#chapter_cp_symbol-1"><b>!</b></a>
  &nbsp; 
@@ -115,9 +114,8 @@ Next: <a href="#node-in-chapter" accesskey="n" 
rel="next">node in chapter</a>, U
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
-<div class="node" id="node-in-chapter">
-<div class="header">
+<hr>
+<span id="node-in-chapter"></span><div class="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>
@@ -125,7 +123,7 @@ Previous: <a href="#chapter" accesskey="p" rel="prev">A 
chapter</a>, Up: <a href
 
 <span id="index-node-in-chapter"></span>
 
-</div><hr>
+<hr>
 <div class="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>
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 b7de102..55e588d 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
@@ -40,8 +40,7 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<div class="node" id="first-before-top">
-<div class="header">
+<span id="first-before-top"></span><div class="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>
@@ -188,9 +187,8 @@ Next: <a href="index.html#Top" accesskey="n" rel="next">top 
section</a>, Up: <a
 </td></tr></table>
 <p>after second printindex in first node
 </p>
-</div><hr>
-<div class="node" id="node-in-menu-before-top">
-<div class="header">
+<hr>
+<span id="node-in-menu-before-top"></span><div class="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>
@@ -271,7 +269,7 @@ Up: <a href="#first-before-top" accesskey="u" 
rel="up">first before top</a> &nbs
 <span id="index-printindex-node-in-menu-before-top"></span>
 
 
-</div><hr>
+<hr>
 <div class="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>
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 424c0df..6cc77c4 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
@@ -212,8 +212,7 @@ Previous: <a href="first-before-top.html#first-before-top" 
accesskey="p" rel="pr
  &nbsp; 
 </td></tr></table>
 
-<div class="node" id="top-section">
-<h1 class="top">top section</h1>
+<span id="top-section"></span><h1 class="top">top section</h1>
 <span id="index-top-section"></span>
 
 <p>in top section
@@ -222,9 +221,8 @@ Previous: <a href="first-before-top.html#first-before-top" 
accesskey="p" rel="pr
 <ul class="section-toc">
 <li><a href="chapter.html#chapter" accesskey="1">A chapter</a></li>
 </ul>
-</div><hr>
-<div class="node" id="first">
-<div class="header">
+<hr>
+<span id="first"></span><div class="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>
@@ -304,9 +302,8 @@ Previous: <a href="#Top" accesskey="p" rel="prev">top 
section</a>, Up: <a href="
 </td></tr></table>
 
 
-</div><hr>
-<div class="node" id="second">
-<div class="header">
+<hr>
+<span id="second"></span><div class="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>
@@ -340,9 +337,8 @@ Up: <a href="#first" accesskey="u" rel="up">first</a> 
&nbsp; [<a href="first-bef
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
-<div class="node" id="another">
-<div class="header">
+<hr>
+<span id="another"></span><div class="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>
@@ -352,9 +348,8 @@ Previous: <a href="#a-node" accesskey="p" rel="prev">a 
node</a>, Up: <a href="#s
 <span id="index-somewhere"></span>
 <span id="index-another"></span>
 
-</div><hr>
-<div class="node" id="a-node">
-<div class="header">
+<hr>
+<span id="a-node"></span><div class="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>
@@ -502,7 +497,7 @@ Next: <a href="#another" accesskey="n" 
rel="next">another</a>, Up: <a href="#sec
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
+<hr>
 <div class="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>
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html 
b/tp/tests/layout/res_parser/formatting/formatting.html
index 226a919..38dbdab 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -1300,21 +1300,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading-3">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading-3">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading-3">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading-3">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading-3">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading-3"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading-3"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading-3"></span><h2 class="heading">heading</h2>
+
+<span id="subheading-3"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading-3"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -2061,21 +2056,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading"></span><h2 class="heading">heading</h2>
+
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -2189,8 +2179,7 @@ html ''
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Top-section">
-<h1 class="top">Top section</h1>
+<span id="Top-section"></span><h1 class="top">Top section</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#chapter">1 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
@@ -2848,21 +2837,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading"></span><h2 class="heading">heading</h2>
+
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -3608,21 +3592,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading-1">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading-1">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading-1">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading-1">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading-1">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading-1"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading-1"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading-1"></span><h2 class="heading">heading</h2>
+
+<span id="subheading-1"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading-1"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -4452,25 +4431,20 @@ html ''
 
 
 
-</pre><div class="majorheading" id="majorheading-2">
-<strong>majorheading</strong>
-</div><pre class="example">
+</pre><span id="majorheading-2"></span><strong>majorheading</strong>
+<pre class="example">
 
-</pre><div class="chapheading" id="chapheading-2">
-<strong>chapheading</strong>
-</div><pre class="example">
+</pre><span id="chapheading-2"></span><strong>chapheading</strong>
+<pre class="example">
 
-</pre><div class="heading" id="heading-2">
-<strong>heading</strong>
-</div><pre class="example">
+</pre><span id="heading-2"></span><strong>heading</strong>
+<pre class="example">
 
-</pre><div class="subheading" id="subheading-2">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-2"></span><strong>subheading</strong>
+<pre class="example">
 
-</pre><div class="subsubheading" id="subsubheading-2">
-<strong>subsubheading</strong>
-</div><pre class="example">
+</pre><span id="subsubheading-2"></span><strong>subsubheading</strong>
+<pre class="example">
 
 
 <code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym title="an 
accronym , ...">--a</acronym> (an accronym , ...)
@@ -5009,7 +4983,7 @@ Invalid use of @':
 
 
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -5026,8 +5000,7 @@ Invalid use of @':
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="chapter-1">
-<h1 class="chapter">1 chapter</h1>
+<span id="chapter-1"></span><h1 class="chapter">1 chapter</h1>
 
 <p><a id="DOCF9" href="#FOOT9"><sup>11</sup></a>
 </p>
@@ -5043,7 +5016,7 @@ Menu comment
 </pre></td></tr></table>
 </div>
 
-</div><hr>
+<hr>
 <div class="section" id="s_002d_002dect_002cion">
 <table class="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>
@@ -5060,8 +5033,7 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="A-section">
-<h2 class="section">1.1 A section</h2>
+<span id="A-section"></span><h2 class="section">1.1 A section</h2>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#subsection">1.1.1 
subsection</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
@@ -5076,7 +5048,7 @@ Menu comment
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="subsection" id="subsection">
 <table class="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>
@@ -5093,8 +5065,7 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="subsection-1">
-<h3 class="subsection">1.1.1 subsection</h3>
+<span id="subsection-1"></span><h3 class="subsection">1.1.1 subsection</h3>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a 
href="#subsubsection-_0060_0060simple_002ddouble_002d_002d">1.1.1.1 
subsubsection &ldquo;simple-double&ndash;</a></td><td>&nbsp;&nbsp;</td><td 
align="left" valign="top">
@@ -5104,7 +5075,7 @@ Menu comment
 </table>
 
 <span id="anchor"></span>
-</div><hr>
+<hr>
 <div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
 <table class="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>
@@ -5121,10 +5092,9 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1">
-<h4 class="subsubsection">1.1.1.1 subsubsection 
&ldquo;simple-double&ndash;</h4>
+<span id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1"></span><h4 
class="subsubsection">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</h4>
 
-</div><hr>
+<hr>
 </div>
 <div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -5142,10 +5112,9 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
-<h4 class="subsubsection">1.1.1.2 three&mdash;four&mdash;-&rdquo;</h4>
+<span id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027"></span><h4 
class="subsubsection">1.1.1.2 three&mdash;four&mdash;-&rdquo;</h4>
 
-</div><hr>
+<hr>
 </div>
 </div>
 </div>
@@ -5166,8 +5135,7 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="chapter-2">
-<h1 class="centerchap" align="center">chapter 2</h1>
+<span id="chapter-2"></span><h1 class="centerchap" align="center">chapter 
2</h1>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#chapter-2_cp_symbol-1"><b>&quot;</b></a>
  &nbsp; 
@@ -5490,7 +5458,7 @@ Menu comment
  &nbsp; 
 </td></tr></table>
 
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="Footnotes_element" id="SEC_Foot">
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter.html 
b/tp/tests/layout/res_parser/formatting_chm/chapter.html
index 5b256cf..ca07f0a 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter.html
@@ -654,13 +654,12 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 <div class="chapter" id="chapter">
-<div class="node" id="chapter-1">
-<h1 class="chapter">1 chapter</h1>
+<span id="chapter-1"></span><h1 class="chapter">1 chapter</h1>
 
 <p><a id="DOCF9" href="#FOOT9"><sup>11</sup></a>
 </p>
 
-</div><div class="footnote">
+<div class="footnote">
 <h3 class="footnotes-heading">Footnotes</h3>
 
 <h5><a id="FOOT9" href="#DOCF9">(11)</a></h5>
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter2.html 
b/tp/tests/layout/res_parser/formatting_chm/chapter2.html
index 99e1b60..e7bcca7 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter2.html
@@ -658,8 +658,7 @@ ul.no-bullet {list-style: none}
 </div>
 </div>
 <div class="centerchap" id="chapter2">
-<div class="node" id="chapter-2">
-<h1 class="centerchap" align="center">chapter 2</h1>
+<span id="chapter-2"></span><h1 class="centerchap" align="center">chapter 
2</h1>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#chapter-2_cp_symbol-1"><b>&quot;</b></a>
  &nbsp; 
@@ -982,7 +981,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><p>
+<p>
 
 </p>
 </body>
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.html 
b/tp/tests/layout/res_parser/formatting_chm/formatting.html
index b55ec8d..f3752c6 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting.html
@@ -1300,21 +1300,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading-3">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading-3">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading-3">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading-3">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading-3">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading-3"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading-3"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading-3"></span><h2 class="heading">heading</h2>
+
+<span id="subheading-3"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading-3"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -2061,21 +2056,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading"></span><h2 class="heading">heading</h2>
+
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -2181,8 +2171,7 @@ html ''
 
 
 <div class="top" id="Top">
-<div class="node" id="Top-section">
-<h1 class="top">Top section</h1>
+<span id="Top-section"></span><h1 class="top">Top section</h1>
 
 
 
@@ -2831,21 +2820,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading"></span><h2 class="heading">heading</h2>
+
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -3591,21 +3575,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading-1">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading-1">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading-1">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading-1">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading-1">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading-1"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading-1"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading-1"></span><h2 class="heading">heading</h2>
+
+<span id="subheading-1"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading-1"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -4435,25 +4414,20 @@ html ''
 
 
 
-</pre><div class="majorheading" id="majorheading-2">
-<strong>majorheading</strong>
-</div><pre class="example">
+</pre><span id="majorheading-2"></span><strong>majorheading</strong>
+<pre class="example">
 
-</pre><div class="chapheading" id="chapheading-2">
-<strong>chapheading</strong>
-</div><pre class="example">
+</pre><span id="chapheading-2"></span><strong>chapheading</strong>
+<pre class="example">
 
-</pre><div class="heading" id="heading-2">
-<strong>heading</strong>
-</div><pre class="example">
+</pre><span id="heading-2"></span><strong>heading</strong>
+<pre class="example">
 
-</pre><div class="subheading" id="subheading-2">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-2"></span><strong>subheading</strong>
+<pre class="example">
 
-</pre><div class="subsubheading" id="subsubheading-2">
-<strong>subsubheading</strong>
-</div><pre class="example">
+</pre><span id="subsubheading-2"></span><strong>subsubheading</strong>
+<pre class="example">
 
 
 <code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym title="an 
accronym , ...">--a</acronym> (an accronym , ...)
@@ -4992,7 +4966,7 @@ Invalid use of @':
 
 
 
-</div><div class="footnote">
+<div class="footnote">
 <h3 class="footnotes-heading">Footnotes</h3>
 
 <h5><a id="FOOT1" href="#DOCF1">(1)</a></h5>
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 4352883..47f983b 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
@@ -654,11 +654,10 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 <div class="section" id="s_002d_002dect_002cion">
-<div class="node" id="A-section">
-<h2 class="section">1.1 A section</h2>
+<span id="A-section"></span><h2 class="section">1.1 A section</h2>
 
 
-</div><p>
+<p>
 
 </p>
 </body>
diff --git a/tp/tests/layout/res_parser/formatting_chm/subsection.html 
b/tp/tests/layout/res_parser/formatting_chm/subsection.html
index 52f4bdc..5695a71 100644
--- a/tp/tests/layout/res_parser/formatting_chm/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_chm/subsection.html
@@ -654,12 +654,11 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 <div class="subsection" id="subsection">
-<div class="node" id="subsection-1">
-<h3 class="subsection">1.1.1 subsection</h3>
+<span id="subsection-1"></span><h3 class="subsection">1.1.1 subsection</h3>
 
 
 <span id="anchor"></span>
-</div><p>
+<p>
 
 </p>
 </body>
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 a750fa9..6c69c5a 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
@@ -654,10 +654,9 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 <div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
-<div class="node" id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1">
-<h4 class="subsubsection">1.1.1.1 subsubsection 
&ldquo;simple-double&ndash;</h4>
+<span id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1"></span><h4 
class="subsubsection">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</h4>
 
-</div><p>
+<p>
 
 </p>
 </body>
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 2113132..b9026ea 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
@@ -655,10 +655,9 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 </div>
 <div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
-<div class="node" id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
-<h4 class="subsubsection">1.1.1.2 three&mdash;four&mdash;-&rdquo;</h4>
+<span id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027"></span><h4 
class="subsubsection">1.1.1.2 three&mdash;four&mdash;-&rdquo;</h4>
 
-</div><p>
+<p>
 
 </p>
 </body>
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter.html 
b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index 9eb0886..59f1a66 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
@@ -670,13 +670,12 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="index.html" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="chapter-1">
-<h1 class="chapter"><a 
href="formatting_toc.html#toc-chapter-1">chapter</a></h1>
+<span id="chapter-1"></span><h1 class="chapter"><a 
href="formatting_toc.html#toc-chapter-1">chapter</a></h1>
 
 <p><a id="DOCF9" href="#FOOT9"><sup>7</sup></a>
 </p>
 
-</div><div class="footnote">
+<div class="footnote">
 <hr>
 <h3 class="footnotes-heading">Footnotes</h3>
 
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter2.html 
b/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
index 1ddc0ab..a35c7ae 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
@@ -670,8 +670,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="index.html" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="chapter-2">
-<h1 class="centerchap" align="center"><a 
href="formatting_toc.html#toc-chapter-2">chapter 2</a></h1>
+<span id="chapter-2"></span><h1 class="centerchap" align="center"><a 
href="formatting_toc.html#toc-chapter-2">chapter 2</a></h1>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#chapter-2_cp_symbol-1"><b>&quot;</b></a>
  &nbsp; 
@@ -994,7 +993,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
+<hr>
 <table class="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 a1f69f4..4fa1240 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/index.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/index.html
@@ -664,8 +664,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="Top-section">
-<h1 class="top"><a href="formatting_toc.html#toc-Top-section">Top 
section</a></h1>
+<span id="Top-section"></span><h1 class="top"><a 
href="formatting_toc.html#toc-Top-section">Top section</a></h1>
 
 
 
@@ -1314,21 +1313,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading"></span><h2 class="heading">heading</h2>
+
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -2074,21 +2068,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading-1">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading-1">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading-1">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading-1">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading-1">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading-1"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading-1"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading-1"></span><h2 class="heading">heading</h2>
+
+<span id="subheading-1"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading-1"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -2918,25 +2907,20 @@ html ''
 
 
 
-</pre><div class="majorheading" id="majorheading-2">
-<strong>majorheading</strong>
-</div><pre class="example">
+</pre><span id="majorheading-2"></span><strong>majorheading</strong>
+<pre class="example">
 
-</pre><div class="chapheading" id="chapheading-2">
-<strong>chapheading</strong>
-</div><pre class="example">
+</pre><span id="chapheading-2"></span><strong>chapheading</strong>
+<pre class="example">
 
-</pre><div class="heading" id="heading-2">
-<strong>heading</strong>
-</div><pre class="example">
+</pre><span id="heading-2"></span><strong>heading</strong>
+<pre class="example">
 
-</pre><div class="subheading" id="subheading-2">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-2"></span><strong>subheading</strong>
+<pre class="example">
 
-</pre><div class="subsubheading" id="subsubheading-2">
-<strong>subsubheading</strong>
-</div><pre class="example">
+</pre><span id="subsubheading-2"></span><strong>subsubheading</strong>
+<pre class="example">
 
 
 <code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym title="an 
accronym , ...">--a</acronym> (an accronym , ...)
@@ -3475,7 +3459,7 @@ Invalid use of @':
 
 
 
-</div><div class="footnote">
+<div class="footnote">
 <hr>
 <h3 class="footnotes-heading">Footnotes</h3>
 
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 ecc7b33..3b7a72c 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
@@ -670,29 +670,25 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="index.html" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<div class="node" id="A-section">
-<h2 class="section"><a href="formatting_toc.html#toc-A-section">A 
section</a></h2>
+<span id="A-section"></span><h2 class="section"><a 
href="formatting_toc.html#toc-A-section">A section</a></h2>
 
 
-</div><hr>
+<hr>
 <div class="subsection" id="subsection">
-<div class="node" id="subsection-1">
-<h3 class="subsection"><a 
href="formatting_toc.html#toc-subsection-1">subsection</a></h3>
+<span id="subsection-1"></span><h3 class="subsection"><a 
href="formatting_toc.html#toc-subsection-1">subsection</a></h3>
 
 
 <span id="anchor"></span>
-</div><hr>
+<hr>
 <div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
-<div class="node" id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1">
-<h4 class="subsubsection"><a 
href="formatting_toc.html#toc-subsubsection-_0060_0060simple_002ddouble_002d_002d-1">subsubsection
 &ldquo;simple-double&ndash;</a></h4>
+<span id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1"></span><h4 
class="subsubsection"><a 
href="formatting_toc.html#toc-subsubsection-_0060_0060simple_002ddouble_002d_002d-1">subsubsection
 &ldquo;simple-double&ndash;</a></h4>
 
-</div><hr>
+<hr>
 </div>
 <div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
-<div class="node" id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
-<h4 class="subsubsection"><a 
href="formatting_toc.html#toc-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">three&mdash;four&mdash;-&rdquo;</a></h4>
+<span id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027"></span><h4 
class="subsubsection"><a 
href="formatting_toc.html#toc-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">three&mdash;four&mdash;-&rdquo;</a></h4>
 
-</div><hr>
+<hr>
 <table class="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" title="Previous 
section in reading order"> &lt; </a>]</td>
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 aa5a767..a07848a 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -1300,21 +1300,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading-3">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading-3">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading-3">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading-3">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading-3">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading-3"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading-3"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading-3"></span><h2 class="heading">heading</h2>
+
+<span id="subheading-3"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading-3"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -2061,21 +2056,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading"></span><h2 class="heading">heading</h2>
+
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -2189,8 +2179,7 @@ html ''
 <td valign="middle" align="left"><a href="#Top" title="Index"><img 
src="a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
 <td valign="middle" align="left"><a href="#SEC_About" title="A propos (page 
d&rsquo;aide)"><img src="a_help.png" border="0" alt="A propos: A propos de ce 
document" align="middle"></a></td>
 </tr></table>
-<div class="node" id="Top-section">
-<h1 class="top">Top section</h1>
+<span id="Top-section"></span><h1 class="top">Top section</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#chapter">1 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
@@ -2848,21 +2837,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading"></span><h2 class="heading">heading</h2>
+
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -3608,21 +3592,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading-1">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading-1">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading-1">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading-1">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading-1">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading-1"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading-1"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading-1"></span><h2 class="heading">heading</h2>
+
+<span id="subheading-1"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading-1"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -4452,25 +4431,20 @@ html ''
 
 
 
-</pre><div class="majorheading" id="majorheading-2">
-<strong>majorheading</strong>
-</div><pre class="example">
+</pre><span id="majorheading-2"></span><strong>majorheading</strong>
+<pre class="example">
 
-</pre><div class="chapheading" id="chapheading-2">
-<strong>chapheading</strong>
-</div><pre class="example">
+</pre><span id="chapheading-2"></span><strong>chapheading</strong>
+<pre class="example">
 
-</pre><div class="heading" id="heading-2">
-<strong>heading</strong>
-</div><pre class="example">
+</pre><span id="heading-2"></span><strong>heading</strong>
+<pre class="example">
 
-</pre><div class="subheading" id="subheading-2">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-2"></span><strong>subheading</strong>
+<pre class="example">
 
-</pre><div class="subsubheading" id="subsubheading-2">
-<strong>subsubheading</strong>
-</div><pre class="example">
+</pre><span id="subsubheading-2"></span><strong>subsubheading</strong>
+<pre class="example">
 
 
 <code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym title="an 
accronym , ...">--a</acronym> (an accronym , ...)
@@ -5009,7 +4983,7 @@ Invalid use of @':
 
 
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -5026,8 +5000,7 @@ Invalid use of @':
 <td valign="middle" align="left"><a href="#Top" title="Index"><img 
src="a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
 <td valign="middle" align="left"><a href="#SEC_About" title="A propos (page 
d&rsquo;aide)"><img src="a_help.png" border="0" alt="A propos: A propos de ce 
document" align="middle"></a></td>
 </tr></table>
-<div class="node" id="chapter-1">
-<h1 class="chapter">1 chapter</h1>
+<span id="chapter-1"></span><h1 class="chapter">1 chapter</h1>
 
 <p><a id="DOCF9" href="#FOOT9"><sup>11</sup></a>
 </p>
@@ -5043,7 +5016,7 @@ Menu comment
 </pre></td></tr></table>
 </div>
 
-</div><hr>
+<hr>
 <div class="section" id="s_002d_002dect_002cion">
 <table class="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>
@@ -5060,8 +5033,7 @@ Menu comment
 <td valign="middle" align="left"><a href="#Top" title="Index"><img 
src="a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
 <td valign="middle" align="left"><a href="#SEC_About" title="A propos (page 
d&rsquo;aide)"><img src="a_help.png" border="0" alt="A propos: A propos de ce 
document" align="middle"></a></td>
 </tr></table>
-<div class="node" id="A-section">
-<h2 class="section">1.1 A section</h2>
+<span id="A-section"></span><h2 class="section">1.1 A section</h2>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#subsection">1.1.1 
subsection</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
@@ -5076,7 +5048,7 @@ Menu comment
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="subsection" id="subsection">
 <table class="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>
@@ -5093,8 +5065,7 @@ Menu comment
 <td valign="middle" align="left"><a href="#Top" title="Index"><img 
src="a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
 <td valign="middle" align="left"><a href="#SEC_About" title="A propos (page 
d&rsquo;aide)"><img src="a_help.png" border="0" alt="A propos: A propos de ce 
document" align="middle"></a></td>
 </tr></table>
-<div class="node" id="subsection-1">
-<h3 class="subsection">1.1.1 subsection</h3>
+<span id="subsection-1"></span><h3 class="subsection">1.1.1 subsection</h3>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a 
href="#subsubsection-_0060_0060simple_002ddouble_002d_002d">1.1.1.1 
subsubsection &ldquo;simple-double&ndash;</a></td><td>&nbsp;&nbsp;</td><td 
align="left" valign="top">
@@ -5104,7 +5075,7 @@ Menu comment
 </table>
 
 <span id="anchor"></span>
-</div><hr>
+<hr>
 <div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
 <table class="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>
@@ -5121,10 +5092,9 @@ Menu comment
 <td valign="middle" align="left"><a href="#Top" title="Index"><img 
src="a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
 <td valign="middle" align="left"><a href="#SEC_About" title="A propos (page 
d&rsquo;aide)"><img src="a_help.png" border="0" alt="A propos: A propos de ce 
document" align="middle"></a></td>
 </tr></table>
-<div class="node" id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1">
-<h4 class="subsubsection">1.1.1.1 subsubsection 
&ldquo;simple-double&ndash;</h4>
+<span id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1"></span><h4 
class="subsubsection">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</h4>
 
-</div><hr>
+<hr>
 </div>
 <div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -5142,10 +5112,9 @@ Menu comment
 <td valign="middle" align="left"><a href="#Top" title="Index"><img 
src="a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
 <td valign="middle" align="left"><a href="#SEC_About" title="A propos (page 
d&rsquo;aide)"><img src="a_help.png" border="0" alt="A propos: A propos de ce 
document" align="middle"></a></td>
 </tr></table>
-<div class="node" id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
-<h4 class="subsubsection">1.1.1.2 three&mdash;four&mdash;-&rdquo;</h4>
+<span id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027"></span><h4 
class="subsubsection">1.1.1.2 three&mdash;four&mdash;-&rdquo;</h4>
 
-</div><hr>
+<hr>
 </div>
 </div>
 </div>
@@ -5166,8 +5135,7 @@ Menu comment
 <td valign="middle" align="left"><a href="#Top" title="Index"><img 
src="a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
 <td valign="middle" align="left"><a href="#SEC_About" title="A propos (page 
d&rsquo;aide)"><img src="a_help.png" border="0" alt="A propos: A propos de ce 
document" align="middle"></a></td>
 </tr></table>
-<div class="node" id="chapter-2">
-<h1 class="centerchap" align="center">chapter 2</h1>
+<span id="chapter-2"></span><h1 class="centerchap" align="center">chapter 
2</h1>
 
 <table><tr><th valign="top">Aller &agrave;: &nbsp; </th><td><a 
class="summary-letter" href="#chapter-2_cp_symbol-1"><b>&quot;</b></a>
  &nbsp; 
@@ -5490,7 +5458,7 @@ Menu comment
  &nbsp; 
 </td></tr></table>
 
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="Footnotes_element" id="SEC_Foot">
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html 
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index 226a919..38dbdab 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -1300,21 +1300,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading-3">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading-3">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading-3">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading-3">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading-3">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading-3"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading-3"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading-3"></span><h2 class="heading">heading</h2>
+
+<span id="subheading-3"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading-3"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -2061,21 +2056,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading"></span><h2 class="heading">heading</h2>
+
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -2189,8 +2179,7 @@ html ''
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Top-section">
-<h1 class="top">Top section</h1>
+<span id="Top-section"></span><h1 class="top">Top section</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#chapter">1 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
@@ -2848,21 +2837,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading"></span><h2 class="heading">heading</h2>
+
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -3608,21 +3592,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading-1">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading-1">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading-1">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading-1">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading-1">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading-1"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading-1"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading-1"></span><h2 class="heading">heading</h2>
+
+<span id="subheading-1"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading-1"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -4452,25 +4431,20 @@ html ''
 
 
 
-</pre><div class="majorheading" id="majorheading-2">
-<strong>majorheading</strong>
-</div><pre class="example">
+</pre><span id="majorheading-2"></span><strong>majorheading</strong>
+<pre class="example">
 
-</pre><div class="chapheading" id="chapheading-2">
-<strong>chapheading</strong>
-</div><pre class="example">
+</pre><span id="chapheading-2"></span><strong>chapheading</strong>
+<pre class="example">
 
-</pre><div class="heading" id="heading-2">
-<strong>heading</strong>
-</div><pre class="example">
+</pre><span id="heading-2"></span><strong>heading</strong>
+<pre class="example">
 
-</pre><div class="subheading" id="subheading-2">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-2"></span><strong>subheading</strong>
+<pre class="example">
 
-</pre><div class="subsubheading" id="subsubheading-2">
-<strong>subsubheading</strong>
-</div><pre class="example">
+</pre><span id="subsubheading-2"></span><strong>subsubheading</strong>
+<pre class="example">
 
 
 <code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym title="an 
accronym , ...">--a</acronym> (an accronym , ...)
@@ -5009,7 +4983,7 @@ Invalid use of @':
 
 
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -5026,8 +5000,7 @@ Invalid use of @':
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="chapter-1">
-<h1 class="chapter">1 chapter</h1>
+<span id="chapter-1"></span><h1 class="chapter">1 chapter</h1>
 
 <p><a id="DOCF9" href="#FOOT9"><sup>11</sup></a>
 </p>
@@ -5043,7 +5016,7 @@ Menu comment
 </pre></td></tr></table>
 </div>
 
-</div><hr>
+<hr>
 <div class="section" id="s_002d_002dect_002cion">
 <table class="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>
@@ -5060,8 +5033,7 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="A-section">
-<h2 class="section">1.1 A section</h2>
+<span id="A-section"></span><h2 class="section">1.1 A section</h2>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#subsection">1.1.1 
subsection</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
@@ -5076,7 +5048,7 @@ Menu comment
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="subsection" id="subsection">
 <table class="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>
@@ -5093,8 +5065,7 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="subsection-1">
-<h3 class="subsection">1.1.1 subsection</h3>
+<span id="subsection-1"></span><h3 class="subsection">1.1.1 subsection</h3>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a 
href="#subsubsection-_0060_0060simple_002ddouble_002d_002d">1.1.1.1 
subsubsection &ldquo;simple-double&ndash;</a></td><td>&nbsp;&nbsp;</td><td 
align="left" valign="top">
@@ -5104,7 +5075,7 @@ Menu comment
 </table>
 
 <span id="anchor"></span>
-</div><hr>
+<hr>
 <div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
 <table class="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>
@@ -5121,10 +5092,9 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1">
-<h4 class="subsubsection">1.1.1.1 subsubsection 
&ldquo;simple-double&ndash;</h4>
+<span id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1"></span><h4 
class="subsubsection">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</h4>
 
-</div><hr>
+<hr>
 </div>
 <div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -5142,10 +5112,9 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
-<h4 class="subsubsection">1.1.1.2 three&mdash;four&mdash;-&rdquo;</h4>
+<span id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027"></span><h4 
class="subsubsection">1.1.1.2 three&mdash;four&mdash;-&rdquo;</h4>
 
-</div><hr>
+<hr>
 </div>
 </div>
 </div>
@@ -5166,8 +5135,7 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="chapter-2">
-<h1 class="centerchap" align="center">chapter 2</h1>
+<span id="chapter-2"></span><h1 class="centerchap" align="center">chapter 
2</h1>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#chapter-2_cp_symbol-1"><b>&quot;</b></a>
  &nbsp; 
@@ -5490,7 +5458,7 @@ Menu comment
  &nbsp; 
 </td></tr></table>
 
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="Footnotes_element" id="SEC_Foot">
diff --git a/tp/tests/layout/res_parser/formatting_html32/formatting.html 
b/tp/tests/layout/res_parser/formatting_html32/formatting.html
index ae0444c..7dc1c19 100644
--- a/tp/tests/layout/res_parser/formatting_html32/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html32/formatting.html
@@ -1264,21 +1264,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading-3">
-<h1>majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading-3">
-<h1>chapheading</h1>
-</div>
-<div class="heading" id="heading-3">
-<h2>heading</h2>
-</div>
-<div class="subheading" id="subheading-3">
-<h3>subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading-3">
-<h4>subsubheading</h4>
-</div>
+<span id="majorheading-3"></span><h1>majorheading</h1>
+
+<span id="chapheading-3"></span><h1>chapheading</h1>
+
+<span id="heading-3"></span><h2>heading</h2>
+
+<span id="subheading-3"></span><h3>subheading</h3>
+
+<span id="subsubheading-3"></span><h4>subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> -a (an accronym 
, <small>...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> 
&Eacute;-. ,A. (&Eacute;tude-, <b>Autonome</b>)
@@ -2008,21 +2003,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading">
-<h1>majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading">
-<h1>chapheading</h1>
-</div>
-<div class="heading" id="heading">
-<h2>heading</h2>
-</div>
-<div class="subheading" id="subheading">
-<h3>subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading">
-<h4>subsubheading</h4>
-</div>
+<span id="majorheading"></span><h1>majorheading</h1>
+
+<span id="chapheading"></span><h1>chapheading</h1>
+
+<span id="heading"></span><h2>heading</h2>
+
+<span id="subheading"></span><h3>subheading</h3>
+
+<span id="subsubheading"></span><h4>subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> -a (an accronym 
, <small>...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> 
&Eacute;-. ,A. (&Eacute;tude-, <b>Autonome</b>)
@@ -2136,8 +2126,7 @@ html ''
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Top-section">
-<h1>Top section</h1>
+<span id="Top-section"></span><h1>Top section</h1>
 
 <table border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#chapter">1 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
@@ -2778,21 +2767,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading">
-<h1>majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading">
-<h1>chapheading</h1>
-</div>
-<div class="heading" id="heading">
-<h2>heading</h2>
-</div>
-<div class="subheading" id="subheading">
-<h3>subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading">
-<h4>subsubheading</h4>
-</div>
+<span id="majorheading"></span><h1>majorheading</h1>
+
+<span id="chapheading"></span><h1>chapheading</h1>
+
+<span id="heading"></span><h2>heading</h2>
+
+<span id="subheading"></span><h3>subheading</h3>
+
+<span id="subsubheading"></span><h4>subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> -a (an accronym 
, <small>...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> 
&Eacute;-. ,A. (&Eacute;tude-, <b>Autonome</b>)
@@ -3521,21 +3505,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading-1">
-<h1>majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading-1">
-<h1>chapheading</h1>
-</div>
-<div class="heading" id="heading-1">
-<h2>heading</h2>
-</div>
-<div class="subheading" id="subheading-1">
-<h3>subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading-1">
-<h4>subsubheading</h4>
-</div>
+<span id="majorheading-1"></span><h1>majorheading</h1>
+
+<span id="chapheading-1"></span><h1>chapheading</h1>
+
+<span id="heading-1"></span><h2>heading</h2>
+
+<span id="subheading-1"></span><h3>subheading</h3>
+
+<span id="subsubheading-1"></span><h4>subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> -a (an accronym 
, <small>...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> 
&Eacute;-. ,A. (&Eacute;tude-, <b>Autonome</b>)
@@ -4347,25 +4326,20 @@ html ''
 
 
 
-</pre><div class="majorheading" id="majorheading-2">
-<strong>majorheading</strong>
-</div><pre>
+</pre><span id="majorheading-2"></span><strong>majorheading</strong>
+<pre>
 
-</pre><div class="chapheading" id="chapheading-2">
-<strong>chapheading</strong>
-</div><pre>
+</pre><span id="chapheading-2"></span><strong>chapheading</strong>
+<pre>
 
-</pre><div class="heading" id="heading-2">
-<strong>heading</strong>
-</div><pre>
+</pre><span id="heading-2"></span><strong>heading</strong>
+<pre>
 
-</pre><div class="subheading" id="subheading-2">
-<strong>subheading</strong>
-</div><pre>
+</pre><span id="subheading-2"></span><strong>subheading</strong>
+<pre>
 
-</pre><div class="subsubheading" id="subsubheading-2">
-<strong>subsubheading</strong>
-</div><pre>
+</pre><span id="subsubheading-2"></span><strong>subsubheading</strong>
+<pre>
 
 
 <code>@acronym{--a,an accronym @comma{} @enddots{}}</code> --a (an accronym , 
...)
@@ -4904,7 +4878,7 @@ Invalid use of @':
 
 
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table 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>
@@ -4921,8 +4895,7 @@ Invalid use of @':
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="chapter-1">
-<h1>1 chapter</h1>
+<span id="chapter-1"></span><h1>1 chapter</h1>
 
 <p><a id="DOCF9" href="#FOOT9"><sup>11</sup></a>
 </p>
@@ -4937,7 +4910,7 @@ Menu comment
 </pre></td></tr></table>
 
 
-</div><hr>
+<hr>
 <div class="section" id="s_002d_002dect_002cion">
 <table 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>
@@ -4954,8 +4927,7 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="A-section">
-<h2>1.1 A section</h2>
+<span id="A-section"></span><h2>1.1 A section</h2>
 
 <table border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#subsection">1.1.1 
subsection</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
@@ -4970,7 +4942,7 @@ Menu comment
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="subsection" id="subsection">
 <table 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>
@@ -4987,8 +4959,7 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="subsection-1">
-<h3>1.1.1 subsection</h3>
+<span id="subsection-1"></span><h3>1.1.1 subsection</h3>
 
 <table border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a 
href="#subsubsection-_0060_0060simple_002ddouble_002d_002d">1.1.1.1 
subsubsection &#34;simple-double-</a></td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top">
@@ -4998,7 +4969,7 @@ Menu comment
 </table>
 
 <span id="anchor"></span>
-</div><hr>
+<hr>
 <div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
 <table 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>
@@ -5015,10 +4986,9 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1">
-<h4>1.1.1.1 subsubsection &#34;simple-double-</h4>
+<span 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1"></span><h4>1.1.1.1 
subsubsection &#34;simple-double-</h4>
 
-</div><hr>
+<hr>
 </div>
 <div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
 <table cellpadding="1" cellspacing="1" border="0">
@@ -5036,10 +5006,9 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
-<h4>1.1.1.2 three--four---&#34;</h4>
+<span 
id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027"></span><h4>1.1.1.2 
three--four---&#34;</h4>
 
-</div><hr>
+<hr>
 </div>
 </div>
 </div>
@@ -5060,8 +5029,7 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="chapter-2">
-<h1 align="center">chapter 2</h1>
+<span id="chapter-2"></span><h1 align="center">chapter 2</h1>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a 
href="#chapter-2_cp_symbol-1"><b>&#34;</b></a>
  &nbsp; 
@@ -5384,7 +5352,7 @@ Menu comment
  &nbsp; 
 </td></tr></table>
 
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="Footnotes_element" id="SEC_Foot">
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 e31d2df..7f667d8 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -670,8 +670,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="chapter-1">
-<h1 class="chapter">1 chapter</h1>
+<span id="chapter-1"></span><h1 class="chapter">1 chapter</h1>
 
 <p><a id="DOCF9" href="formatting_fot.html#FOOT9"><sup>11</sup></a>
 </p>
@@ -687,7 +686,7 @@ Menu comment
 </pre></td></tr></table>
 </div>
 
-</div><hr>
+<hr>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 f5b92a3..eb6db57 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
@@ -670,8 +670,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="chapter-2">
-<h1 class="centerchap" align="center">chapter 2</h1>
+<span id="chapter-2"></span><h1 class="centerchap" align="center">chapter 
2</h1>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#chapter-2_cp_symbol-1"><b>&quot;</b></a>
  &nbsp; 
@@ -994,7 +993,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
+<hr>
 <table class="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 82f7b42..b5b3e76 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
@@ -1300,21 +1300,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading-3">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading-3">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading-3">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading-3">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading-3">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading-3"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading-3"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading-3"></span><h2 class="heading">heading</h2>
+
+<span id="subheading-3"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading-3"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -2061,21 +2056,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading"></span><h2 class="heading">heading</h2>
+
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -2190,8 +2180,7 @@ html ''
 <td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="Top-section">
-<h1 class="top">Top section</h1>
+<span id="Top-section"></span><h1 class="top">Top section</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="chapter.html">1 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
@@ -2849,21 +2838,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading"></span><h2 class="heading">heading</h2>
+
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -3609,21 +3593,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading-1">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading-1">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading-1">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading-1">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading-1">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading-1"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading-1"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading-1"></span><h2 class="heading">heading</h2>
+
+<span id="subheading-1"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading-1"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -4453,25 +4432,20 @@ html ''
 
 
 
-</pre><div class="majorheading" id="majorheading-2">
-<strong>majorheading</strong>
-</div><pre class="example">
+</pre><span id="majorheading-2"></span><strong>majorheading</strong>
+<pre class="example">
 
-</pre><div class="chapheading" id="chapheading-2">
-<strong>chapheading</strong>
-</div><pre class="example">
+</pre><span id="chapheading-2"></span><strong>chapheading</strong>
+<pre class="example">
 
-</pre><div class="heading" id="heading-2">
-<strong>heading</strong>
-</div><pre class="example">
+</pre><span id="heading-2"></span><strong>heading</strong>
+<pre class="example">
 
-</pre><div class="subheading" id="subheading-2">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-2"></span><strong>subheading</strong>
+<pre class="example">
 
-</pre><div class="subsubheading" id="subsubheading-2">
-<strong>subsubheading</strong>
-</div><pre class="example">
+</pre><span id="subsubheading-2"></span><strong>subsubheading</strong>
+<pre class="example">
 
 
 <code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym title="an 
accronym , ...">--a</acronym> (an accronym , ...)
@@ -5010,7 +4984,7 @@ Invalid use of @':
 
 
 
-</div><hr>
+<hr>
 <table class="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 95ed1f1..4a2d689 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
@@ -670,8 +670,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="A-section">
-<h2 class="section">1.1 A section</h2>
+<span id="A-section"></span><h2 class="section">1.1 A section</h2>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="subsection.html">1.1.1 
subsection</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
@@ -686,7 +685,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 bb9bd5d..79d23c1 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
@@ -670,8 +670,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="subsection-1">
-<h3 class="subsection">1.1.1 subsection</h3>
+<span id="subsection-1"></span><h3 class="subsection">1.1.1 subsection</h3>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a 
href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html">1.1.1.1 
subsubsection &ldquo;simple-double&ndash;</a></td><td>&nbsp;&nbsp;</td><td 
align="left" valign="top">
@@ -681,7 +680,7 @@ ul.no-bullet {list-style: none}
 </table>
 
 <span id="anchor"></span>
-</div><hr>
+<hr>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 5530fae..9a7398e 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
@@ -670,10 +670,9 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1">
-<h4 class="subsubsection">1.1.1.1 subsubsection 
&ldquo;simple-double&ndash;</h4>
+<span id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1"></span><h4 
class="subsubsection">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</h4>
 
-</div><hr>
+<hr>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 138e79f..6564083 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
@@ -670,10 +670,9 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
-<h4 class="subsubsection">1.1.1.2 three&mdash;four&mdash;-&rdquo;</h4>
+<span id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027"></span><h4 
class="subsubsection">1.1.1.2 three&mdash;four&mdash;-&rdquo;</h4>
 
-</div><hr>
+<hr>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html 
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index aea0656..1f957e3 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -1310,21 +1310,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading-3">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading-3">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading-3">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading-3">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading-3">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading-3"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading-3"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading-3"></span><h2 class="heading">heading</h2>
+
+<span id="subheading-3"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading-3"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -2071,21 +2066,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading"></span><h2 class="heading">heading</h2>
+
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -2199,8 +2189,7 @@ html ''
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Top-section">
-<h1 class="top">Top section</h1>
+<span id="Top-section"></span><h1 class="top">Top section</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#chapter">1 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
@@ -2858,21 +2847,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading"></span><h2 class="heading">heading</h2>
+
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -3618,21 +3602,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading-1">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading-1">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading-1">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading-1">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading-1">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading-1"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading-1"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading-1"></span><h2 class="heading">heading</h2>
+
+<span id="subheading-1"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading-1"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -4462,25 +4441,20 @@ html ''
 
 
 
-</pre><div class="majorheading" id="majorheading-2">
-<strong>majorheading</strong>
-</div><pre class="example">
+</pre><span id="majorheading-2"></span><strong>majorheading</strong>
+<pre class="example">
 
-</pre><div class="chapheading" id="chapheading-2">
-<strong>chapheading</strong>
-</div><pre class="example">
+</pre><span id="chapheading-2"></span><strong>chapheading</strong>
+<pre class="example">
 
-</pre><div class="heading" id="heading-2">
-<strong>heading</strong>
-</div><pre class="example">
+</pre><span id="heading-2"></span><strong>heading</strong>
+<pre class="example">
 
-</pre><div class="subheading" id="subheading-2">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-2"></span><strong>subheading</strong>
+<pre class="example">
 
-</pre><div class="subsubheading" id="subsubheading-2">
-<strong>subsubheading</strong>
-</div><pre class="example">
+</pre><span id="subsubheading-2"></span><strong>subsubheading</strong>
+<pre class="example">
 
 
 <code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym title="an 
accronym , ...">--a</acronym> (an accronym , ...)
@@ -5019,7 +4993,7 @@ Invalid use of @':
 
 
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -5036,8 +5010,7 @@ Invalid use of @':
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="chapter-1">
-<h1 class="chapter">1 chapter</h1>
+<span id="chapter-1"></span><h1 class="chapter">1 chapter</h1>
 
 <p><a id="DOCF9" href="#FOOT9"><sup>11</sup></a>
 </p>
@@ -5053,7 +5026,7 @@ Menu comment
 </pre></td></tr></table>
 </div>
 
-</div><hr>
+<hr>
 <div class="section" id="s_002d_002dect_002cion">
 <table class="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>
@@ -5070,8 +5043,7 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="A-section">
-<h2 class="section">1.1 A section</h2>
+<span id="A-section"></span><h2 class="section">1.1 A section</h2>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#subsection">1.1.1 
subsection</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
@@ -5086,7 +5058,7 @@ Menu comment
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="subsection" id="subsection">
 <table class="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>
@@ -5103,8 +5075,7 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="subsection-1">
-<h3 class="subsection">1.1.1 subsection</h3>
+<span id="subsection-1"></span><h3 class="subsection">1.1.1 subsection</h3>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a 
href="#subsubsection-_0060_0060simple_002ddouble_002d_002d">1.1.1.1 
subsubsection &ldquo;simple-double&ndash;</a></td><td>&nbsp;&nbsp;</td><td 
align="left" valign="top">
@@ -5114,7 +5085,7 @@ Menu comment
 </table>
 
 <span id="anchor"></span>
-</div><hr>
+<hr>
 <div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
 <table class="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>
@@ -5131,10 +5102,9 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1">
-<h4 class="subsubsection">1.1.1.1 subsubsection 
&ldquo;simple-double&ndash;</h4>
+<span id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1"></span><h4 
class="subsubsection">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</h4>
 
-</div><hr>
+<hr>
 </div>
 <div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -5152,10 +5122,9 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
-<h4 class="subsubsection">1.1.1.2 three&mdash;four&mdash;-&rdquo;</h4>
+<span id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027"></span><h4 
class="subsubsection">1.1.1.2 three&mdash;four&mdash;-&rdquo;</h4>
 
-</div><hr>
+<hr>
 </div>
 </div>
 </div>
@@ -5176,8 +5145,7 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="chapter-2">
-<h1 class="centerchap" align="center">chapter 2</h1>
+<span id="chapter-2"></span><h1 class="centerchap" align="center">chapter 
2</h1>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#chapter-2_cp_symbol-1"><b>&quot;</b></a>
  &nbsp; 
@@ -5500,7 +5468,7 @@ Menu comment
  &nbsp; 
 </td></tr></table>
 
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="Footnotes_element" id="SEC_Foot">
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter.html 
b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
index e31d2df..7f667d8 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -670,8 +670,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="chapter-1">
-<h1 class="chapter">1 chapter</h1>
+<span id="chapter-1"></span><h1 class="chapter">1 chapter</h1>
 
 <p><a id="DOCF9" href="formatting_fot.html#FOOT9"><sup>11</sup></a>
 </p>
@@ -687,7 +686,7 @@ Menu comment
 </pre></td></tr></table>
 </div>
 
-</div><hr>
+<hr>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter2.html 
b/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
index f5b92a3..eb6db57 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
@@ -670,8 +670,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="chapter-2">
-<h1 class="centerchap" align="center">chapter 2</h1>
+<span id="chapter-2"></span><h1 class="centerchap" align="center">chapter 
2</h1>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#chapter-2_cp_symbol-1"><b>&quot;</b></a>
  &nbsp; 
@@ -994,7 +993,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-</div><hr>
+<hr>
 <table class="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 82f7b42..b5b3e76 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/index.html
@@ -1300,21 +1300,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading-3">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading-3">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading-3">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading-3">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading-3">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading-3"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading-3"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading-3"></span><h2 class="heading">heading</h2>
+
+<span id="subheading-3"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading-3"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -2061,21 +2056,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading"></span><h2 class="heading">heading</h2>
+
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -2190,8 +2180,7 @@ html ''
 <td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="Top-section">
-<h1 class="top">Top section</h1>
+<span id="Top-section"></span><h1 class="top">Top section</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="chapter.html">1 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
@@ -2849,21 +2838,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading"></span><h2 class="heading">heading</h2>
+
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -3609,21 +3593,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading-1">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading-1">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading-1">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading-1">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading-1">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading-1"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading-1"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading-1"></span><h2 class="heading">heading</h2>
+
+<span id="subheading-1"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading-1"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -4453,25 +4432,20 @@ html ''
 
 
 
-</pre><div class="majorheading" id="majorheading-2">
-<strong>majorheading</strong>
-</div><pre class="example">
+</pre><span id="majorheading-2"></span><strong>majorheading</strong>
+<pre class="example">
 
-</pre><div class="chapheading" id="chapheading-2">
-<strong>chapheading</strong>
-</div><pre class="example">
+</pre><span id="chapheading-2"></span><strong>chapheading</strong>
+<pre class="example">
 
-</pre><div class="heading" id="heading-2">
-<strong>heading</strong>
-</div><pre class="example">
+</pre><span id="heading-2"></span><strong>heading</strong>
+<pre class="example">
 
-</pre><div class="subheading" id="subheading-2">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-2"></span><strong>subheading</strong>
+<pre class="example">
 
-</pre><div class="subsubheading" id="subsubheading-2">
-<strong>subsubheading</strong>
-</div><pre class="example">
+</pre><span id="subsubheading-2"></span><strong>subsubheading</strong>
+<pre class="example">
 
 
 <code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym title="an 
accronym , ...">--a</acronym> (an accronym , ...)
@@ -5010,7 +4984,7 @@ Invalid use of @':
 
 
 
-</div><hr>
+<hr>
 <table class="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 95ed1f1..4a2d689 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
@@ -670,8 +670,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="A-section">
-<h2 class="section">1.1 A section</h2>
+<span id="A-section"></span><h2 class="section">1.1 A section</h2>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="subsection.html">1.1.1 
subsection</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
@@ -686,7 +685,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
diff --git a/tp/tests/layout/res_parser/formatting_nodes/subsection.html 
b/tp/tests/layout/res_parser/formatting_nodes/subsection.html
index bb9bd5d..79d23c1 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/subsection.html
@@ -670,8 +670,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="subsection-1">
-<h3 class="subsection">1.1.1 subsection</h3>
+<span id="subsection-1"></span><h3 class="subsection">1.1.1 subsection</h3>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a 
href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html">1.1.1.1 
subsubsection &ldquo;simple-double&ndash;</a></td><td>&nbsp;&nbsp;</td><td 
align="left" valign="top">
@@ -681,7 +680,7 @@ ul.no-bullet {list-style: none}
 </table>
 
 <span id="anchor"></span>
-</div><hr>
+<hr>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 5530fae..9a7398e 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
@@ -670,10 +670,9 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1">
-<h4 class="subsubsection">1.1.1.1 subsubsection 
&ldquo;simple-double&ndash;</h4>
+<span id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1"></span><h4 
class="subsubsection">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</h4>
 
-</div><hr>
+<hr>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 138e79f..6564083 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
@@ -670,10 +670,9 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
-<h4 class="subsubsection">1.1.1.2 three&mdash;four&mdash;-&rdquo;</h4>
+<span id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027"></span><h4 
class="subsubsection">1.1.1.2 three&mdash;four&mdash;-&rdquo;</h4>
 
-</div><hr>
+<hr>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 716566a..8e4b565 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -1300,21 +1300,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading"></span><h2 class="heading">heading</h2>
+
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -2060,21 +2055,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading-1">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading-1">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading-1">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading-1">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading-1">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading-1"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading-1"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading-1"></span><h2 class="heading">heading</h2>
+
+<span id="subheading-1"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading-1"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -2190,9 +2180,8 @@ html ''
 <td valign="middle" align="left">[<a href="#constructs" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Top-section">
-<h1 class="top">Top section</h1>
-</div><hr size="6">
+<span id="Top-section"></span><h1 class="top">Top section</h1>
+<hr size="6">
 <div class="chapter" id="constructs">
 <table class="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>
@@ -2209,8 +2198,7 @@ html ''
 <td valign="middle" align="left">[<a href="#constructs" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="constructs-1">
-<h1 class="chapter">1 constructs</h1>
+<span id="constructs-1"></span><h1 class="chapter">1 constructs</h1>
 
 
 
@@ -2856,21 +2844,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading-2">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading-2">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading-2">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading-2">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading-2">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading-2"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading-2"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading-2"></span><h2 class="heading">heading</h2>
+
+<span id="subheading-2"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading-2"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -3699,25 +3682,20 @@ html ''
 
 
 
-</pre><div class="majorheading" id="majorheading-3">
-<strong>majorheading</strong>
-</div><pre class="example">
+</pre><span id="majorheading-3"></span><strong>majorheading</strong>
+<pre class="example">
 
-</pre><div class="chapheading" id="chapheading-3">
-<strong>chapheading</strong>
-</div><pre class="example">
+</pre><span id="chapheading-3"></span><strong>chapheading</strong>
+<pre class="example">
 
-</pre><div class="heading" id="heading-3">
-<strong>heading</strong>
-</div><pre class="example">
+</pre><span id="heading-3"></span><strong>heading</strong>
+<pre class="example">
 
-</pre><div class="subheading" id="subheading-3">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-3"></span><strong>subheading</strong>
+<pre class="example">
 
-</pre><div class="subsubheading" id="subsubheading-3">
-<strong>subsubheading</strong>
-</div><pre class="example">
+</pre><span id="subsubheading-3"></span><strong>subsubheading</strong>
+<pre class="example">
 
 
 <code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym title="an 
accronym , ...">--a</acronym> (an accronym , ...)
@@ -4472,21 +4450,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading-1">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading-1">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading-1">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading-1">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading-1">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading-1"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading-1"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading-1"></span><h2 class="heading">heading</h2>
+
+<span id="subheading-1"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading-1"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -5016,7 +4989,7 @@ html ''
 
 
 
-</div><hr>
+<hr>
 </div>
 <div class="chapter" id="chapter">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -5034,8 +5007,7 @@ html ''
 <td valign="middle" align="left">[<a href="#constructs" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="chapter-1">
-<h1 class="chapter">2 chapter</h1>
+<span id="chapter-1"></span><h1 class="chapter">2 chapter</h1>
 
 <p><a id="DOCF9" href="#FOOT9"><sup>11</sup></a>
 </p>
@@ -5051,7 +5023,7 @@ Menu comment
 </pre></td></tr></table>
 </div>
 
-</div><hr>
+<hr>
 <div class="section" id="s_002d_002dect_002cion">
 <table class="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>
@@ -5068,15 +5040,14 @@ Menu comment
 <td valign="middle" align="left">[<a href="#constructs" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="A-section">
-<h2 class="section">2.1 A section</h2>
+<span id="A-section"></span><h2 class="section">2.1 A section</h2>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#subsection">2.1.1 
subsection</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="subsection" id="subsection">
 <table class="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>
@@ -5093,8 +5064,7 @@ Menu comment
 <td valign="middle" align="left">[<a href="#constructs" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="subsection-1">
-<h3 class="subsection">2.1.1 subsection</h3>
+<span id="subsection-1"></span><h3 class="subsection">2.1.1 subsection</h3>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#subsubsection">2.1.1.1 
subsubsection</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
@@ -5102,7 +5072,7 @@ Menu comment
 </table>
 
 <span id="anchor"></span>
-</div><hr>
+<hr>
 <div class="subsubsection" id="subsubsection">
 <table class="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>
@@ -5119,10 +5089,9 @@ Menu comment
 <td valign="middle" align="left">[<a href="#constructs" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="subsubsection-1">
-<h4 class="subsubsection">2.1.1.1 subsubsection</h4>
+<span id="subsubsection-1"></span><h4 class="subsubsection">2.1.1.1 
subsubsection</h4>
 
-</div><hr>
+<hr>
 </div>
 </div>
 </div>
@@ -5143,8 +5112,7 @@ Menu comment
 <td valign="middle" align="left">[<a href="#constructs" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="chapter-2">
-<h1 class="centerchap" align="center">chapter 2</h1>
+<span id="chapter-2"></span><h1 class="centerchap" align="center">chapter 
2</h1>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#chapter-2_cp_symbol-1"><b>&quot;</b></a>
  &nbsp; 
@@ -5467,7 +5435,7 @@ Menu comment
  &nbsp; 
 </td></tr></table>
 
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="Footnotes_element" id="SEC_Foot">
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 52af53a..1bac420 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -1300,21 +1300,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading-3">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading-3">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading-3">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading-3">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading-3">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading-3"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading-3"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading-3"></span><h2 class="heading">heading</h2>
+
+<span id="subheading-3"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading-3"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -2061,21 +2056,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading"></span><h2 class="heading">heading</h2>
+
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -2189,8 +2179,7 @@ html ''
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Top-section">
-<h1 class="top">Top section</h1>
+<span id="Top-section"></span><h1 class="top">Top section</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#chapter">1 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
@@ -2848,21 +2837,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading"></span><h2 class="heading">heading</h2>
+
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -3608,21 +3592,16 @@ html ''
 
 
 
-<div class="majorheading" id="majorheading-1">
-<h1 class="majorheading">majorheading</h1>
-</div>
-<div class="chapheading" id="chapheading-1">
-<h1 class="chapheading">chapheading</h1>
-</div>
-<div class="heading" id="heading-1">
-<h2 class="heading">heading</h2>
-</div>
-<div class="subheading" id="subheading-1">
-<h3 class="subheading">subheading</h3>
-</div>
-<div class="subsubheading" id="subsubheading-1">
-<h4 class="subsubheading">subsubheading</h4>
-</div>
+<span id="majorheading-1"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading-1"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading-1"></span><h2 class="heading">heading</h2>
+
+<span id="subheading-1"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading-1"></span><h4 class="subsubheading">subsubheading</h4>
+
 
 <p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym 
title="an accronym , ...">&ndash;a</acronym> (an accronym , <small 
class="enddots">...</small>)
 <code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr 
title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> 
(&Eacute;tude&ndash;, <b>Autonome</b>)
@@ -4452,25 +4431,20 @@ html ''
 
 
 
-</pre><div class="majorheading" id="majorheading-2">
-<strong>majorheading</strong>
-</div><pre class="example">
+</pre><span id="majorheading-2"></span><strong>majorheading</strong>
+<pre class="example">
 
-</pre><div class="chapheading" id="chapheading-2">
-<strong>chapheading</strong>
-</div><pre class="example">
+</pre><span id="chapheading-2"></span><strong>chapheading</strong>
+<pre class="example">
 
-</pre><div class="heading" id="heading-2">
-<strong>heading</strong>
-</div><pre class="example">
+</pre><span id="heading-2"></span><strong>heading</strong>
+<pre class="example">
 
-</pre><div class="subheading" id="subheading-2">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-2"></span><strong>subheading</strong>
+<pre class="example">
 
-</pre><div class="subsubheading" id="subsubheading-2">
-<strong>subsubheading</strong>
-</div><pre class="example">
+</pre><span id="subsubheading-2"></span><strong>subsubheading</strong>
+<pre class="example">
 
 
 <code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym title="an 
accronym , ...">--a</acronym> (an accronym , ...)
@@ -5009,7 +4983,7 @@ Invalid use of @':
 
 
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -5026,8 +5000,7 @@ Invalid use of @':
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="chapter-1">
-<h1 class="chapter">1 chapter</h1>
+<span id="chapter-1"></span><h1 class="chapter">1 chapter</h1>
 
 <p><a id="DOCF9" href="#FOOT9"><sup>11</sup></a>
 </p>
@@ -5043,7 +5016,7 @@ Menu comment
 </pre></td></tr></table>
 </div>
 
-</div><hr>
+<hr>
 <div class="section" id="s_002d_002dect_002cion">
 <table class="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>
@@ -5060,8 +5033,7 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="A-section">
-<h2 class="section">1.1 A section</h2>
+<span id="A-section"></span><h2 class="section">1.1 A section</h2>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#subsection">1.1.1 
subsection</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
@@ -5076,7 +5048,7 @@ Menu comment
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="subsection" id="subsection">
 <table class="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>
@@ -5093,8 +5065,7 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="subsection-1">
-<h3 class="subsection">1.1.1 subsection</h3>
+<span id="subsection-1"></span><h3 class="subsection">1.1.1 subsection</h3>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a 
href="#subsubsection-_0060_0060simple_002ddouble_002d_002d">1.1.1.1 
subsubsection &ldquo;simple-double&ndash;</a></td><td>&nbsp;&nbsp;</td><td 
align="left" valign="top">
@@ -5104,7 +5075,7 @@ Menu comment
 </table>
 
 <span id="anchor"></span>
-</div><hr>
+<hr>
 <div class="subsubsection" 
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
 <table class="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>
@@ -5121,10 +5092,9 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1">
-<h4 class="subsubsection">1.1.1.1 subsubsection 
&ldquo;simple-double&ndash;</h4>
+<span id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1"></span><h4 
class="subsubsection">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</h4>
 
-</div><hr>
+<hr>
 </div>
 <div class="subsubsection" 
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -5142,10 +5112,9 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
-<h4 class="subsubsection">1.1.1.2 three&mdash;four&mdash;-&rdquo;</h4>
+<span id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027"></span><h4 
class="subsubsection">1.1.1.2 three&mdash;four&mdash;-&rdquo;</h4>
 
-</div><hr>
+<hr>
 </div>
 </div>
 </div>
@@ -5166,8 +5135,7 @@ Menu comment
 <td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="chapter-2">
-<h1 class="centerchap" align="center">chapter 2</h1>
+<span id="chapter-2"></span><h1 class="centerchap" align="center">chapter 
2</h1>
 
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#chapter-2_cp_symbol-1"><b>&quot;</b></a>
  &nbsp; 
@@ -5490,7 +5458,7 @@ Menu comment
  &nbsp; 
 </td></tr></table>
 
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="Footnotes_element" id="SEC_Foot">
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 d158b30..ffe21b8 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
@@ -51,15 +51,14 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="First-chapter">
-<h1 class="chapter">1 First chapter</h1>
+<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="navigation_abt.html#section">1.1 
Section in chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 </div>
 </div>
 <p><font size="-1">
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 6193d10..1a30e30 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
@@ -45,15 +45,14 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="File-used-for-navigation-testing">
-<h1 class="top">File used for navigation testing</h1>
+<span id="File-used-for-navigation-testing"></span><h1 class="top">File used 
for navigation testing</h1>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="chapter.html">1 First 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="section" id="section">
 <table class="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>
@@ -70,8 +69,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Section-in-chapter">
-<h2 class="section">1.1 Section in chapter</h2>
+<span id="Section-in-chapter"></span><h2 class="section">1.1 Section in 
chapter</h2>
 
 <p>AAAA
 </p>
@@ -105,7 +103,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.
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Cover (top) of 
document">Top</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 e98af5d..4ac8cf4 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
@@ -51,11 +51,10 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<div class="node" id="Sub-section-in-section">
-<h3 class="subsection">1.1.1 Sub section in section</h3>
+<span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub 
section in section</h3>
 
 
-</div><hr>
+<hr>
 </div>
 </div>
 <p><font size="-1">
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 5b9ac14..c667a76 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
@@ -44,8 +44,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="#chapter" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Not-monolithic">
-<h1 class="top">Not monolithic</h1>
+<span id="Not-monolithic"></span><h1 class="top">Not monolithic</h1>
 
 <p>Not monolitic manual<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>.
 </p>
@@ -56,7 +55,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="chapter">
 <table class="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>
@@ -73,8 +72,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="#chapter" 
title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<div class="node" id="Chapter">
-<h1 class="chapter">1 Chapter</h1>
+<span id="Chapter"></span><h1 class="chapter">1 Chapter</h1>
 
 <p>Chapter.
 </p>
@@ -92,7 +90,7 @@ ul.no-bullet {list-style: none}
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" 
href="#Chapter_cp_letter-T"><b>T</b></a>
  &nbsp; 
 </td></tr></table>
-</div><hr size="6">
+<hr size="6">
 </div>
 </div>
 <div class="Footnotes_element" id="SEC_Foot">
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 f9f10ac..1a0a0ad 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
@@ -49,8 +49,7 @@ ul.no-bullet {list-style: none}
 
 
 <div class="top" id="Top">
-<div class="node" id="Test-nested-cartouche">
-<h1 class="top">Test nested cartouche</h1>
+<span id="Test-nested-cartouche"></span><h1 class="top">Test nested 
cartouche</h1>
 
 
 <p>Call macro
@@ -90,9 +89,8 @@ in macro
 </p></blockquote>
 </td></tr></table>
 
-<div class="subheading" id="subheading">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -233,9 +231,8 @@ html
 </p></blockquote>
 </td></tr></table>
 
-<div class="subheading" id="subheading-1">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-1"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -377,9 +374,8 @@ html
 </p></blockquote>
 </td></tr></table>
 
-<div class="subheading" id="subheading-2">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-2"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -519,9 +515,8 @@ in macro
 </p></blockquote>
 </td></tr></table>
 
-<div class="subheading" id="subheading-3">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-3"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -662,9 +657,8 @@ Call macro in itemize in format_command
 </p></blockquote>
 </td></tr></table>
 
-<div class="subheading" id="subheading-4">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-4"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -807,9 +801,8 @@ html
 </p></blockquote>
 </td></tr></table>
 
-<div class="subheading" id="subheading-5">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-5"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -949,9 +942,8 @@ in macro
 </p></blockquote>
 </td></tr></table>
 
-<div class="subheading" id="subheading-6">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-6"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1092,9 +1084,8 @@ Call macro in enumerate in format_command
 </p></blockquote>
 </td></tr></table>
 
-<div class="subheading" id="subheading-7">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-7"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1239,9 +1230,8 @@ after item</td></tr>
 </p></blockquote>
 </td></tr></table>
 
-<div class="subheading" id="subheading-8">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-8"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1380,9 +1370,8 @@ in macro
 </p></blockquote>
 </td></tr></table>
 
-<div class="subheading" id="subheading-9">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-9"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1522,9 +1511,8 @@ Call macro in mutitable in format_command
 </p></blockquote>
 </td></tr></table>
 
-<div class="subheading" id="subheading-10">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-10"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1673,9 +1661,8 @@ Something2
 </td></tr></table>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-11">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-11"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -1846,9 +1833,8 @@ Something2
 </td></tr></table>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-12">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-12"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -2020,9 +2006,8 @@ Something2
 </td></tr></table>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-13">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-13"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -2195,9 +2180,8 @@ in macro
 </p></blockquote>
 </td></tr></table>
 
-<div class="subheading" id="subheading-14">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-14"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2338,9 +2322,8 @@ call macro in deffn in format_command
 </p></blockquote>
 </td></tr></table>
 
-<div class="subheading" id="subheading-15">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-15"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2484,9 +2467,8 @@ html
 </p></blockquote>
 </td></tr></table>
 
-<div class="subheading" id="subheading-16">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-16"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2629,9 +2611,8 @@ in macro
 </p></blockquote>
 </td></tr></table>
 
-<div class="subheading" id="subheading-17">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-17"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2772,9 +2753,8 @@ html
 </p></blockquote>
 </td></tr></table>
 
-<div class="subheading" id="subheading-18">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-18"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2916,9 +2896,8 @@ html
 </p></blockquote>
 </td></tr></table>
 
-<div class="subheading" id="subheading-19">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-19"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3062,9 +3041,8 @@ html
 </p></blockquote>
 </td></tr></table>
 
-<div class="subheading" id="subheading-20">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-20"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3204,9 +3182,8 @@ in macro
 </p></blockquote>
 </td></tr></table>
 
-<div class="subheading" id="subheading-21">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-21"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3346,9 +3323,8 @@ html
 </p></blockquote>
 </td></tr></table>
 
-<div class="subheading" id="subheading-22">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-22"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3490,9 +3466,8 @@ in macro
 </p></blockquote>
 </td></tr></table>
 
-<div class="subheading" id="subheading-23">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-23"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3633,9 +3608,8 @@ call macro in flushleft in format_command
 </p></blockquote>
 </td></tr></table>
 
-<div class="subheading" id="subheading-24">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-24"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3775,9 +3749,8 @@ html
 </p></blockquote>
 </td></tr></table>
 
-<div class="subheading" id="subheading-25">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-25"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3917,9 +3890,8 @@ html
 </p></blockquote>
 </td></tr></table>
 
-<div class="subheading" id="subheading-26">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-26"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -4023,7 +3995,7 @@ html
 
 </td></tr></table>
 
-</div><hr></div>
+<hr></div>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 cb33ea8..4bcccda 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
@@ -49,8 +49,7 @@ ul.no-bullet {list-style: none}
 
 
 <div class="top" id="Top">
-<div class="node" id="Test-nested-deffn">
-<h1 class="top">Test nested deffn</h1>
+<span id="Test-nested-deffn"></span><h1 class="top">Test nested deffn</h1>
 
 
 <p>Call macro
@@ -104,9 +103,8 @@ in macro
 </p></blockquote>
 </dd></dl>
 
-<div class="subheading" id="subheading">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -263,9 +261,8 @@ html
 </p></blockquote>
 </dd></dl>
 
-<div class="subheading" id="subheading-1">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-1"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -422,9 +419,8 @@ html
 </p></blockquote>
 </dd></dl>
 
-<div class="subheading" id="subheading-2">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-2"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -579,9 +575,8 @@ in macro
 </p></blockquote>
 </dd></dl>
 
-<div class="subheading" id="subheading-3">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-3"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -738,9 +733,8 @@ Call macro in itemize in format_command
 </p></blockquote>
 </dd></dl>
 
-<div class="subheading" id="subheading-4">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-4"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -898,9 +892,8 @@ html
 </p></blockquote>
 </dd></dl>
 
-<div class="subheading" id="subheading-5">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-5"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1055,9 +1048,8 @@ in macro
 </p></blockquote>
 </dd></dl>
 
-<div class="subheading" id="subheading-6">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-6"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1214,9 +1206,8 @@ Call macro in enumerate in format_command
 </p></blockquote>
 </dd></dl>
 
-<div class="subheading" id="subheading-7">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-7"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1376,9 +1367,8 @@ after item</td></tr>
 </p></blockquote>
 </dd></dl>
 
-<div class="subheading" id="subheading-8">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-8"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1532,9 +1522,8 @@ in macro
 </p></blockquote>
 </dd></dl>
 
-<div class="subheading" id="subheading-9">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-9"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1690,9 +1679,8 @@ Call macro in mutitable in format_command
 </p></blockquote>
 </dd></dl>
 
-<div class="subheading" id="subheading-10">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-10"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1856,9 +1844,8 @@ Something2
 </dd></dl>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-11">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-11"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -2044,9 +2031,8 @@ Something2
 </dd></dl>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-12">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-12"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -2234,9 +2220,8 @@ Something2
 </dd></dl>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-13">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-13"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -2424,9 +2409,8 @@ in macro
 </p></blockquote>
 </dd></dl>
 
-<div class="subheading" id="subheading-14">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-14"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2583,9 +2567,8 @@ call macro in deffn in format_command
 </p></blockquote>
 </dd></dl>
 
-<div class="subheading" id="subheading-15">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-15"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2744,9 +2727,8 @@ html
 </p></blockquote>
 </dd></dl>
 
-<div class="subheading" id="subheading-16">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-16"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2904,9 +2886,8 @@ in macro
 </p></blockquote>
 </dd></dl>
 
-<div class="subheading" id="subheading-17">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-17"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3062,9 +3043,8 @@ html
 </p></blockquote>
 </dd></dl>
 
-<div class="subheading" id="subheading-18">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-18"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3222,9 +3202,8 @@ html
 </p></blockquote>
 </dd></dl>
 
-<div class="subheading" id="subheading-19">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-19"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3383,9 +3362,8 @@ html
 </p></blockquote>
 </dd></dl>
 
-<div class="subheading" id="subheading-20">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-20"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3540,9 +3518,8 @@ in macro
 </p></blockquote>
 </dd></dl>
 
-<div class="subheading" id="subheading-21">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-21"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3698,9 +3675,8 @@ html
 </p></blockquote>
 </dd></dl>
 
-<div class="subheading" id="subheading-22">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-22"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3857,9 +3833,8 @@ in macro
 </p></blockquote>
 </dd></dl>
 
-<div class="subheading" id="subheading-23">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-23"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -4016,9 +3991,8 @@ call macro in flushleft in format_command
 </p></blockquote>
 </dd></dl>
 
-<div class="subheading" id="subheading-24">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-24"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -4173,9 +4147,8 @@ html
 </p></blockquote>
 </dd></dl>
 
-<div class="subheading" id="subheading-25">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-25"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -4331,9 +4304,8 @@ html
 </p></blockquote>
 </dd></dl>
 
-<div class="subheading" id="subheading-26">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-26"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -4438,7 +4410,7 @@ html
 
 </dd></dl>
 
-</div><hr></div>
+<hr></div>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 bcc5939..b45299c 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
@@ -49,8 +49,7 @@ ul.no-bullet {list-style: none}
 
 
 <div class="top" id="Top">
-<div class="node" id="Test-nested-enumerate">
-<h1 class="top">Test nested enumerate</h1>
+<span id="Test-nested-enumerate"></span><h1 class="top">Test nested 
enumerate</h1>
 
 
 <p>Call macro
@@ -90,9 +89,8 @@ in macro
 </p></blockquote>
 </li></ol>
 
-<div class="subheading" id="subheading">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -233,9 +231,8 @@ html
 </p></blockquote>
 </li></ol>
 
-<div class="subheading" id="subheading-1">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-1"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -377,9 +374,8 @@ html
 </p></blockquote>
 </li></ol>
 
-<div class="subheading" id="subheading-2">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-2"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -519,9 +515,8 @@ in macro
 </p></blockquote>
 </li></ol>
 
-<div class="subheading" id="subheading-3">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-3"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -662,9 +657,8 @@ Call macro in itemize in format_command
 </p></blockquote>
 </li></ol>
 
-<div class="subheading" id="subheading-4">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-4"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -807,9 +801,8 @@ html
 </p></blockquote>
 </li></ol>
 
-<div class="subheading" id="subheading-5">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-5"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -949,9 +942,8 @@ in macro
 </p></blockquote>
 </li></ol>
 
-<div class="subheading" id="subheading-6">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-6"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1092,9 +1084,8 @@ Call macro in enumerate in format_command
 </p></blockquote>
 </li></ol>
 
-<div class="subheading" id="subheading-7">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-7"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1239,9 +1230,8 @@ after item</td></tr>
 </p></blockquote>
 </li></ol>
 
-<div class="subheading" id="subheading-8">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-8"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1380,9 +1370,8 @@ in macro
 </p></blockquote>
 </li></ol>
 
-<div class="subheading" id="subheading-9">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-9"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1522,9 +1511,8 @@ Call macro in mutitable in format_command
 </p></blockquote>
 </li></ol>
 
-<div class="subheading" id="subheading-10">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-10"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1673,9 +1661,8 @@ Something2
 </li></ol>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-11">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-11"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -1846,9 +1833,8 @@ Something2
 </li></ol>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-12">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-12"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -2020,9 +2006,8 @@ Something2
 </li></ol>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-13">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-13"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -2195,9 +2180,8 @@ in macro
 </p></blockquote>
 </li></ol>
 
-<div class="subheading" id="subheading-14">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-14"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2338,9 +2322,8 @@ call macro in deffn in format_command
 </p></blockquote>
 </li></ol>
 
-<div class="subheading" id="subheading-15">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-15"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2484,9 +2467,8 @@ html
 </p></blockquote>
 </li></ol>
 
-<div class="subheading" id="subheading-16">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-16"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2629,9 +2611,8 @@ in macro
 </p></blockquote>
 </li></ol>
 
-<div class="subheading" id="subheading-17">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-17"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2772,9 +2753,8 @@ html
 </p></blockquote>
 </li></ol>
 
-<div class="subheading" id="subheading-18">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-18"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2916,9 +2896,8 @@ html
 </p></blockquote>
 </li></ol>
 
-<div class="subheading" id="subheading-19">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-19"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3062,9 +3041,8 @@ html
 </p></blockquote>
 </li></ol>
 
-<div class="subheading" id="subheading-20">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-20"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3204,9 +3182,8 @@ in macro
 </p></blockquote>
 </li></ol>
 
-<div class="subheading" id="subheading-21">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-21"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3346,9 +3323,8 @@ html
 </p></blockquote>
 </li></ol>
 
-<div class="subheading" id="subheading-22">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-22"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3490,9 +3466,8 @@ in macro
 </p></blockquote>
 </li></ol>
 
-<div class="subheading" id="subheading-23">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-23"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3633,9 +3608,8 @@ call macro in flushleft in format_command
 </p></blockquote>
 </li></ol>
 
-<div class="subheading" id="subheading-24">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-24"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3775,9 +3749,8 @@ html
 </p></blockquote>
 </li></ol>
 
-<div class="subheading" id="subheading-25">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-25"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3917,9 +3890,8 @@ html
 </p></blockquote>
 </li></ol>
 
-<div class="subheading" id="subheading-26">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-26"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -4023,7 +3995,7 @@ html
 
 </li></ol>
 
-</div><hr></div>
+<hr></div>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 9db194d..7a82c04 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
@@ -49,8 +49,7 @@ ul.no-bullet {list-style: none}
 
 
 <div class="top" id="Top">
-<div class="node" id="Test-nested-example">
-<h1 class="top">Test nested example</h1>
+<span id="Test-nested-example"></span><h1 class="top">Test nested example</h1>
 
 
 <p>Call macro
@@ -90,9 +89,8 @@ in macro
 </pre></blockquote>
 </div>
 
-<div class="subheading" id="subheading">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -249,9 +247,8 @@ Something2
 </div>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-1">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-1"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -417,9 +414,8 @@ html
 </pre></blockquote>
 </div>
 
-<div class="subheading" id="subheading-2">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-2"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -569,9 +565,8 @@ in macro
 </pre></blockquote>
 </div>
 
-<div class="subheading" id="subheading-3">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-3"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -728,9 +723,8 @@ Something2
 </div>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-4">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-4"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -897,9 +891,8 @@ html
 </pre></blockquote>
 </div>
 
-<div class="subheading" id="subheading-5">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-5"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1049,9 +1042,8 @@ in macro
 </pre></blockquote>
 </div>
 
-<div class="subheading" id="subheading-6">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-6"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1208,9 +1200,8 @@ Something2
 </div>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-7">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-7"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -1379,9 +1370,8 @@ after item</td></tr>
 </pre></blockquote>
 </div>
 
-<div class="subheading" id="subheading-8">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-8"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1530,9 +1520,8 @@ in macro
 </pre></blockquote>
 </div>
 
-<div class="subheading" id="subheading-9">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-9"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1688,9 +1677,8 @@ Something2
 </div>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-10">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-10"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -1863,9 +1851,8 @@ Something2
 </div>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-11">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-11"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -2036,9 +2023,8 @@ Something2
 </div>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-12">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-12"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -2210,9 +2196,8 @@ Something2
 </div>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-13">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-13"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -2385,9 +2370,8 @@ in macro
 </pre></blockquote>
 </div>
 
-<div class="subheading" id="subheading-14">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-14"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2544,9 +2528,8 @@ Something2
 </div>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-15">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-15"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -2714,9 +2697,8 @@ html
 </pre></blockquote>
 </div>
 
-<div class="subheading" id="subheading-16">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-16"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2869,9 +2851,8 @@ in macro
 </pre></blockquote>
 </div>
 
-<div class="subheading" id="subheading-17">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-17"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3022,9 +3003,8 @@ html
 </pre></blockquote>
 </div>
 
-<div class="subheading" id="subheading-18">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-18"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3182,9 +3162,8 @@ Something2
 </div>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-19">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-19"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -3352,9 +3331,8 @@ html
 </pre></blockquote>
 </div>
 
-<div class="subheading" id="subheading-20">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-20"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3504,9 +3482,8 @@ in macro
 </pre></blockquote>
 </div>
 
-<div class="subheading" id="subheading-21">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-21"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3662,9 +3639,8 @@ Something2
 </div>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-22">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-22"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -3830,9 +3806,8 @@ in macro
 </pre></blockquote>
 </div>
 
-<div class="subheading" id="subheading-23">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-23"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3989,9 +3964,8 @@ Something2
 </div>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-24">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-24"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -4155,9 +4129,8 @@ html
 </pre></blockquote>
 </div>
 
-<div class="subheading" id="subheading-25">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-25"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -4313,9 +4286,8 @@ Something2
 </div>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-26">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-26"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -4443,7 +4415,7 @@ html
 
 </pre></div>
 
-</div><hr></div>
+<hr></div>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 1d72632..c7429fa 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
@@ -49,8 +49,7 @@ ul.no-bullet {list-style: none}
 
 
 <div class="top" id="Top">
-<div class="node" id="Test-nested-flushright">
-<h1 class="top">Test nested flushright</h1>
+<span id="Test-nested-flushright"></span><h1 class="top">Test nested 
flushright</h1>
 
 
 <p>Call macro
@@ -80,9 +79,8 @@ in macro
 <p align="right">A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -210,9 +208,8 @@ html
 <p align="right">A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-1">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-1"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -341,9 +338,8 @@ html
 <p align="right">A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-2">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-2"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -471,9 +467,8 @@ in macro
 <p align="right">A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-3">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-3"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -601,9 +596,8 @@ Call macro in itemize in format_command
 <p align="right">A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-4">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-4"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -733,9 +727,8 @@ html
 <p align="right">A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-5">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-5"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -863,9 +856,8 @@ in macro
 <p align="right">A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-6">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-6"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -993,9 +985,8 @@ Call macro in enumerate in format_command
 <p align="right">A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-7">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-7"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1127,9 +1118,8 @@ after item</td></tr>
 <p align="right">A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-8">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-8"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1257,9 +1247,8 @@ in macro
 <p align="right">A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-9">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-9"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1387,9 +1376,8 @@ Call macro in mutitable in format_command
 <p align="right">A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-10">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-10"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1525,9 +1513,8 @@ Something2
 </pre></blockquote>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-11">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-11"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -1686,9 +1673,8 @@ Something2
 </pre></blockquote>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-12">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-12"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -1847,9 +1833,8 @@ Something2
 </pre></blockquote>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-13">
-<h3 class="subheading">subheading</h3>
-</div><pre class="example">
+</pre><span id="subheading-13"></span><h3 class="subheading">subheading</h3>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -2009,9 +1994,8 @@ in macro
 <p align="right">A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-14">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-14"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2139,9 +2123,8 @@ call macro in deffn in format_command
 <p align="right">A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-15">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-15"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2272,9 +2255,8 @@ html
 <p align="right">A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-16">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-16"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2405,9 +2387,8 @@ in macro
 <p align="right">A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-17">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-17"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2536,9 +2517,8 @@ html
 <p align="right">A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-18">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-18"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2667,9 +2647,8 @@ html
 <p align="right">A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-19">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-19"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2800,9 +2779,8 @@ html
 <p align="right">A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-20">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-20"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2930,9 +2908,8 @@ in macro
 <p align="right">A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-21">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-21"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3059,9 +3036,8 @@ html
 <p align="right">A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-22">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-22"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3190,9 +3166,8 @@ in macro
 <p align="right">A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-23">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-23"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3320,9 +3295,8 @@ call macro in flushleft in format_command
 <p align="right">A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-24">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-24"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3449,9 +3423,8 @@ html
 <p align="right">A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-25">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-25"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3578,9 +3551,8 @@ html
 <p align="right">A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-26">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-26"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3681,7 +3653,7 @@ html
 <div align="center">ce&ndash;ntered line
 </div>
 
-</div><hr></div>
+<hr></div>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 52a3066..bfd984c 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
@@ -49,8 +49,7 @@ ul.no-bullet {list-style: none}
 
 
 <div class="top" id="Top">
-<div class="node" id="Test-nested-group">
-<h1 class="top">Test nested group</h1>
+<span id="Test-nested-group"></span><h1 class="top">Test nested group</h1>
 
 
 <p>Call macro
@@ -80,9 +79,8 @@ in macro
 <p>A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -210,9 +208,8 @@ html
 <p>A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-1">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-1"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -341,9 +338,8 @@ html
 <p>A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-2">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-2"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -471,9 +467,8 @@ in macro
 <p>A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-3">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-3"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -601,9 +596,8 @@ Call macro in itemize in format_command
 <p>A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-4">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-4"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -733,9 +727,8 @@ html
 <p>A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-5">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-5"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -863,9 +856,8 @@ in macro
 <p>A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-6">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-6"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -993,9 +985,8 @@ Call macro in enumerate in format_command
 <p>A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-7">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-7"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1127,9 +1118,8 @@ after item</td></tr>
 <p>A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-8">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-8"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1257,9 +1247,8 @@ in macro
 <p>A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-9">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-9"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1387,9 +1376,8 @@ Call macro in mutitable in format_command
 <p>A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-10">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-10"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1525,9 +1513,8 @@ Something2
 </pre></blockquote>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-11">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-11"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -1686,9 +1673,8 @@ Something2
 </pre></blockquote>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-12">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-12"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -1847,9 +1833,8 @@ Something2
 </pre></blockquote>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-13">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-13"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -2009,9 +1994,8 @@ in macro
 <p>A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-14">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-14"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2139,9 +2123,8 @@ call macro in deffn in format_command
 <p>A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-15">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-15"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2272,9 +2255,8 @@ html
 <p>A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-16">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-16"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2405,9 +2387,8 @@ in macro
 <p>A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-17">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-17"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2536,9 +2517,8 @@ html
 <p>A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-18">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-18"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2667,9 +2647,8 @@ html
 <p>A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-19">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-19"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2800,9 +2779,8 @@ html
 <p>A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-20">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-20"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2930,9 +2908,8 @@ in macro
 <p>A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-21">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-21"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3059,9 +3036,8 @@ html
 <p>A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-22">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-22"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3190,9 +3166,8 @@ in macro
 <p align="left">A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-23">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-23"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3320,9 +3295,8 @@ call macro in flushleft in format_command
 <p align="left">A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-24">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-24"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3449,9 +3423,8 @@ html
 <p align="right">A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-25">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-25"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3578,9 +3551,8 @@ html
 <p align="right">A quot&mdash;ation
 </p></blockquote>
 
-<div class="subheading" id="subheading-26">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-26"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3681,7 +3653,7 @@ html
 <div align="center">ce&ndash;ntered line
 </div>
 
-</div><hr></div>
+<hr></div>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 8edadd4..0fb5bbf 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
@@ -49,8 +49,7 @@ ul.no-bullet {list-style: none}
 
 
 <div class="top" id="Top">
-<div class="node" id="Test-nested-itemize">
-<h1 class="top">Test nested itemize</h1>
+<span id="Test-nested-itemize"></span><h1 class="top">Test nested itemize</h1>
 
 
 <p>Call macro
@@ -96,9 +95,8 @@ in macro
 </p></blockquote>
 </li></ul>
 
-<div class="subheading" id="subheading">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -245,9 +243,8 @@ html
 </p></blockquote>
 </li></ul>
 
-<div class="subheading" id="subheading-1">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-1"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -395,9 +392,8 @@ html
 </p></blockquote>
 </li></ul>
 
-<div class="subheading" id="subheading-2">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-2"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -543,9 +539,8 @@ in macro
 </p></blockquote>
 </li></ul>
 
-<div class="subheading" id="subheading-3">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-3"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -692,9 +687,8 @@ Call macro in itemize in format_command
 </p></blockquote>
 </li></ul>
 
-<div class="subheading" id="subheading-4">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-4"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -843,9 +837,8 @@ html
 </p></blockquote>
 </li></ul>
 
-<div class="subheading" id="subheading-5">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-5"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -991,9 +984,8 @@ in macro
 </p></blockquote>
 </li></ul>
 
-<div class="subheading" id="subheading-6">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-6"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1140,9 +1132,8 @@ Call macro in enumerate in format_command
 </p></blockquote>
 </li></ul>
 
-<div class="subheading" id="subheading-7">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-7"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1293,9 +1284,8 @@ after item</td></tr>
 </p></blockquote>
 </li></ul>
 
-<div class="subheading" id="subheading-8">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-8"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1440,9 +1430,8 @@ in macro
 </p></blockquote>
 </li></ul>
 
-<div class="subheading" id="subheading-9">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-9"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1588,9 +1577,8 @@ Call macro in mutitable in format_command
 </p></blockquote>
 </li></ul>
 
-<div class="subheading" id="subheading-10">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-10"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1745,9 +1733,8 @@ Something2
 </li></ul>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-11">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-11"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -1924,9 +1911,8 @@ Something2
 </li></ul>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-12">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-12"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -2104,9 +2090,8 @@ Something2
 </li></ul>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-13">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-13"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -2285,9 +2270,8 @@ in macro
 </p></blockquote>
 </li></ul>
 
-<div class="subheading" id="subheading-14">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-14"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2434,9 +2418,8 @@ call macro in deffn in format_command
 </p></blockquote>
 </li></ul>
 
-<div class="subheading" id="subheading-15">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-15"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2586,9 +2569,8 @@ html
 </p></blockquote>
 </li></ul>
 
-<div class="subheading" id="subheading-16">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-16"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2737,9 +2719,8 @@ in macro
 </p></blockquote>
 </li></ul>
 
-<div class="subheading" id="subheading-17">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-17"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2886,9 +2867,8 @@ html
 </p></blockquote>
 </li></ul>
 
-<div class="subheading" id="subheading-18">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-18"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3036,9 +3016,8 @@ html
 </p></blockquote>
 </li></ul>
 
-<div class="subheading" id="subheading-19">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-19"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3188,9 +3167,8 @@ html
 </p></blockquote>
 </li></ul>
 
-<div class="subheading" id="subheading-20">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-20"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3336,9 +3314,8 @@ in macro
 </p></blockquote>
 </li></ul>
 
-<div class="subheading" id="subheading-21">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-21"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3484,9 +3461,8 @@ html
 </p></blockquote>
 </li></ul>
 
-<div class="subheading" id="subheading-22">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-22"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3634,9 +3610,8 @@ in macro
 </p></blockquote>
 </li></ul>
 
-<div class="subheading" id="subheading-23">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-23"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3783,9 +3758,8 @@ call macro in flushleft in format_command
 </p></blockquote>
 </li></ul>
 
-<div class="subheading" id="subheading-24">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-24"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3931,9 +3905,8 @@ html
 </p></blockquote>
 </li></ul>
 
-<div class="subheading" id="subheading-25">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-25"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -4079,9 +4052,8 @@ html
 </p></blockquote>
 </li></ul>
 
-<div class="subheading" id="subheading-26">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-26"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -4185,7 +4157,7 @@ html
 
 </li></ul>
 
-</div><hr></div>
+<hr></div>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 7d72c06..f3004d3 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
@@ -49,8 +49,7 @@ ul.no-bullet {list-style: none}
 
 
 <div class="top" id="Top">
-<div class="node" id="Test-nested-menu">
-<h1 class="top">Test nested menu</h1>
+<span id="Test-nested-menu"></span><h1 class="top">Test nested menu</h1>
 
 
 <p>Call macro
@@ -90,9 +89,8 @@ in macro
 </pre></blockquote>
 </th></tr></table>
 
-<div class="subheading" id="subheading">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -249,9 +247,8 @@ Something2
 </th></tr></table>
 <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
 
-</pre><div class="subheading" id="subheading-1">
-<strong>subheading</strong>
-</div><pre class="menu-comment">
+</pre><span id="subheading-1"></span><strong>subheading</strong>
+<pre class="menu-comment">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="menu-comment">
@@ -417,9 +414,8 @@ html
 </pre></blockquote>
 </th></tr></table>
 
-<div class="subheading" id="subheading-2">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-2"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -569,9 +565,8 @@ in macro
 </pre></blockquote>
 </th></tr></table>
 
-<div class="subheading" id="subheading-3">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-3"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -728,9 +723,8 @@ Something2
 </th></tr></table>
 <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
 
-</pre><div class="subheading" id="subheading-4">
-<strong>subheading</strong>
-</div><pre class="menu-comment">
+</pre><span id="subheading-4"></span><strong>subheading</strong>
+<pre class="menu-comment">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="menu-comment">
@@ -897,9 +891,8 @@ html
 </pre></blockquote>
 </th></tr></table>
 
-<div class="subheading" id="subheading-5">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-5"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1049,9 +1042,8 @@ in macro
 </pre></blockquote>
 </th></tr></table>
 
-<div class="subheading" id="subheading-6">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-6"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1208,9 +1200,8 @@ Something2
 </th></tr></table>
 <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
 
-</pre><div class="subheading" id="subheading-7">
-<strong>subheading</strong>
-</div><pre class="menu-comment">
+</pre><span id="subheading-7"></span><strong>subheading</strong>
+<pre class="menu-comment">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="menu-comment">
@@ -1379,9 +1370,8 @@ after item</td></tr>
 </pre></blockquote>
 </th></tr></table>
 
-<div class="subheading" id="subheading-8">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-8"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1530,9 +1520,8 @@ in macro
 </pre></blockquote>
 </th></tr></table>
 
-<div class="subheading" id="subheading-9">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-9"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1688,9 +1677,8 @@ Something2
 </th></tr></table>
 <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
 
-</pre><div class="subheading" id="subheading-10">
-<strong>subheading</strong>
-</div><pre class="menu-comment">
+</pre><span id="subheading-10"></span><strong>subheading</strong>
+<pre class="menu-comment">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="menu-comment">
@@ -1863,9 +1851,8 @@ Something2
 </td></tr></table>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-11">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-11"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -2036,9 +2023,8 @@ Something2
 </td></tr></table>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-12">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-12"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -2210,9 +2196,8 @@ Something2
 </td></tr></table>
 <pre class="menu-preformatted">
 
-</pre><div class="subheading" id="subheading-13">
-<strong>subheading</strong>
-</div><pre class="menu-preformatted">
+</pre><span id="subheading-13"></span><strong>subheading</strong>
+<pre class="menu-preformatted">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="menu-preformatted">
@@ -2385,9 +2370,8 @@ in macro
 </pre></blockquote>
 </th></tr></table>
 
-<div class="subheading" id="subheading-14">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-14"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2544,9 +2528,8 @@ Something2
 </th></tr></table>
 <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
 
-</pre><div class="subheading" id="subheading-15">
-<strong>subheading</strong>
-</div><pre class="menu-comment">
+</pre><span id="subheading-15"></span><strong>subheading</strong>
+<pre class="menu-comment">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="menu-comment">
@@ -2714,9 +2697,8 @@ html
 </pre></blockquote>
 </th></tr></table>
 
-<div class="subheading" id="subheading-16">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-16"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2869,9 +2851,8 @@ in macro
 </pre></blockquote>
 </th></tr></table>
 
-<div class="subheading" id="subheading-17">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-17"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3022,9 +3003,8 @@ html
 </pre></blockquote>
 </th></tr></table>
 
-<div class="subheading" id="subheading-18">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-18"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3182,9 +3162,8 @@ Something2
 </th></tr></table>
 <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
 
-</pre><div class="subheading" id="subheading-19">
-<strong>subheading</strong>
-</div><pre class="menu-comment">
+</pre><span id="subheading-19"></span><strong>subheading</strong>
+<pre class="menu-comment">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="menu-comment">
@@ -3352,9 +3331,8 @@ html
 </pre></blockquote>
 </th></tr></table>
 
-<div class="subheading" id="subheading-20">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-20"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3504,9 +3482,8 @@ in macro
 </pre></blockquote>
 </th></tr></table>
 
-<div class="subheading" id="subheading-21">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-21"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3662,9 +3639,8 @@ Something2
 </th></tr></table>
 <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
 
-</pre><div class="subheading" id="subheading-22">
-<strong>subheading</strong>
-</div><pre class="menu-comment">
+</pre><span id="subheading-22"></span><strong>subheading</strong>
+<pre class="menu-comment">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="menu-comment">
@@ -3830,9 +3806,8 @@ in macro
 </pre></blockquote>
 </th></tr></table>
 
-<div class="subheading" id="subheading-23">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-23"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3989,9 +3964,8 @@ Something2
 </th></tr></table>
 <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
 
-</pre><div class="subheading" id="subheading-24">
-<strong>subheading</strong>
-</div><pre class="menu-comment">
+</pre><span id="subheading-24"></span><strong>subheading</strong>
+<pre class="menu-comment">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="menu-comment">
@@ -4155,9 +4129,8 @@ html
 </pre></blockquote>
 </th></tr></table>
 
-<div class="subheading" id="subheading-25">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-25"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -4313,9 +4286,8 @@ Something2
 </th></tr></table>
 <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
 
-</pre><div class="subheading" id="subheading-26">
-<strong>subheading</strong>
-</div><pre class="menu-comment">
+</pre><span id="subheading-26"></span><strong>subheading</strong>
+<pre class="menu-comment">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="menu-comment">
@@ -4443,7 +4415,7 @@ html
 
 </pre></th></tr></table>
 
-</div><hr></div>
+<hr></div>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 0a44b1b..99d2f04 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
@@ -49,8 +49,7 @@ ul.no-bullet {list-style: none}
 
 
 <div class="top" id="Top">
-<div class="node" id="Test-nested-multitable">
-<h1 class="top">Test nested multitable</h1>
+<span id="Test-nested-multitable"></span><h1 class="top">Test nested 
multitable</h1>
 
 
 <p>Call macro
@@ -90,9 +89,8 @@ in macro
 </p></blockquote></td></tr>
 </table>
 
-<div class="subheading" id="subheading">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -234,9 +232,8 @@ html
 </p></blockquote></td></tr>
 </table>
 
-<div class="subheading" id="subheading-1">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-1"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -378,9 +375,8 @@ html
 </p></blockquote></td></tr>
 </table>
 
-<div class="subheading" id="subheading-2">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-2"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -521,9 +517,8 @@ in macro
 </p></blockquote></td></tr>
 </table>
 
-<div class="subheading" id="subheading-3">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-3"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -665,9 +660,8 @@ Call macro in itemize in format_command
 </p></blockquote></td></tr>
 </table>
 
-<div class="subheading" id="subheading-4">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-4"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -810,9 +804,8 @@ html
 </p></blockquote></td></tr>
 </table>
 
-<div class="subheading" id="subheading-5">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-5"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -953,9 +946,8 @@ in macro
 </p></blockquote></td></tr>
 </table>
 
-<div class="subheading" id="subheading-6">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-6"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1097,9 +1089,8 @@ Call macro in enumerate in format_command
 </p></blockquote></td></tr>
 </table>
 
-<div class="subheading" id="subheading-7">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-7"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1244,9 +1235,8 @@ after item</td></tr>
 </p></blockquote></td></tr>
 </table>
 
-<div class="subheading" id="subheading-8">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-8"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1386,9 +1376,8 @@ in macro
 </p></blockquote></td></tr>
 </table>
 
-<div class="subheading" id="subheading-9">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-9"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1529,9 +1518,8 @@ Call macro in mutitable in format_command
 </p></blockquote></td></tr>
 </table>
 
-<div class="subheading" id="subheading-10">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-10"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1680,9 +1668,8 @@ Something2
 </table>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-11">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-11"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -1833,9 +1820,8 @@ Something2
 </table>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-12">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-12"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -1964,9 +1950,8 @@ Something2</pre><table>
 <pre class="example">A quot---ation
 </pre></blockquote></td></tr>
 </table>
-<pre class="example"></pre><div class="subheading" id="subheading-13">
-<strong>subheading</strong>
-</div><pre class="example"></pre><pre class="verbatim">in verbatim
+<pre class="example"></pre><span 
id="subheading-13"></span><strong>subheading</strong>
+<pre class="example"></pre><pre class="verbatim">in verbatim
 </pre><pre class="example">html</pre><ul>
 <li> <pre class="example">i--tem 1
 </pre></li><li> <pre class="example">i--tem 2
@@ -2088,9 +2073,8 @@ in macro
 </p></blockquote></td></tr>
 </table>
 
-<div class="subheading" id="subheading-14">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-14"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2232,9 +2216,8 @@ call macro in deffn in format_command
 </p></blockquote></td></tr>
 </table>
 
-<div class="subheading" id="subheading-15">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-15"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2378,9 +2361,8 @@ html
 </p></blockquote></td></tr>
 </table>
 
-<div class="subheading" id="subheading-16">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-16"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2524,9 +2506,8 @@ in macro
 </p></blockquote></td></tr>
 </table>
 
-<div class="subheading" id="subheading-17">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-17"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2668,9 +2649,8 @@ html
 </p></blockquote></td></tr>
 </table>
 
-<div class="subheading" id="subheading-18">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-18"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2813,9 +2793,8 @@ html
 </p></blockquote></td></tr>
 </table>
 
-<div class="subheading" id="subheading-19">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-19"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2959,9 +2938,8 @@ html
 </p></blockquote></td></tr>
 </table>
 
-<div class="subheading" id="subheading-20">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-20"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3102,9 +3080,8 @@ in macro
 </p></blockquote></td></tr>
 </table>
 
-<div class="subheading" id="subheading-21">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-21"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3245,9 +3222,8 @@ html
 </p></blockquote></td></tr>
 </table>
 
-<div class="subheading" id="subheading-22">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-22"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3389,9 +3365,8 @@ in macro
 </p></blockquote></td></tr>
 </table>
 
-<div class="subheading" id="subheading-23">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-23"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3533,9 +3508,8 @@ call macro in flushleft in format_command
 </p></blockquote></td></tr>
 </table>
 
-<div class="subheading" id="subheading-24">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-24"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3675,9 +3649,8 @@ html
 </p></blockquote></td></tr>
 </table>
 
-<div class="subheading" id="subheading-25">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-25"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3818,9 +3791,8 @@ html
 </p></blockquote></td></tr>
 </table>
 
-<div class="subheading" id="subheading-26">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-26"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3924,7 +3896,7 @@ html
 </table></td></tr>
 </table>
 
-</div><hr></div>
+<hr></div>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 a3cb73d..f6c5d33 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
@@ -49,8 +49,7 @@ ul.no-bullet {list-style: none}
 
 
 <div class="top" id="Top">
-<div class="node" id="Test-nested-quotation">
-<h1 class="top">Test nested quotation</h1>
+<span id="Test-nested-quotation"></span><h1 class="top">Test nested 
quotation</h1>
 
 
 <p>Call macro
@@ -96,9 +95,8 @@ in macro
 </p></blockquote>
 </blockquote>
 
-<div class="subheading" id="subheading">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -245,9 +243,8 @@ html
 </p></blockquote>
 </blockquote>
 
-<div class="subheading" id="subheading-1">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-1"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -395,9 +392,8 @@ html
 </p></blockquote>
 </blockquote>
 
-<div class="subheading" id="subheading-2">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-2"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -543,9 +539,8 @@ in macro
 </p></blockquote>
 </blockquote>
 
-<div class="subheading" id="subheading-3">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-3"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -692,9 +687,8 @@ Call macro in itemize in format_command
 </p></blockquote>
 </blockquote>
 
-<div class="subheading" id="subheading-4">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-4"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -843,9 +837,8 @@ html
 </p></blockquote>
 </blockquote>
 
-<div class="subheading" id="subheading-5">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-5"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -991,9 +984,8 @@ in macro
 </p></blockquote>
 </blockquote>
 
-<div class="subheading" id="subheading-6">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-6"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1140,9 +1132,8 @@ Call macro in enumerate in format_command
 </p></blockquote>
 </blockquote>
 
-<div class="subheading" id="subheading-7">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-7"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1293,9 +1284,8 @@ after item</td></tr>
 </p></blockquote>
 </blockquote>
 
-<div class="subheading" id="subheading-8">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-8"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1440,9 +1430,8 @@ in macro
 </p></blockquote>
 </blockquote>
 
-<div class="subheading" id="subheading-9">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-9"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1588,9 +1577,8 @@ Call macro in mutitable in format_command
 </p></blockquote>
 </blockquote>
 
-<div class="subheading" id="subheading-10">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-10"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1745,9 +1733,8 @@ Something2
 </blockquote>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-11">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-11"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -1924,9 +1911,8 @@ Something2
 </blockquote>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-12">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-12"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -2104,9 +2090,8 @@ Something2
 </blockquote>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-13">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-13"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -2285,9 +2270,8 @@ in macro
 </p></blockquote>
 </blockquote>
 
-<div class="subheading" id="subheading-14">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-14"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2434,9 +2418,8 @@ call macro in deffn in format_command
 </p></blockquote>
 </blockquote>
 
-<div class="subheading" id="subheading-15">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-15"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2586,9 +2569,8 @@ html
 </p></blockquote>
 </blockquote>
 
-<div class="subheading" id="subheading-16">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-16"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2737,9 +2719,8 @@ in macro
 </p></blockquote>
 </blockquote>
 
-<div class="subheading" id="subheading-17">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-17"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2886,9 +2867,8 @@ html
 </p></blockquote>
 </blockquote>
 
-<div class="subheading" id="subheading-18">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-18"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3036,9 +3016,8 @@ html
 </p></blockquote>
 </blockquote>
 
-<div class="subheading" id="subheading-19">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-19"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3188,9 +3167,8 @@ html
 </p></blockquote>
 </blockquote>
 
-<div class="subheading" id="subheading-20">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-20"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3336,9 +3314,8 @@ in macro
 </p></blockquote>
 </blockquote>
 
-<div class="subheading" id="subheading-21">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-21"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3484,9 +3461,8 @@ html
 </p></blockquote>
 </blockquote>
 
-<div class="subheading" id="subheading-22">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-22"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3634,9 +3610,8 @@ in macro
 </p></blockquote>
 </blockquote>
 
-<div class="subheading" id="subheading-23">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-23"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3783,9 +3758,8 @@ call macro in flushleft in format_command
 </p></blockquote>
 </blockquote>
 
-<div class="subheading" id="subheading-24">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-24"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3931,9 +3905,8 @@ html
 </p></blockquote>
 </blockquote>
 
-<div class="subheading" id="subheading-25">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-25"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -4079,9 +4052,8 @@ html
 </p></blockquote>
 </blockquote>
 
-<div class="subheading" id="subheading-26">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-26"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -4185,7 +4157,7 @@ html
 
 </blockquote>
 
-</div><hr></div>
+<hr></div>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
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 a3f5a57..6133177 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
@@ -49,8 +49,7 @@ ul.no-bullet {list-style: none}
 
 
 <div class="top" id="Top">
-<div class="node" id="Test-nested-table">
-<h1 class="top">Test nested table</h1>
+<span id="Test-nested-table"></span><h1 class="top">Test nested table</h1>
 
 
 <p>Call macro
@@ -95,9 +94,8 @@ in macro
 </dd>
 </dl>
 
-<div class="subheading" id="subheading">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -244,9 +242,8 @@ html
 </dd>
 </dl>
 
-<div class="subheading" id="subheading-1">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-1"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -395,9 +392,8 @@ html
 </dd>
 </dl>
 
-<div class="subheading" id="subheading-2">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-2"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -543,9 +539,8 @@ in macro
 </dd>
 </dl>
 
-<div class="subheading" id="subheading-3">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-3"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -692,9 +687,8 @@ Call macro in itemize in format_command
 </dd>
 </dl>
 
-<div class="subheading" id="subheading-4">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-4"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -844,9 +838,8 @@ html
 </dd>
 </dl>
 
-<div class="subheading" id="subheading-5">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-5"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -992,9 +985,8 @@ in macro
 </dd>
 </dl>
 
-<div class="subheading" id="subheading-6">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-6"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1141,9 +1133,8 @@ Call macro in enumerate in format_command
 </dd>
 </dl>
 
-<div class="subheading" id="subheading-7">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-7"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1295,9 +1286,8 @@ after item</td></tr>
 </dd>
 </dl>
 
-<div class="subheading" id="subheading-8">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-8"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1442,9 +1432,8 @@ in macro
 </dd>
 </dl>
 
-<div class="subheading" id="subheading-9">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-9"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1590,9 +1579,8 @@ Call macro in mutitable in format_command
 </dd>
 </dl>
 
-<div class="subheading" id="subheading-10">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-10"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -1748,9 +1736,8 @@ Something2
 </dl>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-11">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-11"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -1927,9 +1914,8 @@ Something2
 </dl>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-12">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-12"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -2107,9 +2093,8 @@ Something2
 </dl>
 <pre class="example">
 
-</pre><div class="subheading" id="subheading-13">
-<strong>subheading</strong>
-</div><pre class="example">
+</pre><span id="subheading-13"></span><strong>subheading</strong>
+<pre class="example">
 
 </pre><pre class="verbatim">in verbatim
 </pre><pre class="example">
@@ -2289,9 +2274,8 @@ in macro
 </dd>
 </dl>
 
-<div class="subheading" id="subheading-14">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-14"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2438,9 +2422,8 @@ call macro in deffn in format_command
 </dd>
 </dl>
 
-<div class="subheading" id="subheading-15">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-15"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2591,9 +2574,8 @@ html
 </dd>
 </dl>
 
-<div class="subheading" id="subheading-16">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-16"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2742,9 +2724,8 @@ in macro
 </dd>
 </dl>
 
-<div class="subheading" id="subheading-17">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-17"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -2891,9 +2872,8 @@ html
 </dd>
 </dl>
 
-<div class="subheading" id="subheading-18">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-18"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3041,9 +3021,8 @@ html
 </dd>
 </dl>
 
-<div class="subheading" id="subheading-19">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-19"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3194,9 +3173,8 @@ html
 </dd>
 </dl>
 
-<div class="subheading" id="subheading-20">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-20"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3342,9 +3320,8 @@ in macro
 </dd>
 </dl>
 
-<div class="subheading" id="subheading-21">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-21"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3490,9 +3467,8 @@ html
 </dd>
 </dl>
 
-<div class="subheading" id="subheading-22">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-22"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3641,9 +3617,8 @@ in macro
 </dd>
 </dl>
 
-<div class="subheading" id="subheading-23">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-23"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3790,9 +3765,8 @@ call macro in flushleft in format_command
 </dd>
 </dl>
 
-<div class="subheading" id="subheading-24">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-24"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -3939,9 +3913,8 @@ html
 </dd>
 </dl>
 
-<div class="subheading" id="subheading-25">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-25"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -4087,9 +4060,8 @@ html
 </dd>
 </dl>
 
-<div class="subheading" id="subheading-26">
-<h3 class="subheading">subheading</h3>
-</div>
+<span id="subheading-26"></span><h3 class="subheading">subheading</h3>
+
 <pre class="verbatim">in verbatim
 </pre>
 
@@ -4195,7 +4167,7 @@ html
 </dd>
 </dl>
 
-</div><hr></div>
+<hr></div>
 </div>
 <p><font size="-1">
   This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
diff --git 
a/tp/tests/sectioning/res_parser/sectioning_directions/sectioning.html 
b/tp/tests/sectioning/res_parser/sectioning_directions/sectioning.html
index 330f5b1..23039ae 100644
--- a/tp/tests/sectioning/res_parser/sectioning_directions/sectioning.html
+++ b/tp/tests/sectioning/res_parser/sectioning_directions/sectioning.html
@@ -141,8 +141,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left"></td>
 <td valign="middle" align="left">|</td>
 </tr></table>
-<div class="node" id="SEC_Top">
-<table class="menu" border="0" cellspacing="0">
+<span id="SEC_Top"></span><table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#First-node">1 first node 
chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">node 1
   explaination no heading ?
 * and here ?
@@ -175,7 +174,7 @@ description here
 
 </pre></th></tr></table>
 
-</div><hr size="6">
+<hr size="6">
 <div class="chapter" id="First-node">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
@@ -283,8 +282,7 @@ description here
 <td valign="middle" align="left"></td>
 <td valign="middle" align="left">|</td>
 </tr></table>
-<div class="node" id="first-node-chapter">
-<h1 class="chapter">1 first node chapter</h1>
+<span id="first-node-chapter"></span><h1 class="chapter">1 first node 
chapter</h1>
 
 <p>first node chapter text
 </p><table class="menu" border="0" cellspacing="0">
@@ -298,7 +296,7 @@ description here
 
 </pre></th></tr></table>
 
-</div><hr>
+<hr>
 <div class="unnumberedsec" id="unnumbered">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
@@ -406,8 +404,7 @@ description here
 <td valign="middle" align="left">1 first node chapter</td>
 <td valign="middle" align="left">|</td>
 </tr></table>
-<div class="node" id="unnumbered-section">
-<h2 class="unnumberedsec">unnumbered section</h2>
+<span id="unnumbered-section"></span><h2 class="unnumberedsec">unnumbered 
section</h2>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#unnumbered-sub">unnumbered 
subsection</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">un
@@ -420,7 +417,7 @@ description here
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="unnumberedsubsec" id="unnumbered-sub">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
@@ -528,10 +525,9 @@ description here
 <td valign="middle" align="left">unnumbered section</td>
 <td valign="middle" align="left">|</td>
 </tr></table>
-<div class="node" id="unnumbered-subsection">
-<h3 class="unnumberedsubsec">unnumbered subsection</h3>
+<span id="unnumbered-subsection"></span><h3 
class="unnumberedsubsec">unnumbered subsection</h3>
 
-</div><hr>
+<hr>
 </div>
 <div class="subsection" id="numbered-sub">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -640,10 +636,9 @@ description here
 <td valign="middle" align="left">unnumbered subsection</td>
 <td valign="middle" align="left">|</td>
 </tr></table>
-<div class="node" id="numbered-subsection">
-<h3 class="subsection">numbered subsection</h3>
+<span id="numbered-subsection"></span><h3 class="subsection">numbered 
subsection</h3>
 
-</div><hr>
+<hr>
 </div>
 <div class="unnumberedsubsec" id="unnumbered-sub2">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -752,10 +747,9 @@ description here
 <td valign="middle" align="left">numbered subsection</td>
 <td valign="middle" align="left">|</td>
 </tr></table>
-<div class="node" id="unnumbered-subsection2">
-<h3 class="unnumberedsubsec">unnumbered subsection2</h3>
+<span id="unnumbered-subsection2"></span><h3 
class="unnumberedsubsec">unnumbered subsection2</h3>
 
-</div><hr>
+<hr>
 </div>
 <div class="subsection" id="numbered-sub2">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -864,10 +858,9 @@ description here
 <td valign="middle" align="left">unnumbered subsection2</td>
 <td valign="middle" align="left">|</td>
 </tr></table>
-<div class="node" id="numbered-subsection2">
-<h3 class="subsection">numbered subsection2</h3>
+<span id="numbered-subsection2"></span><h3 class="subsection">numbered 
subsection2</h3>
 
-</div><hr>
+<hr>
 </div>
 </div>
 <div class="unnumberedsec" id="unnumbered2">
@@ -977,15 +970,14 @@ description here
 <td valign="middle" align="left">numbered subsection2</td>
 <td valign="middle" align="left">|</td>
 </tr></table>
-<div class="node" id="unnumbered-section2">
-<h2 class="unnumberedsec">unnumbered section2</h2>
+<span id="unnumbered-section2"></span><h2 class="unnumberedsec">unnumbered 
section2</h2>
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top"><a href="#numbered-sub3">numbered 
subsection3</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
-</div><hr>
+<hr>
 <div class="subsection" id="numbered-sub3">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
@@ -1093,11 +1085,10 @@ description here
 <td valign="middle" align="left">unnumbered section2</td>
 <td valign="middle" align="left">|</td>
 </tr></table>
-<div class="node" id="numbered-subsection3">
-<h3 class="subsection">numbered subsection3</h3>
+<span id="numbered-subsection3"></span><h3 class="subsection">numbered 
subsection3</h3>
 
 
-</div><hr>
+<hr>
 </div>
 </div>
 <div class="section" id="numbered">
@@ -1207,14 +1198,12 @@ description here
 <td valign="middle" align="left">numbered subsection3</td>
 <td valign="middle" align="left">|</td>
 </tr></table>
-<div class="node" id="numbered-section">
-<h2 class="section">1.1 numbered section</h2>
-
-</div><div class="node" id="between-node">
+<span id="numbered-section"></span><h2 class="section">1.1 numbered 
section</h2>
 
+<span id="between-node"></span>
 <p>between node, node without sectioning node
 </p>
-</div><hr>
+<hr>
 </div>
 </div>
 <div class="chapter" id="Second-node">
@@ -1327,12 +1316,11 @@ description here
 
 <p>Second node text
 </p>
-<div class="node" id="second-node-chapter">
-<h1 class="chapter">2 second node chapter</h1>
+<span id="second-node-chapter"></span><h1 class="chapter">2 second node 
chapter</h1>
 
 <p>second node chapter text.
 </p>
-</div><hr>
+<hr>
 </div>
 <div class="unnumbered" id="Third-node-unnumbered">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -1441,15 +1429,13 @@ description here
 <td valign="middle" align="left">2 second node chapter</td>
 <td valign="middle" align="left">|</td>
 </tr></table>
-<div class="node" id="unnumbered-chapter">
-<h1 class="unnumbered">unnumbered chapter</h1>
+<span id="unnumbered-chapter"></span><h1 class="unnumbered">unnumbered 
chapter</h1>
 
 <p>unnumbered chapter text.
 </p>
 
-</div><div class="node" id="Last-node-no-description">
-
-</div><hr size="6">
+<span id="Last-node-no-description"></span>
+<hr size="6">
 </div>
 </div>
 <div class="Contents_element" id="SEC_Contents">



reply via email to

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