diff --git a/ChangeLog b/ChangeLog
index b5ec653afc..fde35c5ec9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2021-02-13  Per Bothner <per@bothner.com>
+
+	Use the sectionning tree structure in HTML output
+
+	* tp/Texinfo/Convert/HTML.pm (register_opened_section_level,
+	close_registered_sections_level, _convert_heading_command,
+	_convert_element_type, _default_end_file): use <div> for
+	elements and keep the sectioning tree structure.
+
 2021-02-10  Gavin Smith  <gavinsmith0123@gmail.com>
 
 	Do not call pclose on non-pipe.
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 443b6b4702..2a50f47836 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -2402,6 +2402,31 @@ sub _default_element_header($$$$)
   return $result;
 }
 
+sub register_opened_section_level($$$)
+{
+  my $self = shift;
+  my $level = shift;
+  my $close = shift;
+  while (@{$self->{'pending_closes'}} < $level) {
+      push(@{$self->{'pending_closes'}}, "");
+  }
+  push(@{$self->{'pending_closes'}}, $close);
+}
+
+sub close_registered_sections_level($$)
+{
+  my $self = shift;
+  my $level = shift;
+  my @closed_elements;
+  my $result = '';
+  while (@{$self->{'pending_closes'}} > $level) {
+      my $close = pop @{$self->{'pending_closes'}};
+      push(@closed_elements, $close)
+        if ($close);
+  }
+  return @closed_elements;
+}
+
 sub _convert_heading_command($$$$$)
 {
   my $self = shift;
@@ -2419,9 +2444,26 @@ sub _convert_heading_command($$$$$)
     return $result;
   }
 
+  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"';
+  } else {
+      $result .= " class=\"$cmdname\"";
+  }
   my $element_id = $self->command_id($command);
-  $result .= "<span id=\"$element_id\"></span>"
-    if (defined($element_id) and $element_id ne '');
+  $result .= " id=\"$element_id\""
+      if (defined($element_id) and $element_id ne '');
 
   print STDERR "Process $command "
         .Texinfo::Structuring::_print_root_command_texi($command)."\n"
@@ -2433,6 +2475,7 @@ sub _convert_heading_command($$$$$)
       and $command->{'parent'}->{'type'} eq 'element') {
     $element = $command->{'parent'};
   }
+  $result .= ">\n";
   if ($element) {
     $result .= &{$self->{'format_element_header'}}($self, $cmdname, 
                                             $command, $element);
@@ -2514,7 +2557,7 @@ sub _convert_heading_command($$$$$)
                        eq 'inline')))) {
     $result .= _mini_toc($self, $command);
   }
-
+  $result .= '</div>' if (! $section);
   return $result;
 }
 
@@ -4662,16 +4705,18 @@ sub _convert_element_type($$$$)
 
   if ($element->{'extra'}->{'special_element'}) {
     $special_element = $element->{'extra'}->{'special_element'};
+    $result .= join('', $self->close_registered_sections_level(0));
     my $id = $self->command_id($element);
+    $result .= "<div class=\"${special_element}_element\"";
     if ($id ne '') {
-      $result .= "<span id=\"$id\"></span>\n";
+      $result .= " id=\"$id\"";
     }
+    $result .= ">\n";
     if ($self->get_conf('HEADERS') 
         # first in page
         or $self->{'counter_in_file'}->{$element->{'filename'}} == 1) {
       $result .= &{$self->{'format_navigation_header'}}($self, 
                  $self->get_conf('MISC_BUTTONS'), undef, $element);
-      
     }
     my $heading = $self->command_text($element);
     my $element_name = $element->{'extra'}->{'special_element'};
@@ -4691,13 +4736,13 @@ sub _convert_element_type($$$$)
     if ($special_element_body eq '') {
       return '';
     }
-    $result .= $special_element_body;
+    $result .= $special_element_body . '</div>';
   } elsif (!$element->{'element_prev'}) {
     $result .= $self->_print_title();
     if (!$element->{'element_next'}) {
       # only one element
       my $foot_text = &{$self->{'format_footnotes_text'}}($self);
-      return $result.$content.$foot_text.$self->get_conf('DEFAULT_RULE')."\n";
+      return $result.$content.$foot_text.$self->get_conf('DEFAULT_RULE')."</div>\n";
     }
   }
   $result .= $content unless ($special_element);
@@ -5127,6 +5172,7 @@ sub converter_initialize($)
 
   $self->{'document_context'} = [];
   $self->{'multiple_pass'} = [];
+  $self->{'pending_closes'} = [];
   $self->_new_document_context('_toplevel_context');
 
   if ($self->get_conf('SPLIT') and $self->get_conf('SPLIT') ne 'chapter'
@@ -6494,10 +6540,11 @@ sub _default_program_string($)
 sub _default_end_file($)
 {
   my $self = shift;
+  my $closing_sections_text = join('', $self->close_registered_sections_level(0));
   my $program_text = '';
   if ($self->get_conf('PROGRAM_NAME_IN_FOOTER')) {
     my $program_string = &{$self->{'format_program_string'}}($self);
-    $program_text = "<p><font size=\"-1\">
+    $program_text .= "<p><font size=\"-1\">
   $program_string
 </font></p>";
   }
@@ -6515,7 +6562,7 @@ sub _default_end_file($)
 .'</small></a>';
   }
 
-  return "$program_text
+  return "${closing_sections_text}${program_text}
 
 $pre_body_close
 </body>
diff --git a/tp/t/results/converters_tests/accent.pl b/tp/t/results/converters_tests/accent.pl
index 200203fb0b..2ab567669c 100644
--- a/tp/t/results/converters_tests/accent.pl
+++ b/tp/t/results/converters_tests/accent.pl
@@ -3250,7 +3250,9 @@ should be e\': è è
 ';
 
 
-$result_converted{'html_text'}->{'accent'} = '<span id="Top"></span><span id="top"></span><h1 class="top">top</h1>
+$result_converted{'html_text'}->{'accent'} = '<div class="top" id="Top">
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 <p>should be e&lsquo;: &egrave; &egrave;
 </p>
@@ -3325,7 +3327,7 @@ $result_converted{'html_text'}->{'accent'} = '<span id="Top"></span><span id="to
 <p>should be dotless j^: &#309;
 </p>
 <p>should be dotless j&quot;: j"
-</p><hr>
+</p></div><hr></div>
 ';
 
 
diff --git a/tp/t/results/converters_tests/accentenc.pl b/tp/t/results/converters_tests/accentenc.pl
index 597053c26e..65f67d3587 100644
--- a/tp/t/results/converters_tests/accentenc.pl
+++ b/tp/t/results/converters_tests/accentenc.pl
@@ -3296,7 +3296,9 @@ should be e\': è è
 
 
 $result_converted{'html_text'}->{'accentenc'} = '
-<span id="Top"></span><span id="top"></span><h1 class="top">top</h1>
+<div class="top" id="Top">
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 <p>should be e&lsquo;: &egrave; &egrave;
 </p>
@@ -3371,7 +3373,7 @@ $result_converted{'html_text'}->{'accentenc'} = '
 <p>should be dotless j^: &#309;
 </p>
 <p>should be dotless j&quot;: j"
-</p><hr>
+</p></div><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 a544988f09..d872ce682e 100644
--- a/tp/t/results/converters_tests/accentenc_enable_encoding.pl
+++ b/tp/t/results/converters_tests/accentenc_enable_encoding.pl
@@ -3217,7 +3217,9 @@ $result_floats{'accentenc_enable_encoding'} = {};
 
 
 $result_converted{'html_text'}->{'accentenc_enable_encoding'} = '
-<span id="Top"></span><span id="top"></span><h1 class="top">top</h1>
+<div class="top" id="Top">
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 <p>should be e&lsquo;: è è
 </p>
@@ -3292,7 +3294,7 @@ $result_converted{'html_text'}->{'accentenc_enable_encoding'} = '
 <p>should be dotless j^: &#309;
 </p>
 <p>should be dotless j&quot;: j"
-</p><hr>
+</p></div><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 1471cb65b2..a811761429 100644
--- a/tp/t/results/converters_tests/accentenc_no_entity.pl
+++ b/tp/t/results/converters_tests/accentenc_no_entity.pl
@@ -3217,7 +3217,9 @@ $result_floats{'accentenc_no_entity'} = {};
 
 
 $result_converted{'html_text'}->{'accentenc_no_entity'} = '
-<span id="Top"></span><span id="top"></span><h1 class="top">top</h1>
+<div class="top" id="Top">
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 <p>should be e&lsquo;: è è
 </p>
@@ -3292,7 +3294,7 @@ $result_converted{'html_text'}->{'accentenc_no_entity'} = '
 <p>should be dotless j^: &#309;
 </p>
 <p>should be dotless j&quot;: j"
-</p><hr>
+</p></div><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 9d97852662..31e8ad75e4 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -1202,7 +1202,8 @@ $result_converted{'plaintext'}->{'at_commands_in_raw'} = '<b>in b(1).</b>
 ';
 
 
-$result_converted{'html_text'}->{'at_commands_in_raw'} = '<span id="Top"></span><h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'at_commands_in_raw'} = '<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
 
 <b>in b<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>.</b>
@@ -1247,7 +1248,7 @@ $result_converted{'html_text'}->{'at_commands_in_raw'} = '<span id="Top"></span>
 </p>
 <p>Macros that should not be defined: . with arg.
 </p>
-<div class="footnote">
+</div><div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
@@ -1256,7 +1257,7 @@ $result_converted{'html_text'}->{'at_commands_in_raw'} = '<span id="Top"></span>
 <h5><a id="FOOT2" href="#DOCF2">(2)</a></h5>
 <p>second footnote</p>
 </div>
-<hr>
+<hr></div>
 ';
 
 
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 0a984fa263..193788b3f9 100644
--- a/tp/t/results/converters_tests/at_commands_in_refs.pl
+++ b/tp/t/results/converters_tests/at_commands_in_refs.pl
@@ -22893,11 +22893,13 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#-_007b-_007d" accesskey="n" rel="next"> { }</a> &nbsp; </p>
 </div>
-<span id="Top-1"></span><h1 class="top">Top</h1>
+<div class="node" id="Top-1">
+<h1 class="top">Top</h1>
 
 
 <ul class="section-toc">
@@ -22929,194 +22931,274 @@ 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>
-<hr>
-<span id="-_007b-_007d"></span><div class="header">
+</div><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>
-<span id="-_007b-_007d-1"></span><h2 class="chapter">1  { }</h2>
+<div class="node" id="-_007b-_007d-1">
+<h2 class="chapter">1  { }</h2>
 
-<hr>
-<span id="----_0021---_002e--_002e-_003f-_0040"></span><div class="header">
+</div><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>
-<span id="----_0021---_002e--_002e-_003f-_0040-1"></span><h2 class="chapter">2 &nbsp; &nbsp; ! <br> .  . ? @</h2>
+<div class="node" id="----_0021---_002e--_002e-_003f-_0040-1">
+<h2 class="chapter">2 &nbsp; &nbsp; ! <br> .  . ? @</h2>
 
-<hr>
-<span id="g_t_0040-_007b-_007d-_005c-_0023"></span><div class="header">
+</div><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>
-<span id="g_t_0040-_007b-_007d-_005c-_0023-1"></span><h2 class="chapter">3 @ { } \\ #</h2>
+<div class="node" id="g_t_0040-_007b-_007d-_005c-_0023-1">
+<h2 class="chapter">3 @ { } \\ #</h2>
 
-<hr>
-<span id="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e"></span><div class="header">
+</div><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>
-<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 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>
 
-<hr>
-<span id="g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212"></span><div class="header">
+</div><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>
-<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 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>
 
-<hr>
-<span id="g_t_2265-_2264-_2192"></span><div class="header">
+</div><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>
-<span id="g_t_2265-_2264-_2192-1"></span><h2 class="chapter">6 &ge; &le; &rarr;</h2>
+<div class="node" id="g_t_2265-_2264-_2192-1">
+<h2 class="chapter">6 &ge; &le; &rarr;</h2>
 
-<hr>
-<span id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae"></span><div class="header">
+</div><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>
-<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 class="node" id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae-1">
+<h2 class="chapter">7 &ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</h2>
 
-<hr>
-<span id="g_t_21d2-_00b0-a-b--_00e5"></span><div class="header">
+</div><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>
-<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 class="node" id="g_t_21d2-_00b0-a-b--aa">
+<h2 class="chapter">8 &rArr; &deg; a&nbsp;b a sunny day &aring;</h2>
 
-<hr>
-<span id="g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe"></span><div class="header">
+</div><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>
-<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 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>
 
-<hr>
-<span id="g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119"></span><div class="header">
+</div><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>
-<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 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>
 
-<hr>
-<span id="g_t_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361"></span><div class="header">
+</div><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>
-<span id="e-e-e-e-e-j-ee"></span><h2 class="chapter">11 &#279; &#277; e_ &#7865; &#283; j ee[</h2>
+<div class="node" id="e-e-e-e-e-j-ee">
+<h2 class="chapter">11 &#279; &#277; e_ &#7865; &#283; j ee[</h2>
 
-<hr>
-<span id="g_t_0131-_1e14-_1e08"></span><div class="header">
+</div><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>
-<span id="i-E-C"></span><h2 class="chapter">12 i &#274;` &#262;,</h2>
+<div class="node" id="i-E-C">
+<h2 class="chapter">12 i &#274;` &#262;,</h2>
 
-<hr>
-<span id="g_t_201c-_201d-_2018-_2019-_201e-_201a"></span><div class="header">
+</div><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>
-<span id="g_t_201c-_201d-_2018-_2019-_201e-_201a-1"></span><h2 class="chapter">13 &ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</h2>
+<div class="node" id="g_t_201c-_201d-_2018-_2019-_201e-_201a-1">
+<h2 class="chapter">13 &ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</h2>
 
-<hr>
-<span id="g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a"></span><div class="header">
+</div><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>
-<span id="g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a-1"></span><h2 class="chapter">14 &laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</h2>
+<div class="node" id="g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a-1">
+<h2 class="chapter">14 &laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</h2>
 
-<hr>
-<span id="g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027"></span><div class="header">
+</div><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>
-<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 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>
 
-<hr>
-<span id="AAA-AAA-BBB"></span><div class="header">
+</div><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>
-<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 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>
 
-<hr>
-<span id="CCC-CCC-DDD"></span><div class="header">
+</div><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>
-<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 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>
 
-<hr>
-<span id="someone_0040somewher-no_005fexplain_0040there"></span><div class="header">
+</div><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>
-<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 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>
 
-<hr>
-<span id="f_002d_002dile1-f_002d_002dile"></span><div class="header">
+</div><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>
-<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 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>
 
-<hr>
-<span id="-_0040-_007b_007d-_002e-"></span><div class="header">
+</div><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>
-<span id="-_0040-_007b_007d-_002e--1"></span><h2 class="chapter">20 <tt> @ {} . </tt></h2>
+<div class="node" id="-_0040-_007b_007d-_002e--1">
+<h2 class="chapter">20 <tt> @ {} . </tt></h2>
 
-<hr>
-<span id="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"></span><div class="header">
+</div><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>
-<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 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>
 
-<hr>
-<span id="env-code-option-samp-command-file-C_002dx-ESC"></span><div class="header">
+</div><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>
-<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 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>
 
-<hr>
-<span id="g_t8_002e27in"></span><div class="header">
+</div><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>
-<span id="g_t8_002e27in-1"></span><h2 class="chapter">23 8.27in</h2>
+<div class="node" id="g_t8_002e27in-1">
+<h2 class="chapter">23 8.27in</h2>
 
-<hr>
-<span id="sansserif-slanted"></span><div class="header">
+</div><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>
-<span id="sansserif-slanted-1"></span><h2 class="chapter">24 <span class="sansserif">sansserif</span> <i>slanted</i></h2>
+<div class="node" id="sansserif-slanted-1">
+<h2 class="chapter">24 <span class="sansserif">sansserif</span> <i>slanted</i></h2>
 
-<hr>
-<span id="indicateurl"></span><div class="header">
+</div><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>
-<span id="indicateurl-1"></span><h2 class="chapter">25 &lsquo;<code>indicateurl</code>&rsquo;</h2>
+<div class="node" id="indicateurl-1">
+<h2 class="chapter">25 &lsquo;<code>indicateurl</code>&rsquo;</h2>
 
-<hr>
-<span id="gH-3rd"></span><div class="header">
+</div><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>
-<span id="gH-3rd-1"></span><h2 class="chapter">26 <sub>g</sub>H 3<sup>rd</sup></h2>
+<div class="node" id="gH-3rd-1">
+<h2 class="chapter">26 <sub>g</sub>H 3<sup>rd</sup></h2>
 
-<hr>
-<span id="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls"></span><div class="header">
+</div><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>
-<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>
+<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>
 
 <p><a href="#-_007b-_007d"> { }</a>
 </p>
@@ -23172,7 +23254,9 @@ 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>
-<hr>
+</div><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 46e77314f7..726807d252 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
@@ -40,13 +40,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="----_0021---_002e--_002e-_003f-_0040"></span><div class="header">
+<div class="chapter" id="----_0021---_002e--_002e-_003f-_0040">
+<div class="header">
 <p>
 Next: <a href="_0040-_007b-_007d-_005c-_0023.html" accesskey="n" rel="next">@ { } \ #</a>, Previous: <a href="-_007b-_007d.html" accesskey="p" rel="prev"> { }</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<span id="----_0021---_002e--_002e-_003f-_0040-1"></span><h2 class="chapter">2 &nbsp; &nbsp; ! <br> .  . ? @</h2>
+<div class="node" id="----_0021---_002e--_002e-_003f-_0040-1">
+<h2 class="chapter">2 &nbsp; &nbsp; ! <br> .  . ? @</h2>
 
+</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 0dbc5c73c9..b00f5284a5 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="-_0040-_007b_007d-_002e-"></span><div class="header">
+<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.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> &nbsp; </p>
 </div>
 <hr>
-<span id="-_0040-_007b_007d-_002e--1"></span><h2 class="chapter">20 <tt> @ {} . </tt></h2>
+<div class="node" id="-_0040-_007b_007d-_002e--1">
+<h2 class="chapter">20 <tt> @ {} . </tt></h2>
 
+</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 199e17c6ae..2c1530d7e9 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
@@ -38,13 +38,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="-_007b-_007d"></span><div class="header">
+<div class="chapter" id="-_007b-_007d">
+<div class="header">
 <p>
 Next: <a href="----_0021---_002e--_002e-_003f-_0040.html" accesskey="n" rel="next">&nbsp; &nbsp; ! <br> .  . ? @</a>, Previous: <a href="index.html" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<span id="-_007b-_007d-1"></span><h2 class="chapter">1  { }</h2>
+<div class="node" id="-_007b-_007d-1">
+<h2 class="chapter">1  { }</h2>
 
+</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 add765d2e3..d90e0e519c 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t8_002e27in"></span><div class="header">
+<div class="chapter" id="g_t8_002e27in">
+<div class="header">
 <p>
 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>
-<span id="g_t8_002e27in-1"></span><h2 class="chapter">23 8.27in</h2>
+<div class="node" id="g_t8_002e27in-1">
+<h2 class="chapter">23 8.27in</h2>
 
+</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 06fa484a5d..009cbac1ab 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe"></span><div class="header">
+<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="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>
-<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 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>
 
+</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 35366c9861..8173ceddd8 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="AAA-AAA-BBB"></span><div class="header">
+<div class="chapter" id="AAA-AAA-BBB">
+<div class="header">
 <p>
 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>
-<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 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>
 
+</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 2c17fa5c9d..e18a5a2ced 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="CCC-CCC-DDD"></span><div class="header">
+<div class="chapter" id="CCC-CCC-DDD">
+<div class="header">
 <p>
 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>
-<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 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>
 
+</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 66bd1db4bb..c967c0aa82 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e"></span><div class="header">
+<div class="chapter" id="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e">
+<div class="header">
 <p>
 Next: <a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" accesskey="n" rel="next">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>, Previous: <a href="_0040-_007b-_007d-_005c-_0023.html" accesskey="p" rel="prev">@ { } \ #</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<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 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>
 
+</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 7e4d8666b1..600ddca1c5 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
@@ -38,13 +38,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_0040-_007b-_007d-_005c-_0023"></span><div class="header">
+<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.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>
-<span id="g_t_0040-_007b-_007d-_005c-_0023-1"></span><h2 class="chapter">3 @ { } \ #</h2>
+<div class="node" id="g_t_0040-_007b-_007d-_005c-_0023-1">
+<h2 class="chapter">3 @ { } \ #</h2>
 
+</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 b2a1af81ff..a2c4ad78a7 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027"></span><div class="header">
+<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.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>
-<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 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>
 
+</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 0daddfcfb6..8014f982cb 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae"></span><div class="header">
+<div class="chapter" id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae">
+<div class="header">
 <p>
 Next: <a href="_21d2-_00b0-a-b--aa.html" accesskey="n" rel="next">&rArr; &deg; a&nbsp;b a sunny day &aring;</a>, Previous: <a href="_2265-_2264-_2192.html" accesskey="p" rel="prev">&ge; &le; &rarr;</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<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 class="node" id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae-1">
+<h2 class="chapter">7 &ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</h2>
 
+</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 43e27d2181..d7a4a5e878 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a"></span><div class="header">
+<div class="chapter" id="g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a">
+<div class="header">
 <p>
 Next: <a href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html" accesskey="n" rel="next">&ldquo; &rdquo; &mdash; &ndash; &lsquo; &rsquo;</a>, Previous: <a href="_201c-_201d-_2018-_2019-_201e-_201a.html" accesskey="p" rel="prev">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<span id="g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a-1"></span><h2 class="chapter">14 &laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</h2>
+<div class="node" id="g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a-1">
+<h2 class="chapter">14 &laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</h2>
 
+</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 b6229d1da3..98d943dcc7 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_201c-_201d-_2018-_2019-_201e-_201a"></span><div class="header">
+<div class="chapter" id="g_t_201c-_201d-_2018-_2019-_201e-_201a">
+<div class="header">
 <p>
 Next: <a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html" accesskey="n" rel="next">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>, Previous: <a href="i-E-C.html" accesskey="p" rel="prev">i &#274;` &#262;,</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<span id="g_t_201c-_201d-_2018-_2019-_201e-_201a-1"></span><h2 class="chapter">13 &ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</h2>
+<div class="node" id="g_t_201c-_201d-_2018-_2019-_201e-_201a-1">
+<h2 class="chapter">13 &ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</h2>
 
+</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 3fab30dea2..ca8642b230 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_21d2-_00b0-a-b--_00e5"></span><div class="header">
+<div class="chapter" id="g_t_21d2-_00b0-a-b--_00e5">
+<div class="header">
 <p>
 Next: <a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" accesskey="n" rel="next">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Previous: <a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" accesskey="p" rel="prev">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<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 class="node" id="g_t_21d2-_00b0-a-b--aa">
+<h2 class="chapter">8 &rArr; &deg; a&nbsp;b a sunny day &aring;</h2>
 
+</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 05138e9cae..ceeb6dcb94 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212"></span><div class="header">
+<div class="chapter" id="g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212">
+<div class="header">
 <p>
 Next: <a href="_2265-_2264-_2192.html" accesskey="n" rel="next">&ge; &le; &rarr;</a>, Previous: <a href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html" accesskey="p" rel="prev">LaTeX TeX &bull; , &copy; &hellip; <small class="enddots">...</small></a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<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 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>
 
+</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 d1d246590d..db9cad443c 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_2265-_2264-_2192"></span><div class="header">
+<div class="chapter" id="g_t_2265-_2264-_2192">
+<div class="header">
 <p>
 Next: <a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" accesskey="n" rel="next">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>, Previous: <a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" accesskey="p" rel="prev">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<span id="g_t_2265-_2264-_2192-1"></span><h2 class="chapter">6 &ge; &le; &rarr;</h2>
+<div class="node" id="g_t_2265-_2264-_2192-1">
+<h2 class="chapter">6 &ge; &le; &rarr;</h2>
 
+</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 53e4a5ee80..ab891dd072 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119"></span><div class="header">
+<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="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>
-<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 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>
 
+</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 9242758e0b..aa3d49f785 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"></span><div class="header">
+<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.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>
-<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 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>
 
+</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 89629eebe9..666242e551 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361"></span><div class="header">
+<div class="chapter" id="g_t_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361">
+<div class="header">
 <p>
 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>
-<span id="e-e-e-e-e-j-ee"></span><h2 class="chapter">11 &#279; &#277; e_ &#7865; &#283; j ee[</h2>
+<div class="node" id="e-e-e-e-e-j-ee">
+<h2 class="chapter">11 &#279; &#277; e_ &#7865; &#283; j ee[</h2>
 
+</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 00e86d6b77..8a3dda36a3 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="env-code-option-samp-command-file-C_002dx-ESC"></span><div class="header">
+<div class="chapter" id="env-code-option-samp-command-file-C_002dx-ESC">
+<div class="header">
 <p>
 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>
-<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 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>
 
+</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 a54ccf4dbb..2ca300b82e 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="f_002d_002dile1-f_002d_002dile"></span><div class="header">
+<div class="chapter" id="f_002d_002dile1-f_002d_002dile">
+<div class="header">
 <p>
 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>
-<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 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>
 
+</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 f09ed42191..d781b35e38 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="gH-3rd"></span><div class="header">
+<div class="chapter" id="gH-3rd">
+<div class="header">
 <p>
 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>
-<span id="gH-3rd-1"></span><h2 class="chapter">26 <sub>g</sub>H 3<sup>rd</sup></h2>
+<div class="node" id="gH-3rd-1">
+<h2 class="chapter">26 <sub>g</sub>H 3<sup>rd</sup></h2>
 
+</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 d3ff34bf9d..a14b1cdf75 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
@@ -36,12 +36,14 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls"></span><div class="header">
+<div class="chapter" id="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls">
+<div class="header">
 <p>
 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>
-<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>
+<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>
 
 <p><a href="-_007b-_007d.html"> { }</a>
 </p>
@@ -97,6 +99,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>
 
 
 
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 3e60ce40d5..9bb71cfdf0 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_0131-_1e14-_1e08"></span><div class="header">
+<div class="chapter" id="g_t_0131-_1e14-_1e08">
+<div class="header">
 <p>
 Next: <a href="_201c-_201d-_2018-_2019-_201e-_201a.html" accesskey="n" rel="next">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Previous: <a href="e-e-e-e-e-j-ee.html" accesskey="p" rel="prev">&#279; &#277; e_ &#7865; &#283; j ee[</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<span id="i-E-C"></span><h2 class="chapter">12 i &#274;` &#262;,</h2>
+<div class="node" id="i-E-C">
+<h2 class="chapter">12 i &#274;` &#262;,</h2>
 
+</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 0ff52c37eb..82ab02ad74 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
@@ -36,12 +36,14 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="-_007b-_007d.html" accesskey="n" rel="next"> { }</a> &nbsp; </p>
 </div>
 <hr>
-<span id="Top-1"></span><h1 class="top">Top</h1>
+<div class="node" id="Top-1">
+<h1 class="top">Top</h1>
 
 
 <ul class="section-toc">
@@ -73,11 +75,12 @@ 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>
-<hr>
+</div><hr>
 <div class="header">
 <p>
 Next: <a href="-_007b-_007d.html" accesskey="n" rel="next"> { }</a> &nbsp; </p>
 </div>
+</div>
 
 
 
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 92b9cb88a4..0c8f97c9fe 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="indicateurl"></span><div class="header">
+<div class="chapter" id="indicateurl">
+<div class="header">
 <p>
 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>
-<span id="indicateurl-1"></span><h2 class="chapter">25 &lsquo;<code>indicateurl</code>&rsquo;</h2>
+<div class="node" id="indicateurl-1">
+<h2 class="chapter">25 &lsquo;<code>indicateurl</code>&rsquo;</h2>
 
+</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 65de565702..33523b453a 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="sansserif-slanted"></span><div class="header">
+<div class="chapter" id="sansserif-slanted">
+<div class="header">
 <p>
 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>
-<span id="sansserif-slanted-1"></span><h2 class="chapter">24 <span class="sansserif">sansserif</span> <i>slanted</i></h2>
+<div class="node" id="sansserif-slanted-1">
+<h2 class="chapter">24 <span class="sansserif">sansserif</span> <i>slanted</i></h2>
 
+</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 47ff328d4b..832873b423 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="someone_0040somewher-no_005fexplain_0040there"></span><div class="header">
+<div class="chapter" id="someone_0040somewher-no_005fexplain_0040there">
+<div class="header">
 <p>
 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>
-<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 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>
 
+</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 e16c2fa64c..67ce180fec 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
@@ -40,13 +40,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="----_0021---_002e--_002e-_003f-_0040"></span><div class="header">
+<div class="chapter" id="----_0021---_002e--_002e-_003f-_0040">
+<div class="header">
 <p>
 Next: <a href="_0040-_007b-_007d-_005c-_0023.html" accesskey="n" rel="next">@ { } \ #</a>, Previous: <a href="-_007b-_007d.html" accesskey="p" rel="prev"> { }</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<span id="----_0021---_002e--_002e-_003f-_0040-1"></span><h2 class="chapter">2 &nbsp; &nbsp; ! <br> .  . ? @</h2>
+<div class="node" id="----_0021---_002e--_002e-_003f-_0040-1">
+<h2 class="chapter">2 &nbsp; &nbsp; ! <br> .  . ? @</h2>
 
+</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 9ac203e971..bfb3462bc0 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="-_0040-_007b_007d-_002e-"></span><div class="header">
+<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.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> &nbsp; </p>
 </div>
 <hr>
-<span id="-_0040-_007b_007d-_002e--1"></span><h2 class="chapter">20 <tt> @ {} . </tt></h2>
+<div class="node" id="-_0040-_007b_007d-_002e--1">
+<h2 class="chapter">20 <tt> @ {} . </tt></h2>
 
+</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 bda8ce2b44..584592dd6f 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
@@ -38,13 +38,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="-_007b-_007d"></span><div class="header">
+<div class="chapter" id="-_007b-_007d">
+<div class="header">
 <p>
 Next: <a href="----_0021---_002e--_002e-_003f-_0040.html" accesskey="n" rel="next">&nbsp; &nbsp; ! <br> .  . ? @</a>, Previous: <a href="index.html" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<span id="-_007b-_007d-1"></span><h2 class="chapter">1  { }</h2>
+<div class="node" id="-_007b-_007d-1">
+<h2 class="chapter">1  { }</h2>
 
+</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 d71ed9dee3..db7e9000a1 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t8_002e27in"></span><div class="header">
+<div class="chapter" id="g_t8_002e27in">
+<div class="header">
 <p>
 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>
-<span id="g_t8_002e27in-1"></span><h2 class="chapter">23 8.27in</h2>
+<div class="node" id="g_t8_002e27in-1">
+<h2 class="chapter">23 8.27in</h2>
 
+</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 2f2dfdcca4..1fcc33c6d2 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe"></span><div class="header">
+<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="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>
-<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 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>
 
+</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 1c00462a75..d6cc6e1132 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="AAA-AAA-BBB"></span><div class="header">
+<div class="chapter" id="AAA-AAA-BBB">
+<div class="header">
 <p>
 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>
-<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 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>
 
+</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 bf9cb7869f..4325eb49e9 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="CCC-CCC-DDD"></span><div class="header">
+<div class="chapter" id="CCC-CCC-DDD">
+<div class="header">
 <p>
 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>
-<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 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>
 
+</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 c1a52f4c1d..46341ab23d 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e"></span><div class="header">
+<div class="chapter" id="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e">
+<div class="header">
 <p>
 Next: <a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" accesskey="n" rel="next">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>, Previous: <a href="_0040-_007b-_007d-_005c-_0023.html" accesskey="p" rel="prev">@ { } \ #</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<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 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>
 
+</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 fddecf9c89..cdc353719c 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
@@ -38,13 +38,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_0040-_007b-_007d-_005c-_0023"></span><div class="header">
+<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.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>
-<span id="g_t_0040-_007b-_007d-_005c-_0023-1"></span><h2 class="chapter">3 @ { } \ #</h2>
+<div class="node" id="g_t_0040-_007b-_007d-_005c-_0023-1">
+<h2 class="chapter">3 @ { } \ #</h2>
 
+</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 7d6a6a2a65..f5bd543100 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027"></span><div class="header">
+<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.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>
-<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 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>
 
+</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 ac7370b056..4ecca4202b 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae"></span><div class="header">
+<div class="chapter" id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae">
+<div class="header">
 <p>
 Next: <a href="_21d2-_00b0-a-b--aa.html" accesskey="n" rel="next">&rArr; &deg; a&nbsp;b a sunny day &aring;</a>, Previous: <a href="_2265-_2264-_2192.html" accesskey="p" rel="prev">&ge; &le; &rarr;</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<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 class="node" id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae-1">
+<h2 class="chapter">7 &ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</h2>
 
+</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 bed5644c05..77f0f332e5 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a"></span><div class="header">
+<div class="chapter" id="g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a">
+<div class="header">
 <p>
 Next: <a href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html" accesskey="n" rel="next">&ldquo; &rdquo; &mdash; &ndash; &lsquo; &rsquo;</a>, Previous: <a href="_201c-_201d-_2018-_2019-_201e-_201a.html" accesskey="p" rel="prev">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<span id="g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a-1"></span><h2 class="chapter">14 &laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</h2>
+<div class="node" id="g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a-1">
+<h2 class="chapter">14 &laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</h2>
 
+</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 d37aa9396b..d334d9fec9 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_201c-_201d-_2018-_2019-_201e-_201a"></span><div class="header">
+<div class="chapter" id="g_t_201c-_201d-_2018-_2019-_201e-_201a">
+<div class="header">
 <p>
 Next: <a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html" accesskey="n" rel="next">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>, Previous: <a href="i-E-C.html" accesskey="p" rel="prev">i &#274;` &#262;,</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<span id="g_t_201c-_201d-_2018-_2019-_201e-_201a-1"></span><h2 class="chapter">13 &ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</h2>
+<div class="node" id="g_t_201c-_201d-_2018-_2019-_201e-_201a-1">
+<h2 class="chapter">13 &ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</h2>
 
+</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 d649627738..b5bde1d5e5 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_21d2-_00b0-a-b--_00e5"></span><div class="header">
+<div class="chapter" id="g_t_21d2-_00b0-a-b--_00e5">
+<div class="header">
 <p>
 Next: <a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" accesskey="n" rel="next">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Previous: <a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" accesskey="p" rel="prev">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<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 class="node" id="g_t_21d2-_00b0-a-b--aa">
+<h2 class="chapter">8 &rArr; &deg; a&nbsp;b a sunny day &aring;</h2>
 
+</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 6716cc31b7..ba6b4f50bd 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212"></span><div class="header">
+<div class="chapter" id="g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212">
+<div class="header">
 <p>
 Next: <a href="_2265-_2264-_2192.html" accesskey="n" rel="next">&ge; &le; &rarr;</a>, Previous: <a href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html" accesskey="p" rel="prev">LaTeX TeX &bull; , &copy; &hellip; <small class="enddots">...</small></a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<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 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>
 
+</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 7a71c09e50..f87374f67c 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_2265-_2264-_2192"></span><div class="header">
+<div class="chapter" id="g_t_2265-_2264-_2192">
+<div class="header">
 <p>
 Next: <a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" accesskey="n" rel="next">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>, Previous: <a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" accesskey="p" rel="prev">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<span id="g_t_2265-_2264-_2192-1"></span><h2 class="chapter">6 &ge; &le; &rarr;</h2>
+<div class="node" id="g_t_2265-_2264-_2192-1">
+<h2 class="chapter">6 &ge; &le; &rarr;</h2>
 
+</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 aa82c1de06..c2a4d9cea8 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119"></span><div class="header">
+<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="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>
-<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 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>
 
+</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 f2179a7a44..caf5960a11 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"></span><div class="header">
+<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.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>
-<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 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>
 
+</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 1fbdbb7ee4..352f6a83b8 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361"></span><div class="header">
+<div class="chapter" id="g_t_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361">
+<div class="header">
 <p>
 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>
-<span id="e-e-e-e-e-j-ee"></span><h2 class="chapter">11 &#279; &#277; e_ &#7865; &#283; j ee[</h2>
+<div class="node" id="e-e-e-e-e-j-ee">
+<h2 class="chapter">11 &#279; &#277; e_ &#7865; &#283; j ee[</h2>
 
+</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 0808c2c5fc..9ce72232cf 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="env-code-option-samp-command-file-C_002dx-ESC"></span><div class="header">
+<div class="chapter" id="env-code-option-samp-command-file-C_002dx-ESC">
+<div class="header">
 <p>
 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>
-<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 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>
 
+</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 5ad577e03d..dd800cc9b4 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="f_002d_002dile1-f_002d_002dile"></span><div class="header">
+<div class="chapter" id="f_002d_002dile1-f_002d_002dile">
+<div class="header">
 <p>
 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>
-<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 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>
 
+</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 3ca8a125c2..b27538464a 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="gH-3rd"></span><div class="header">
+<div class="chapter" id="gH-3rd">
+<div class="header">
 <p>
 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>
-<span id="gH-3rd-1"></span><h2 class="chapter">26 <sub>g</sub>H 3<sup>rd</sup></h2>
+<div class="node" id="gH-3rd-1">
+<h2 class="chapter">26 <sub>g</sub>H 3<sup>rd</sup></h2>
 
+</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 d6aaa7a5bc..7377a114e1 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
@@ -36,12 +36,14 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls"></span><div class="header">
+<div class="chapter" id="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls">
+<div class="header">
 <p>
 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>
-<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>
+<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>
 
 <p><a href="-_007b-_007d.html"> { }</a>
 </p>
@@ -97,6 +99,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>
 
 
 
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 90f1ffff3e..daf98daa8e 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_0131-_1e14-_1e08"></span><div class="header">
+<div class="chapter" id="g_t_0131-_1e14-_1e08">
+<div class="header">
 <p>
 Next: <a href="_201c-_201d-_2018-_2019-_201e-_201a.html" accesskey="n" rel="next">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Previous: <a href="e-e-e-e-e-j-ee.html" accesskey="p" rel="prev">&#279; &#277; e_ &#7865; &#283; j ee[</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
-<span id="i-E-C"></span><h2 class="chapter">12 i &#274;` &#262;,</h2>
+<div class="node" id="i-E-C">
+<h2 class="chapter">12 i &#274;` &#262;,</h2>
 
+</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 61197ae067..44685a90a2 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
@@ -36,12 +36,14 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="-_007b-_007d.html" accesskey="n" rel="next"> { }</a> &nbsp; </p>
 </div>
 <hr>
-<span id="Top-1"></span><h1 class="top">Top</h1>
+<div class="node" id="Top-1">
+<h1 class="top">Top</h1>
 
 
 <ul class="section-toc">
@@ -73,11 +75,12 @@ 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>
-<hr>
+</div><hr>
 <div class="header">
 <p>
 Next: <a href="-_007b-_007d.html" accesskey="n" rel="next"> { }</a> &nbsp; </p>
 </div>
+</div>
 
 
 
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 3f044ceb5b..0427fb5bbd 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="indicateurl"></span><div class="header">
+<div class="chapter" id="indicateurl">
+<div class="header">
 <p>
 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>
-<span id="indicateurl-1"></span><h2 class="chapter">25 &lsquo;<code>indicateurl</code>&rsquo;</h2>
+<div class="node" id="indicateurl-1">
+<h2 class="chapter">25 &lsquo;<code>indicateurl</code>&rsquo;</h2>
 
+</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 23c6e0faf1..68f4a852b7 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="sansserif-slanted"></span><div class="header">
+<div class="chapter" id="sansserif-slanted">
+<div class="header">
 <p>
 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>
-<span id="sansserif-slanted-1"></span><h2 class="chapter">24 <span class="sansserif">sansserif</span> <i>slanted</i></h2>
+<div class="node" id="sansserif-slanted-1">
+<h2 class="chapter">24 <span class="sansserif">sansserif</span> <i>slanted</i></h2>
 
+</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 33cb664504..b6468d5181 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="someone_0040somewher-no_005fexplain_0040there"></span><div class="header">
+<div class="chapter" id="someone_0040somewher-no_005fexplain_0040there">
+<div class="header">
 <p>
 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>
-<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 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>
 
+</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 d29f10f41d..0bdccc8156 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
@@ -38,13 +38,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db"></span><div class="header">
+<div class="chapter" id="g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db">
+<div class="header">
 <p>
 Next: <a href="c.html" accesskey="n" rel="next">�</a>, Previous: <a href="a-e-u.html" accesskey="p" rel="prev">� � �</a>, Up: <a href="index.html" accesskey="u" rel="up">top</a> &nbsp; [<a href="index.html" title="Index" rel="index">Index</a>]</p>
 </div>
 <hr>
-<span id="a-e-i-o-u-A-E-I-O-U"></span><h2 class="chapter">4 � � � � � � � � � �</h2>
+<div class="node" id="a-e-i-o-u-A-E-I-O-U">
+<h2 class="chapter">4 � � � � � � � � � �</h2>
 
+</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 f1d81eaf40..51c5121c3d 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
@@ -38,13 +38,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc"></span><div class="header">
+<div class="chapter" id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc">
+<div class="header">
 <p>
 Next: <a href="e.html" accesskey="n" rel="next">�</a>, Previous: <a href="index.html" accesskey="p" rel="prev">top</a>, Up: <a href="index.html" accesskey="u" rel="up">top</a> &nbsp; [<a href="index.html" title="Index" rel="index">Index</a>]</p>
 </div>
 <hr>
-<span id="a-e-i-o-u-y-A-E-I-O-U"></span><h2 class="chapter">1 � � � � � � � � � � �</h2>
+<div class="node" id="a-e-i-o-u-y-A-E-I-O-U">
+<h2 class="chapter">1 � � � � � � � � � � �</h2>
 
+</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 3eaa300caf..d22c8f56f9 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
@@ -38,13 +38,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_00e0-_00e8-_00f9"></span><div class="header">
+<div class="chapter" id="g_t_00e0-_00e8-_00f9">
+<div class="header">
 <p>
 Next: <a href="a-e-i-o-u-A-E-I-O-U.html" accesskey="n" rel="next">� � � � � � � � � �</a>, Previous: <a href="e.html" accesskey="p" rel="prev">�</a>, Up: <a href="index.html" accesskey="u" rel="up">top</a> &nbsp; [<a href="index.html" title="Index" rel="index">Index</a>]</p>
 </div>
 <hr>
-<span id="a-e-u"></span><h2 class="chapter">3 � � �</h2>
+<div class="node" id="a-e-u">
+<h2 class="chapter">3 � � �</h2>
 
+</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 fee6f9236a..a6173e5a97 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
@@ -37,12 +37,14 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_00e7"></span><div class="header">
+<div class="chapter" id="g_t_00e7">
+<div class="header">
 <p>
 Previous: <a href="a-e-i-o-u-A-E-I-O-U.html" accesskey="p" rel="prev">� � � � � � � � � �</a>, Up: <a href="index.html" accesskey="u" rel="up">top</a> &nbsp; [<a href="index.html" title="Index" rel="index">Index</a>]</p>
 </div>
 <hr>
-<span id="c"></span><h2 class="chapter">5 �</h2>
+<div class="node" id="c">
+<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>
@@ -57,6 +59,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>
 
 
 
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 5ada2e7f88..5d8ef33dd4 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
@@ -38,13 +38,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_00e9"></span><div class="header">
+<div class="chapter" id="g_t_00e9">
+<div class="header">
 <p>
 Next: <a href="a-e-u.html" accesskey="n" rel="next">� � �</a>, Previous: <a href="a-e-i-o-u-y-A-E-I-O-U.html" accesskey="p" rel="prev">� � � � � � � � � � �</a>, Up: <a href="index.html" accesskey="u" rel="up">top</a> &nbsp; [<a href="index.html" title="Index" rel="index">Index</a>]</p>
 </div>
 <hr>
-<span id="e"></span><h2 class="chapter">2 �</h2>
+<div class="node" id="e">
+<h2 class="chapter">2 �</h2>
 
+</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 7b6c0ccc43..f17d9f524a 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
@@ -38,12 +38,14 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<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>
 </div>
 <hr>
-<span id="top"></span><h1 class="top">top</h1>
+<div class="node" id="top">
+<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; 
@@ -96,11 +98,12 @@ 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>
-<hr>
+</div><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>
 </div>
+</div>
 
 
 
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 572ef5127b..c1ad041854 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
@@ -38,13 +38,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db"></span><div class="header">
+<div class="chapter" id="g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db">
+<div class="header">
 <p>
 Next: <a href="c.html" accesskey="n" rel="next">ç</a>, Previous: <a href="a-e-u.html" accesskey="p" rel="prev">à è ù</a>, Up: <a href="index.html" accesskey="u" rel="up">top</a> &nbsp; [<a href="index.html" title="Index" rel="index">Index</a>]</p>
 </div>
 <hr>
-<span id="a-e-i-o-u-A-E-I-O-U"></span><h2 class="chapter">4 â ê î ô û Â Ê Î Ô Û</h2>
+<div class="node" id="a-e-i-o-u-A-E-I-O-U">
+<h2 class="chapter">4 â ê î ô û Â Ê Î Ô Û</h2>
 
+</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 3a5d24b7cb..66ecca63fa 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
@@ -38,13 +38,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc"></span><div class="header">
+<div class="chapter" id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc">
+<div class="header">
 <p>
 Next: <a href="e.html" accesskey="n" rel="next">é</a>, Previous: <a href="index.html" accesskey="p" rel="prev">top</a>, Up: <a href="index.html" accesskey="u" rel="up">top</a> &nbsp; [<a href="index.html" title="Index" rel="index">Index</a>]</p>
 </div>
 <hr>
-<span id="a-e-i-o-u-y-A-E-I-O-U"></span><h2 class="chapter">1 ä ë ï ö ü ÿ Ä Ë Ï Ö Ü</h2>
+<div class="node" id="a-e-i-o-u-y-A-E-I-O-U">
+<h2 class="chapter">1 ä ë ï ö ü ÿ Ä Ë Ï Ö Ü</h2>
 
+</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 14c18c488f..36241881ca 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
@@ -38,13 +38,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_00e0-_00e8-_00f9"></span><div class="header">
+<div class="chapter" id="g_t_00e0-_00e8-_00f9">
+<div class="header">
 <p>
 Next: <a href="a-e-i-o-u-A-E-I-O-U.html" accesskey="n" rel="next">â ê î ô û Â Ê Î Ô Û</a>, Previous: <a href="e.html" accesskey="p" rel="prev">é</a>, Up: <a href="index.html" accesskey="u" rel="up">top</a> &nbsp; [<a href="index.html" title="Index" rel="index">Index</a>]</p>
 </div>
 <hr>
-<span id="a-e-u"></span><h2 class="chapter">3 à è ù</h2>
+<div class="node" id="a-e-u">
+<h2 class="chapter">3 à è ù</h2>
 
+</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 1215234ef0..8608a4ed6a 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
@@ -37,12 +37,14 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_00e7"></span><div class="header">
+<div class="chapter" id="g_t_00e7">
+<div class="header">
 <p>
 Previous: <a href="a-e-i-o-u-A-E-I-O-U.html" accesskey="p" rel="prev">â ê î ô û Â Ê Î Ô Û</a>, Up: <a href="index.html" accesskey="u" rel="up">top</a> &nbsp; [<a href="index.html" title="Index" rel="index">Index</a>]</p>
 </div>
 <hr>
-<span id="c"></span><h2 class="chapter">5 ç</h2>
+<div class="node" id="c">
+<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>
@@ -57,6 +59,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>
 
 
 
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 4e83e2e481..567f683871 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
@@ -38,13 +38,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_00e9"></span><div class="header">
+<div class="chapter" id="g_t_00e9">
+<div class="header">
 <p>
 Next: <a href="a-e-u.html" accesskey="n" rel="next">à è ù</a>, Previous: <a href="a-e-i-o-u-y-A-E-I-O-U.html" accesskey="p" rel="prev">ä ë ï ö ü ÿ Ä Ë Ï Ö Ü</a>, Up: <a href="index.html" accesskey="u" rel="up">top</a> &nbsp; [<a href="index.html" title="Index" rel="index">Index</a>]</p>
 </div>
 <hr>
-<span id="e"></span><h2 class="chapter">2 é</h2>
+<div class="node" id="e">
+<h2 class="chapter">2 é</h2>
 
+</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 5aee523348..492517967b 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
@@ -38,12 +38,14 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<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>
 </div>
 <hr>
-<span id="top"></span><h1 class="top">top</h1>
+<div class="node" id="top">
+<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; 
@@ -96,11 +98,12 @@ 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>
-<hr>
+</div><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>
 </div>
+</div>
 
 
 
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 d75a909c17..3491511b8a 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
@@ -37,15 +37,18 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_0104-_0105-_02db-_0118-_0119"></span><div class="header">
+<div class="chapter" id="g_t_0104-_0105-_02db-_0118-_0119">
+<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" title="Index" rel="index">Index</a>]</p>
 </div>
 <hr>
-<span id="A-a-_002c-E-e"></span><h2 class="chapter">1 � � � � �</h2>
+<div class="node" id="A-a-_002c-E-e">
+<h2 class="chapter">1 � � � � �</h2>
 
 <span id="index-A-a-_002c-E-e"></span>
 
+</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 73badcfcd1..8b55cd68e2 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
@@ -38,12 +38,14 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<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>
 </div>
 <hr>
-<span id="top"></span><h1 class="top">top</h1>
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 <p><a href="A-a-_002c-E-e.html">� � � � �</a>.
 </p>
@@ -65,11 +67,12 @@ 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>
-<hr>
+</div><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>
 </div>
+</div>
 
 
 
diff --git a/tp/t/results/converters_tests/complex_nestings.pl b/tp/t/results/converters_tests/complex_nestings.pl
index ce77f6ff26..1e9a993488 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -1438,7 +1438,8 @@ $result_converted{'plaintext'}->{'complex_nestings'} = '     deffs
 ';
 
 
-$result_converted{'html_text'}->{'complex_nestings'} = '<span id="Top"></span><h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'complex_nestings'} = '<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
 <div class="example">
 <pre class="example">deffs
@@ -1472,7 +1473,7 @@ explanation
 <pre class="example">
 
 </pre></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 03b42910b3..d29a72b2a8 100644
--- a/tp/t/results/converters_tests/footnote_no_number.pl
+++ b/tp/t/results/converters_tests/footnote_no_number.pl
@@ -230,12 +230,13 @@ $result_converted{'plaintext'}->{'footnote_no_number'} = 'Para(*).
 ';
 
 
-$result_converted{'html_text'}->{'footnote_no_number'} = '<span id="Top"></span><h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'footnote_no_number'} = '<div class="node" id="Top">
+<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 class="footnote">
+</p></div><div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
@@ -244,7 +245,7 @@ $result_converted{'html_text'}->{'footnote_no_number'} = '<span id="Top"></span>
 <h5><a id="FOOT2" href="#DOCF2">(*)</a></h5>
 <p>Footnote 2.</p>
 </div>
-<hr>
+<hr></div>
 ';
 
 
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 3c66519a64..c5a138128a 100644
--- a/tp/t/results/converters_tests/footnote_no_number_separate.pl
+++ b/tp/t/results/converters_tests/footnote_no_number_separate.pl
@@ -228,12 +228,13 @@ $result_converted{'plaintext'}->{'footnote_no_number_separate'} = 'Para(*) (*not
 ';
 
 
-$result_converted{'html_text'}->{'footnote_no_number_separate'} = '<span id="Top"></span><h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'footnote_no_number_separate'} = '<div class="node" id="Top">
+<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 class="footnote">
+</p></div><div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
@@ -242,7 +243,7 @@ $result_converted{'html_text'}->{'footnote_no_number_separate'} = '<span id="Top
 <h5><a id="FOOT2" href="#DOCF2">(*)</a></h5>
 <p>Footnote 2.</p>
 </div>
-<hr>
+<hr></div>
 ';
 
 
diff --git a/tp/t/results/converters_tests/image_formatting.pl b/tp/t/results/converters_tests/image_formatting.pl
index 46ce8cd606..66ede27eb9 100644
--- a/tp/t/results/converters_tests/image_formatting.pl
+++ b/tp/t/results/converters_tests/image_formatting.pl
@@ -2574,7 +2574,8 @@ Image description""\\.
 ';
 
 
-$result_converted{'html_text'}->{'image_formatting'} = '<span id="Top"></span><h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'image_formatting'} = '<div class="node" id="Top">
+<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">
@@ -2602,7 +2603,7 @@ $result_converted{'html_text'}->{'image_formatting'} = '<span id="Top"></span><h
 
 <p>in para
 <img src="f--ile.png" alt="a very long alt argument that could span more than one line who knows">.
-</p><hr>
+</p></div><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 91492aa068..356370fcf0 100644
--- a/tp/t/results/converters_tests/index_entry_in_preformatted.pl
+++ b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
@@ -370,14 +370,15 @@ $result_converted{'plaintext'}->{'index_entry_in_preformatted'} = '     text
 ';
 
 
-$result_converted{'html_text'}->{'index_entry_in_preformatted'} = '<span id="Top"></span><h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'index_entry_in_preformatted'} = '<div class="node" id="Top">
+<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>
-<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 c06369e49b..6a1f8b8dd5 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
@@ -44,15 +44,18 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="ja">
-<span id="Introduction"></span><div class="header">
+<div class="chapter" id="Introduction">
+<div class="header">
 <p>
 Previous: <a href="Preface.html" accesskey="p" rel="prev">Preface</a>, Up: <a href="index.html" accesskey="u" rel="up">GNU LilyPond &mdash; �w�K�}�j���A��</a> &nbsp; </p>
 </div>
 <hr>
-<span id="Introduction-1"></span><h2 class="chapter">2 Introduction</h2>
+<div class="node" id="Introduction-1">
+<h2 class="chapter">2 Introduction</h2>
 
 <p>���̏͂ł͓ǎ҂� LilyPond �Ƃ��̃h�L�������g�ɂ‚��Ă̏Љ���s���܂��B
 </p>
+</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 9074b90d9b..58383e3614 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
@@ -45,16 +45,19 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="ja">
-<span id="Preface"></span><div class="header">
+<div class="chapter" id="Preface">
+<div class="header">
 <p>
 Next: <a href="Introduction.html" accesskey="n" rel="next">Introduction</a>, Previous: <a href="index.html" accesskey="p" rel="prev">GNU LilyPond &mdash; �w�K�}�j���A��</a>, Up: <a href="index.html" accesskey="u" rel="up">GNU LilyPond &mdash; �w�K�}�j���A��</a> &nbsp; </p>
 </div>
 <hr>
-<span id="Preface-1"></span><h2 class="chapter">1 Preface</h2>
+<div class="node" id="Preface-1">
+<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 �̌����̌�A�n��-�E�F���� 1996 �N�� LilyPond �̐�����J�n���܂����B���̎��A�W�����̓n��-�E�F���̐V�����v���W�F�N�g�Ɉ������荞�܂�܂����B
 </p>
 
+</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 5ecbc5820e..cffc4e4585 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
@@ -46,12 +46,14 @@ ul.no-bullet {list-style: none}
 <h1 class="settitle" align="center">GNU LilyPond &ndash; Manuel d&rsquo;initiation japanese</h1>
 
 
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="Preface.html" accesskey="n" rel="next">Preface</a> &nbsp; </p>
 </div>
 <hr>
-<span id="GNU-LilyPond-_002d_002d_002d-XueXimaniyuaru"></span><h1 class="top">GNU LilyPond &mdash; �w�K�}�j���A��</h1>
+<div class="node" id="GNU-LilyPond-_002d_002d_002d-XueXimaniyuaru">
+<h1 class="top">GNU LilyPond &mdash; �w�K�}�j���A��</h1>
 
 
 
@@ -62,11 +64,12 @@ 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>
-<hr>
+</div><hr>
 <div class="header">
 <p>
 Next: <a href="Preface.html" accesskey="n" rel="next">Preface</a> &nbsp; </p>
 </div>
+</div>
 
 
 
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 d46cd60b34..abb5c7c337 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,7 +769,8 @@ $result_converted{'plaintext'}->{'printindex_merged_indices_code_style'} = '* Me
 ';
 
 
-$result_converted{'html_text'}->{'printindex_merged_indices_code_style'} = '<span id="Top"></span><h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'printindex_merged_indices_code_style'} = '<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
 
 
@@ -822,7 +823,7 @@ $result_converted{'html_text'}->{'printindex_merged_indices_code_style'} = '<spa
 <a class="summary-letter" href="#t_h_fn_letter-V"><b>V</b></a>
  &nbsp; 
 </td></tr></table>
-<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 425166693a..8c35a647d8 100644
--- a/tp/t/results/converters_tests/ref_in_sectioning.pl
+++ b/tp/t/results/converters_tests/ref_in_sectioning.pl
@@ -2541,11 +2541,13 @@ for example *note node:: (*note node::) (*note (file)Top::)
 
 
 $result_converted{'html_text'}->{'ref_in_sectioning'} = '
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
-<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="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>
 
 
 <h2 class="contents-heading">Table of Contents</h2>
@@ -2572,19 +2574,24 @@ $result_converted{'html_text'}->{'ref_in_sectioning'} = '
 </ul>
 </div>
 
-<hr>
-<span id="node"></span><div class="header">
+</div><hr>
+<div class="chapter" id="node">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
-<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 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>
 
-<hr>
-<span id="chap"></span><div class="header">
+</div><hr>
+</div>
+<div class="chapter" id="chap">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
-<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>
+<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>
 
 <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>
@@ -2600,31 +2607,43 @@ $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>
-<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-node_002c-crossref-arg2">
+<h3 class="section">2.1 <a href="#node">cross ref name</a>  node, crossref arg2</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-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-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-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-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="node-node-and-manual">
+<h3 class="section">2.4 &lsquo;node&rsquo; in <cite>Manual</cite> node 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="Top-Top-and-manual">
+<h3 class="section">2.5 <cite>Manual</cite> Top and 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="Manual-no-node-just-manual">
+<h3 class="section">2.6 <cite>Manual</cite> no node just manual</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="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="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="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="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_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_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="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="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="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="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><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>
 
-<hr>
+</div><hr>
 ';
 
 
diff --git a/tp/t/results/converters_tests/refs_formatting.pl b/tp/t/results/converters_tests/refs_formatting.pl
index 114256d344..0cfaefb879 100644
--- a/tp/t/results/converters_tests/refs_formatting.pl
+++ b/tp/t/results/converters_tests/refs_formatting.pl
@@ -4464,7 +4464,9 @@ title: (file name)(pman)anode. \'@ref{(pman)anode,,,file name,manual}\'
 ';
 
 
-$result_converted{'html_text'}->{'refs_formatting'} = '<span id="chapter"></span><span id="chapter-1"></span><h2 class="chapter">1 chapter</h2>
+$result_converted{'html_text'}->{'refs_formatting'} = '<div class="chapter" id="chapter">
+<div class="node" id="chapter-1">
+<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>
@@ -4500,7 +4502,7 @@ $result_converted{'html_text'}->{'refs_formatting'} = '<span id="chapter"></span
 <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><hr>
+</p></div><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 3a3a430f6c..e3f592d3fc 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
@@ -43,12 +43,14 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_7b2c_4e00_7ae0_ff08First-Chapter_ff09"></span><div class="header">
+<div class="chapter" id="g_t_7b2c_4e00_7ae0_ff08First-Chapter_ff09">
+<div class="header">
 <p>
 Next: <a href="Second-Chapter-AE-AE-ae-ae.html" accesskey="n" rel="next">Chapter 2 AE ĄĘ ae ąę</a>, Previous: <a href="index.html" accesskey="p" rel="prev">Texinfo中文示例</a>, Up: <a href="index.html" accesskey="u" rel="up">Texinfo中文示例</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index-node.html" title="Index" rel="index">Index</a>]</p>
 </div>
 <hr>
-<span id="DiYiZhang_0028First-Chapter_0029"></span><h2 class="chapter">1 第一章（First Chapter）</h2>
+<div class="node" id="DiYiZhang_0028First-Chapter_0029">
+<h2 class="chapter">1 第一章（First Chapter）</h2>
 
 <span id="index-chapter_002c-first"></span>
 
@@ -67,6 +69,7 @@ This is the first item.
 This is the second item.
 </li></ol>
 
+</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 14fd7035a2..0dab147ff5 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
@@ -42,12 +42,14 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Index-node"></span><div class="header">
+<div class="unnumbered" id="Index-node">
+<div class="header">
 <p>
 Previous: <a href="Second-Chapter-AE-AE-ae-ae.html" accesskey="p" rel="prev">Chapter 2 AE ĄĘ ae ąę</a>, Up: <a href="index.html" accesskey="u" rel="up">Texinfo中文示例</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Index-node" title="Index" rel="index">Index</a>]</p>
 </div>
 <hr>
-<span id="Index"></span><h2 class="unnumbered">Index</h2>
+<div class="node" id="Index">
+<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; 
@@ -84,6 +86,7 @@ Previous: <a href="Second-Chapter-AE-AE-ae-ae.html" accesskey="p" rel="prev">Cha
  &nbsp; 
 </td></tr></table>
 
+</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 9a5c54606d..f69bcdb6d8 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
@@ -43,15 +43,18 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Second-Chapter-AE-_0104_0118-ae-_0105_0119"></span><div class="header">
+<div class="chapter" id="Second-Chapter-AE-_0104_0118-ae-_0105_0119">
+<div class="header">
 <p>
 Next: <a href="Index-node.html" accesskey="n" rel="next">Index</a>, Previous: <a href="DiYiZhang_0028First-Chapter_0029.html" accesskey="p" rel="prev">第一章（First Chapter）</a>, Up: <a href="index.html" accesskey="u" rel="up">Texinfo中文示例</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index-node.html" title="Index" rel="index">Index</a>]</p>
 </div>
 <hr>
-<span id="Chapter-2-AE-AE-ae-ae"></span><h2 class="chapter">2 Chapter 2 AE ĄĘ ae ąę</h2>
+<div class="node" id="Chapter-2-AE-AE-ae-ae">
+<h2 class="chapter">2 Chapter 2 AE ĄĘ ae ąę</h2>
 
 <p>Zażółć gęślą jaźń!
 </p>
+</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 a478f624f4..09be89c8b4 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
@@ -46,12 +46,14 @@ ul.no-bullet {list-style: none}
 
 
 
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<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>
 </div>
 <hr>
-<span id="TexinfoZhongWenShiLi"></span><h1 class="top">Texinfo中文示例</h1>
+<div class="node" id="TexinfoZhongWenShiLi">
+<h1 class="top">Texinfo中文示例</h1>
 
 <p>This is a short example of a complete Texinfo file.
 </p>
@@ -72,11 +74,12 @@ Texinfo中文示例
 </ul>
 </div>
 
-<hr>
+</div><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>
 </div>
+</div>
 
 
 
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 ae8617efc0..76194a4bf4 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
@@ -1827,25 +1827,29 @@ see *note (manual)a *strong* ref with SC, a i trema ï, a dotless i trema
 
 
 $result_converted{'html_text'}->{'some_at_commands_in_ref_nodes'} = '
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
-<span id="Top-1"></span><h1 class="top">Top</h1>
+<div class="node" id="Top-1">
+<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>
-<hr>
-<span id="A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1"></span><div class="header">
+</div><hr>
+<div class="chapter" id="A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
-<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>
+<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>
 
 <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><hr>
+</p></div><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 ac76712aac..3f75832dd3 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,26 +959,30 @@ $result_converted{'plaintext'}->{'spaces_in_empty_node_names'} = '*note   ::
 ';
 
 
-$result_converted{'html_text'}->{'spaces_in_empty_node_names'} = '<span id="Top"></span><div class="header">
+$result_converted{'html_text'}->{'spaces_in_empty_node_names'} = '<div class="node" id="Top">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
 <h1 class="node-heading">Top</h1>
 
 
-<hr>
+</div><hr>
+<div class="node">
 <div class="header">
 <p>
  &nbsp; </p>
 </div>
 
-<hr>
+</div><hr>
+<div class="node">
 <div class="header">
 <p>
  &nbsp; </p>
 </div>
 
-<hr>
+</div><hr>
+<div class="node">
 <div class="header">
 <p>
  &nbsp; </p>
@@ -989,7 +993,7 @@ $result_converted{'html_text'}->{'spaces_in_empty_node_names'} = '<span id="Top"
 <p>&lsquo;<tt>  </tt>&rsquo;
 </p>
 <p>&lsquo;&nbsp;&nbsp;<!-- /@w -->&rsquo;
-</p><hr>
+</p></div><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 ab4b518777..d6a7063cd2 100644
--- a/tp/t/results/converters_tests/spaces_in_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_node_names.pl
@@ -1054,29 +1054,33 @@ $result_converted{'plaintext'}->{'spaces_in_node_names'} = '*note a  ::
 ';
 
 
-$result_converted{'html_text'}->{'spaces_in_node_names'} = '<span id="Top"></span><div class="header">
+$result_converted{'html_text'}->{'spaces_in_node_names'} = '<div class="node" id="Top">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
 <h1 class="node-heading">Top</h1>
 
 
-<hr>
-<span id="a--"></span><div class="header">
+</div><hr>
+<div class="node" id="a--">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
 <h4 class="node-heading">a&nbsp;&nbsp;</h4>
 
-<hr>
-<span id="b-"></span><div class="header">
+</div><hr>
+<div class="node" id="b-">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
 <h4 class="node-heading">b<tt>  </tt></h4>
 
-<hr>
-<span id="c-"></span><div class="header">
+</div><hr>
+<div class="node" id="c-">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
@@ -1087,7 +1091,7 @@ $result_converted{'html_text'}->{'spaces_in_node_names'} = '<span id="Top"></spa
 <p><a href="#b-">b<tt>  </tt></a>
 </p>
 <p><a href="#c-">c&nbsp;&nbsp;<!-- /@w --></a>
-</p><hr>
+</p></div><hr>
 ';
 
 
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 33fcd464fe..0294326edd 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -960,7 +960,8 @@ $result_converted{'plaintext'}->{'test_deftypefnnewline'} = ' -- Function:
 
 $result_converted{'html_text'}->{'test_deftypefnnewline'} = '
 
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<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
@@ -981,7 +982,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>
-<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 5483f1b547..8eb5f76c89 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -1526,7 +1526,9 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><span id="top-section"></span><h1 class="top">top section</h1>
+<div class="top" id="Top">
+<div class="node" id="top-section">
+<h1 class="top">top section</h1>
 
 <p>Ref to anchor
 <a href="#An-anchor">An anchor</a>
@@ -1534,7 +1536,8 @@ ul.no-bullet {list-style: none}
 <p>Ref to footnote anchor
 <a href="#Anchor-in-footnote">Anchor in footnote</a>
 </p>
-<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 9f4495c081..1c5f1e3199 100644
--- a/tp/t/results/converters_tests/top_in_ref.pl
+++ b/tp/t/results/converters_tests/top_in_ref.pl
@@ -4392,7 +4392,8 @@ name)Top::
 ';
 
 
-$result_converted{'html_text'}->{'top_in_ref'} = '<span id="Top"></span><h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'top_in_ref'} = '<div class="node" id="Top">
+<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>
@@ -4428,7 +4429,7 @@ $result_converted{'html_text'}->{'top_in_ref'} = '<span id="Top"></span><h1 clas
 <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><hr>
+</p></div><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 0e904974c0..a9e9556b54 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,7 +4354,8 @@ $result_floats{'top_in_ref_keep_top'} = {};
 
 
 
-$result_converted{'html_text'}->{'top_in_ref_keep_top'} = '<span id="Top"></span><h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'top_in_ref_keep_top'} = '<div class="node" id="Top">
+<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>
@@ -4390,7 +4391,7 @@ $result_converted{'html_text'}->{'top_in_ref_keep_top'} = '<span id="Top"></span
 <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><hr>
+</p></div><hr></div>
 ';
 
 1;
diff --git a/tp/t/results/converters_tests/weird_accents.pl b/tp/t/results/converters_tests/weird_accents.pl
index 773346c42c..0099fcdc33 100644
--- a/tp/t/results/converters_tests/weird_accents.pl
+++ b/tp/t/results/converters_tests/weird_accents.pl
@@ -644,7 +644,9 @@ i~=
 
 
 $result_converted{'html_text'}->{'weird_accents'} = '
-<span id="Top"></span><span id="top"></span><h1 class="top">top</h1>
+<div class="top" id="Top">
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 <p>&#297;=
 </p>
@@ -655,7 +657,7 @@ $result_converted{'html_text'}->{'weird_accents'} = '
 <p>.r`^
 </p>
 <p>r`\'=
-</p><hr>
+</p></div><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 0256aecfb5..70984dc728 100644
--- a/tp/t/results/converters_tests/weird_accents_disable_encoding.pl
+++ b/tp/t/results/converters_tests/weird_accents_disable_encoding.pl
@@ -644,7 +644,9 @@ i~=
 
 
 $result_converted{'html_text'}->{'weird_accents_disable_encoding'} = '
-<span id="Top"></span><span id="top"></span><h1 class="top">top</h1>
+<div class="top" id="Top">
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 <p>&#297;=
 </p>
@@ -655,7 +657,7 @@ $result_converted{'html_text'}->{'weird_accents_disable_encoding'} = '
 <p>.r`^
 </p>
 <p>r`\'=
-</p><hr>
+</p></div><hr></div>
 ';
 
 
diff --git a/tp/t/results/coverage/commands.pl b/tp/t/results/coverage/commands.pl
index 94b926dfb1..ade609b98e 100644
--- a/tp/t/results/coverage/commands.pl
+++ b/tp/t/results/coverage/commands.pl
@@ -568,8 +568,9 @@ File &rarr; Open.
 </p>
 <span id="index-index-entry-_0060_0060in-text_0027_0027-LaTeX"></span>
 
-<span id="majorheading-in-b"></span><h2 class="majorheading">majorheading <b>in b</b></h2>
-';
+<div class="majorheading" id="majorheading-in-b">
+<h2 class="majorheading">majorheading <b>in b</b></h2>
+</div>';
 
 
 $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 1467e1ed5b..b26728f7c0 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -1203,7 +1203,9 @@ top! After punc
 
 
 $result_converted{'html_text'}->{'punctuation_in_line_commands'} = '
-<span id="node_0021-After-punc"></span><span id="top_0021-After-punc"></span><h1 class="top">top! After punc</h1>
+<div class="top" id="node_0021-After-punc">
+<div class="node" id="top_0021-After-punc">
+<h1 class="top">top! After punc</h1>
 
 <dl compact="compact">
 <dt><span>item! After punc</span></dt>
@@ -1229,8 +1231,9 @@ $result_converted{'html_text'}->{'punctuation_in_line_commands'} = '
 
 <span id="index-index_0021-After-punc"></span>
 
-<span id="heading_0021-After-punc"></span><h3 class="heading">heading! After punc</h3>
-
+<div class="heading" id="heading_0021-After-punc">
+<h3 class="heading">heading! After punc</h3>
+</div>
 <h1 class="titlefont">titlefont! After punc</h1>
 
 <div align="center">center! After punc
@@ -1250,7 +1253,7 @@ $result_converted{'html_text'}->{'punctuation_in_line_commands'} = '
 </td></tr></table>
 
 
-<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 6f19c03af8..3f6e59f785 100644
--- a/tp/t/results/coverage_braces/footnote_no_node.pl
+++ b/tp/t/results/coverage_braces/footnote_no_node.pl
@@ -154,17 +154,18 @@ F(1).
 ';
 
 
-$result_converted{'html_text'}->{'footnote_no_node'} = '<span id="top"></span><h1 class="top">top</h1>
+$result_converted{'html_text'}->{'footnote_no_node'} = '<div class="top" id="top">
+<h1 class="top">top</h1>
 
 <p>F<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>.
-</p><div class="footnote">
+</p></div><div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
 <h5><a id="FOOT1" href="#DOCF1">(1)</a></h5>
 <p>In footnote</p>
 </div>
-<hr>
+<hr></div>
 ';
 
 1;
diff --git a/tp/t/results/coverage_braces/heading_in_footnote.pl b/tp/t/results/coverage_braces/heading_in_footnote.pl
index 4bcd554f07..ae011cd9f1 100644
--- a/tp/t/results/coverage_braces/heading_in_footnote.pl
+++ b/tp/t/results/coverage_braces/heading_in_footnote.pl
@@ -207,8 +207,9 @@ $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><span id="H1"></span><h3 class="heading">H1</h3>
-<span id="index-ind-e"></span>
+</p><div class="heading" id="H1">
+<h3 class="heading">H1</h3>
+</div><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 74daded943..20c2192d1c 100644
--- a/tp/t/results/coverage_braces/inforef_too_much_args.pl
+++ b/tp/t/results/coverage_braces/inforef_too_much_args.pl
@@ -196,10 +196,11 @@ $result_converted{'plaintext'}->{'inforef_too_much_args'} = '*note cross ref nam
 ';
 
 
-$result_converted{'html_text'}->{'inforef_too_much_args'} = '<span id="chapter"></span><h4 class="node-heading">chapter</h4>
+$result_converted{'html_text'}->{'inforef_too_much_args'} = '<div class="node" id="chapter">
+<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><hr>
+</p></div><hr></div>
 ';
 
 1;
diff --git a/tp/t/results/coverage_braces/test_image.pl b/tp/t/results/coverage_braces/test_image.pl
index f5a3385e6e..645ccd692c 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -3947,7 +3947,8 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<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; ">
 
@@ -3986,7 +3987,7 @@ In text [ alt <b>&icirc;&ndash;le..</b>  a
 &lt;&quot;%@  &lt; &amp; @ % &quot; ">.</p></dd>
 </dl>
 
-<hr>
+</div><hr></div>
 
 
 
@@ -4185,7 +4186,8 @@ $result_converted_errors{'plaintext'}->{'test_image'} = [
 
 $result_converted{'html_text'}->{'test_image'} = '
 
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<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; ">
 
@@ -4224,7 +4226,7 @@ In text [ alt <b>&icirc;&ndash;le..</b>  a
 &lt;&quot;%@  &lt; &amp; @ % &quot; ">.</p></dd>
 </dl>
 
-<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 9a4b81909a..e91da1dd68 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
@@ -840,11 +840,13 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; </p>
 </div>
-<span id="g_t2-footnotes-in-2-nodes"></span><h1 class="top">2 footnotes in 2 nodes</h1>
+<div class="node" id="g_t2-footnotes-in-2-nodes">
+<h1 class="top">2 footnotes in 2 nodes</h1>
 
 <p>A<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
@@ -854,18 +856,20 @@ 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>
-<hr>
-<span id="chapter"></span><div class="header">
+</div><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>
-<span id="chapter-1"></span><h2 class="chapter">1 chapter</h2>
+<div class="node" id="chapter-1">
+<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 class="footnote">
+</div><div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
@@ -887,6 +891,8 @@ Previous: <a href="#Top" accesskey="p" rel="prev">2 footnotes in 2 nodes</a>, Up
 <p>para2</p>
 </div>
 <hr>
+</div>
+</div>
 
 
 
@@ -997,11 +1003,13 @@ C(1)
 ';
 
 
-$result_converted{'html_text'}->{'two_footnotes_in_nodes'} = '<span id="Top"></span><div class="header">
+$result_converted{'html_text'}->{'two_footnotes_in_nodes'} = '<div class="top" id="Top">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
-<span id="g_t2-footnotes-in-2-nodes"></span><h1 class="top">2 footnotes in 2 nodes</h1>
+<div class="node" id="g_t2-footnotes-in-2-nodes">
+<h1 class="top">2 footnotes in 2 nodes</h1>
 
 <p>A<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
@@ -1011,18 +1019,20 @@ $result_converted{'html_text'}->{'two_footnotes_in_nodes'} = '<span id="Top"></s
 <ul class="section-toc">
 <li><a href="#chapter" accesskey="1">chapter</a></li>
 </ul>
-<hr>
-<span id="chapter"></span><div class="header">
+</div><hr>
+<div class="chapter" id="chapter">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
-<span id="chapter-1"></span><h2 class="chapter">1 chapter</h2>
+<div class="node" id="chapter-1">
+<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 class="footnote">
+</div><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 2f60700152..0bdfc2bd78 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
@@ -876,11 +876,13 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; </p>
 </div>
-<span id="g_t2-footnotes-in-2-nodes"></span><h1 class="top">2 footnotes in 2 nodes</h1>
+<div class="node" id="g_t2-footnotes-in-2-nodes">
+<h1 class="top">2 footnotes in 2 nodes</h1>
 
 <p>A<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
@@ -890,18 +892,22 @@ 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>
-<hr>
-<span id="chapter"></span><div class="header">
+</div><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>
-<span id="chapter-1"></span><h2 class="chapter">1 chapter</h2>
+<div class="node" id="chapter-1">
+<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>
-<hr>
+</div><hr>
+</div>
+</div>
 
 
 
@@ -1012,11 +1018,13 @@ C(1) (*note chapter-Footnote-1::)
 ';
 
 
-$result_converted{'html_text'}->{'two_footnotes_in_nodes_separate'} = '<span id="Top"></span><div class="header">
+$result_converted{'html_text'}->{'two_footnotes_in_nodes_separate'} = '<div class="top" id="Top">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
-<span id="g_t2-footnotes-in-2-nodes"></span><h1 class="top">2 footnotes in 2 nodes</h1>
+<div class="node" id="g_t2-footnotes-in-2-nodes">
+<h1 class="top">2 footnotes in 2 nodes</h1>
 
 <p>A<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
@@ -1026,18 +1034,20 @@ $result_converted{'html_text'}->{'two_footnotes_in_nodes_separate'} = '<span id=
 <ul class="section-toc">
 <li><a href="#chapter" accesskey="1">chapter</a></li>
 </ul>
-<hr>
-<span id="chapter"></span><div class="header">
+</div><hr>
+<div class="chapter" id="chapter">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
-<span id="chapter-1"></span><h2 class="chapter">1 chapter</h2>
+<div class="node" id="chapter-1">
+<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>
-<hr>
+</div><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 15eece3784..28c0cc65cb 100644
--- a/tp/t/results/coverage_braces/verb_in_xref.pl
+++ b/tp/t/results/coverage_braces/verb_in_xref.pl
@@ -235,13 +235,14 @@ ggg : Top.
 ';
 
 
-$result_converted{'html_text'}->{'verb_in_xref'} = '<span id="Top"></span><h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'verb_in_xref'} = '<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
 <p>See <a href="#Top"><tt>with
 verb
 
 ggg </tt></a>.
-</p><hr>
+</p></div><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 84cf7c072b..daea4f7135 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -16030,7 +16030,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<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>
@@ -16219,8 +16220,9 @@ 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>
 
-<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>
+<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>
  &nbsp; 
 <a class="summary-letter" href="#Top_fn_symbol-2"><b>,</b></a>
  &nbsp; 
@@ -16309,8 +16311,9 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<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>
+<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>
  &nbsp; 
 <a class="summary-letter" href="#Top_tp_letter-P"><b>P</b></a>
  &nbsp; 
@@ -16333,8 +16336,9 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<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>
+<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>
  &nbsp; 
 <a class="summary-letter" href="#Top_vr_letter-B"><b>B</b></a>
  &nbsp; 
@@ -16375,7 +16379,7 @@ ul.no-bullet {list-style: none}
 <a class="summary-letter" href="#Top_vr_letter-F"><b>F</b></a>
  &nbsp; 
 </td></tr></table>
-<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 d5e6f6405d..ed68321af5 100644
--- a/tp/t/results/def/all_commands_printindex.pl
+++ b/tp/t/results/def/all_commands_printindex.pl
@@ -4048,7 +4048,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<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
@@ -4139,8 +4140,9 @@ ul.no-bullet {list-style: none}
 <dd><p>d&ndash;eftypemethod
 </p></dd></dl>
 
-<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>
+<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>
  &nbsp; 
 </td></tr></table>
 <table class="index-fn" border="0">
@@ -4162,8 +4164,9 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<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>
+<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>
  &nbsp; 
 </td></tr></table>
 <table class="index-tp" border="0">
@@ -4177,8 +4180,9 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<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>
+<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>
  &nbsp; 
 </td></tr></table>
 <table class="index-vr" border="0">
@@ -4198,7 +4202,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>
-<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 9571875b5a..8513a91b1b 100644
--- a/tp/t/results/def/space_in_def_for_index.pl
+++ b/tp/t/results/def/space_in_def_for_index.pl
@@ -558,7 +558,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<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>
@@ -585,7 +586,7 @@ ul.no-bullet {list-style: none}
 <a class="summary-letter" href="#Top_fn_letter-N"><b>N</b></a>
  &nbsp; 
 </td></tr></table>
-<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 cfb8d2976f..dbd4c77291 100644
--- a/tp/t/results/float/anchor_in_caption.pl
+++ b/tp/t/results/float/anchor_in_caption.pl
@@ -450,7 +450,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
 <dl class="listoffloats">
 <dt><a href="#label">fl 1</a></dt><dd><p>in caption</p></dd>
@@ -459,7 +460,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><hr>
+<div class="float-caption"><p><strong>fl 1: </strong>in caption<span id="in-anchor"></span></p></div></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 fb0d17d645..00431465bc 100644
--- a/tp/t/results/float/cindex_in_caption.pl
+++ b/tp/t/results/float/cindex_in_caption.pl
@@ -536,7 +536,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
 <dl class="listoffloats">
 <dt><a href="#label">fl 1</a></dt><dd><p>in caption
@@ -563,7 +564,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<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 ef77f4d751..f08abc1b78 100644
--- a/tp/t/results/float/comment_space_comand_in_float.pl
+++ b/tp/t/results/float/comment_space_comand_in_float.pl
@@ -426,7 +426,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
 <div class="float"><span id="label--"></span>
 <p>Float
@@ -435,7 +436,7 @@ ul.no-bullet {list-style: none}
 <dl class="listoffloats">
 <dt><a href="#label--">Text &nbsp; 1</a></dt><dd></dd>
 </dl>
-<hr>
+</div><hr></div>
 
 
 
diff --git a/tp/t/results/float/complex_float.pl b/tp/t/results/float/complex_float.pl
index 7d1563e64b..9e49a5b136 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -4899,11 +4899,13 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">A chapter</a> &nbsp; </p>
 </div>
-<span id="Test-floats"></span><h1 class="top">Test floats</h1>
+<div class="node" id="Test-floats">
+<h1 class="top">Test floats</h1>
 
 <p>A list of floats at the beginning.
 </p><dl class="listoffloats">
@@ -5015,12 +5017,14 @@ A footnote.
 <ul class="section-toc">
 <li><a href="#chapter" accesskey="1">A chapter</a></li>
 </ul>
-<hr>
-<span id="chapter"></span><div class="header">
+</div><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>
-<span id="A-chapter"></span><h2 class="chapter">1 A chapter</h2>
+<div class="node" id="A-chapter">
+<h2 class="chapter">1 A chapter</h2>
 
 <div class="float"><span id="float-with-a-lot-of-features-and-no-shortcaption"></span>
 
@@ -5065,7 +5069,7 @@ A footnote 2.
 </p></div></div>
 <p>See <a href="#text-with-a-lot-of-features">Text 1</a>.
 </p>
-<div class="footnote">
+</div><div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
@@ -5079,6 +5083,8 @@ A footnote 2.
 <p>footnote Text with features caption 2</p>
 </div>
 <hr>
+</div>
+</div>
 
 
 
diff --git a/tp/t/results/float/float_copying.pl b/tp/t/results/float/float_copying.pl
index 4ddef19809..4113618991 100644
--- a/tp/t/results/float/float_copying.pl
+++ b/tp/t/results/float/float_copying.pl
@@ -1635,11 +1635,13 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#Copying-and-floats" accesskey="n" rel="next">Copying and floats</a> &nbsp; [<a href="#Copying-and-floats" title="Index" rel="index">Index</a>]</p>
 </div>
-<span id="Top-1"></span><h1 class="top">Top</h1>
+<div class="node" id="Top-1">
+<h1 class="top">Top</h1>
 
 
 <div class="float"><span id="public-domain"></span>
@@ -1656,12 +1658,14 @@ the author abandon his copyright.
 <ul class="section-toc">
 <li><a href="#Copying-and-floats" accesskey="1">Copying and floats</a></li>
 </ul>
-<hr>
-<span id="Copying-and-floats"></span><div class="header">
+</div><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>
-<span id="Copying-and-floats-1"></span><h2 class="appendix">Appendix A Copying and floats</h2>
+<div class="node" id="Copying-and-floats-1">
+<h2 class="appendix">Appendix A Copying and floats</h2>
 
 
 <div class="float"><span id="public-domain"></span>
@@ -1724,7 +1728,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 class="footnote">
+</div><div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
@@ -1760,6 +1764,8 @@ the author abandon his copyright.
 </p>
 </div>
 <hr>
+</div>
+</div>
 
 
 
diff --git a/tp/t/results/float/footnote_in_caption.pl b/tp/t/results/float/footnote_in_caption.pl
index d54f1cc83b..9055817c56 100644
--- a/tp/t/results/float/footnote_in_caption.pl
+++ b/tp/t/results/float/footnote_in_caption.pl
@@ -460,7 +460,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<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>
@@ -469,7 +470,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 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><div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
@@ -478,7 +479,7 @@ ul.no-bullet {list-style: none}
 <h5><a id="FOOT1" href="#DOCF1">(2)</a></h5>
 <p>in footnote</p>
 </div>
-<hr>
+<hr></div>
 
 
 
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 eedc3f7b2d..f975b86748 100644
--- a/tp/t/results/float/footnote_in_caption_and_error.pl
+++ b/tp/t/results/float/footnote_in_caption_and_error.pl
@@ -448,7 +448,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<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>
@@ -457,7 +458,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 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><div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
@@ -466,7 +467,7 @@ ul.no-bullet {list-style: none}
 <h5><a id="FOOT1" href="#DOCF1">(2)</a></h5>
 <p>in footnote error&rarr;</p>
 </div>
-<hr>
+<hr></div>
 
 
 
diff --git a/tp/t/results/float/numbering_captions_listoffloats.pl b/tp/t/results/float/numbering_captions_listoffloats.pl
index 3e164df33d..2bb1f84bde 100644
--- a/tp/t/results/float/numbering_captions_listoffloats.pl
+++ b/tp/t/results/float/numbering_captions_listoffloats.pl
@@ -8238,11 +8238,13 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">A chapter</a> &nbsp; </p>
 </div>
-<span id="Test-floats"></span><h1 class="top">Test floats</h1>
+<div class="node" id="Test-floats">
+<h1 class="top">Test floats</h1>
 
 <div class="float"><span id="text-with-a-lot-of-features"></span>
 
@@ -8297,12 +8299,14 @@ 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>
-<hr>
-<span id="chapter"></span><div class="header">
+</div><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>
-<span id="A-chapter"></span><h2 class="chapter">1 A chapter</h2>
+<div class="node" id="A-chapter">
+<h2 class="chapter">1 A chapter</h2>
 
 <div class="float"><span id="text-in-chapter"></span>
 <p>Text in chapter
@@ -8333,12 +8337,14 @@ 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>
-<hr>
-<span id="section"></span><div class="header">
+</div><hr>
+<div class="section" id="section">
+<div class="header">
 <p>
 Up: <a href="#chapter" accesskey="u" rel="up">A chapter</a> &nbsp; </p>
 </div>
-<span id="A-section"></span><h3 class="section">1.1 A section</h3>
+<div class="node" id="A-section">
+<h3 class="section">1.1 A section</h3>
 
 <div class="float"><span id="text-in-section"></span>
 
@@ -8346,12 +8352,16 @@ 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>
-<hr>
-<span id="Unnumbered"></span><div class="header">
+</div><hr>
+</div>
+</div>
+<div class="unnumbered" id="Unnumbered">
+<div class="header">
 <p>
 Next: <a href="#Chapter-with-unnumbsubsec" accesskey="n" rel="next">Chapter with unnumbsubsec</a>, Previous: <a href="#chapter" accesskey="p" rel="prev">A chapter</a>, Up: <a href="#Top" accesskey="u" rel="up">Test floats</a> &nbsp; </p>
 </div>
-<span id="Unnumbered-1"></span><h2 class="unnumbered">Unnumbered</h2>
+<div class="node" id="Unnumbered-1">
+<h2 class="unnumbered">Unnumbered</h2>
 
 <div class="float"><span id="unnumbered-float"></span>
 <p>unnum
@@ -8367,12 +8377,14 @@ 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>
-<hr>
-<span id="Section-within-unnumbered"></span><div class="header">
+</div><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>
-<span id="Section-within-unnumbered-1"></span><h3 class="section">Section within unnumbered</h3>
+<div class="node" id="Section-within-unnumbered-1">
+<h3 class="section">Section within unnumbered</h3>
 
 
 <div class="float"><span id="Section-within-unnumbered-float"></span>
@@ -8380,12 +8392,16 @@ 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>
-<hr>
-<span id="Chapter-with-unnumbsubsec"></span><div class="header">
+</div><hr>
+</div>
+</div>
+<div class="chapter" id="Chapter-with-unnumbsubsec">
+<div class="header">
 <p>
 Next: <a href="#Appendix-for-float" accesskey="n" rel="next">Appendix for float</a>, Previous: <a href="#Unnumbered" accesskey="p" rel="prev">Unnumbered</a>, Up: <a href="#Top" accesskey="u" rel="up">Test floats</a> &nbsp; </p>
 </div>
-<span id="Chapter-with-unnumbsubsec-1"></span><h2 class="chapter">2 Chapter with unnumbsubsec</h2>
+<div class="node" id="Chapter-with-unnumbsubsec-1">
+<h2 class="chapter">2 Chapter with unnumbsubsec</h2>
 
 <div class="float"><span id="Chapter-with-subsec-float"></span>
 <p>Chap
@@ -8395,12 +8411,14 @@ 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>
-<hr>
-<span id="unnumbered-sec"></span><div class="header">
+</div><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>
-<span id="unnumbered-sec-1"></span><h3 class="unnumberedsec">unnumbered sec</h3>
+<div class="node" id="unnumbered-sec-1">
+<h3 class="unnumberedsec">unnumbered sec</h3>
 
 <div class="float"><span id="unnumbered-sec-float"></span>
 <p>Chap
@@ -8413,12 +8431,16 @@ 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>
-<hr>
-<span id="Appendix-for-float"></span><div class="header">
+</div><hr>
+</div>
+</div>
+<div class="appendix" id="Appendix-for-float">
+<div class="header">
 <p>
 Next: <a href="#list-of-floats" accesskey="n" rel="next">list of floats</a>, Previous: <a href="#Chapter-with-unnumbsubsec" accesskey="p" rel="prev">Chapter with unnumbsubsec</a>, Up: <a href="#Top" accesskey="u" rel="up">Test floats</a> &nbsp; </p>
 </div>
-<span id="Appendix-for-float-1"></span><h2 class="appendix">Appendix A Appendix for float</h2>
+<div class="node" id="Appendix-for-float-1">
+<h2 class="appendix">Appendix A Appendix for float</h2>
 
 <div class="float"><span id="appendix-sec-float"></span>
 
@@ -8426,12 +8448,15 @@ 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>
-<hr>
-<span id="list-of-floats"></span><div class="header">
+</div><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>
-<span id="list-of-floats-1"></span><h2 class="unnumbered">list of floats</h2>
+<div class="node" id="list-of-floats-1">
+<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>).
@@ -8463,7 +8488,9 @@ 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>
 
-<hr>
+</div><hr>
+</div>
+</div>
 
 
 
diff --git a/tp/t/results/formatting/cond.pl b/tp/t/results/formatting/cond.pl
index 878c5743b2..4d36b2d22e 100644
--- a/tp/t/results/formatting/cond.pl
+++ b/tp/t/results/formatting/cond.pl
@@ -491,7 +491,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span>
+<div class="node" id="Top">
+
 This is html text.
 
 <p>This is ifhtml text.
@@ -506,7 +507,7 @@ This is html text.
 
 <p>This is ifnottex text.
 </p>
-<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 bd8cac51d4..886b5da551 100644
--- a/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
@@ -508,7 +508,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span>
+<div class="node" id="Top">
+
 This is html text.
 
 <p>This is ifhtml text.
@@ -524,7 +525,7 @@ This is tex text.
 <p>This is iftex text.
 </p>
 
-<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 8b6d52f34e..8fd9e68b32 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,7 +474,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span>
+<div class="node" id="Top">
+
 
 
 <p>This is ifnothtml text.
@@ -488,7 +489,7 @@ ul.no-bullet {list-style: none}
 
 <p>This is ifnottex text.
 </p>
-<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 cf105f55b2..af3e5e90fc 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
@@ -37,11 +37,14 @@ ul.no-bullet {list-style: none}
 <h1 class="settitle" align="center">Test @documentlanguage set</h1>
 <hr>
 
-<span id="Top"></span><span id="g_t_0040documentlanguage-set"></span><h1 class="top">@documentlanguage set</h1>
+<div class="top" id="Top">
+<div class="node" id="g_t_0040documentlanguage-set">
+<h1 class="top">@documentlanguage set</h1>
 
 <p>Text.
 </p>
-<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>.
 </font></p>
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 ab08f6106c..81c5f249fc 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
@@ -37,11 +37,14 @@ ul.no-bullet {list-style: none}
 <h1 class="settitle" align="center">Test @documentlanguage set</h1>
 <hr>
 
-<span id="Top"></span><span id="g_t_0040documentlanguage-set"></span><h1 class="top">@documentlanguage set</h1>
+<div class="top" id="Top">
+<div class="node" id="g_t_0040documentlanguage-set">
+<h1 class="top">@documentlanguage set</h1>
 
 <p>Text.
 </p>
-<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>.
 </font></p>
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 7b3268fb6b..39767d502b 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
@@ -40,7 +40,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Copying-and-floats"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="appendix" id="Copying-and-floats">
+<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>
@@ -55,7 +56,8 @@ 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>
-<span id="Copying-and-floats-1"></span><h1 class="appendix">Appendix A Copying and floats</h1>
+<div class="node" id="Copying-and-floats-1">
+<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).
@@ -87,15 +89,17 @@ 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>
-<span id="listoffloats"></span><h3 class="subheading">listoffloats</h3>
-<dl class="listoffloats">
+<div class="subheading" id="listoffloats">
+<h3 class="subheading">listoffloats</h3>
+</div><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>
 
-<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>
+<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>
  &nbsp; 
 <a class="summary-letter" href="#Copying-and-floats-1_cp_letter-L"><b>L</b></a>
  &nbsp; 
@@ -144,7 +148,7 @@ the author abandon his copyright.
  &nbsp; 
 </td></tr></table>
 
-<hr>
+</div><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>
@@ -158,6 +162,7 @@ the author abandon his copyright.
 <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>
 <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/float_copying/res_html/float_copying_abt.html b/tp/t/results/formatting/float_copying/res_html/float_copying_abt.html
index 3566e07692..e23d4db06d 100644
--- a/tp/t/results/formatting/float_copying/res_html/float_copying_abt.html
+++ b/tp/t/results/formatting/float_copying/res_html/float_copying_abt.html
@@ -40,7 +40,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</td>
@@ -149,7 +149,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</td>
diff --git a/tp/t/results/formatting/float_copying/res_html/float_copying_fot.html b/tp/t/results/formatting/float_copying/res_html/float_copying_fot.html
index 9280867a38..fd5ecb272c 100644
--- a/tp/t/results/formatting/float_copying/res_html/float_copying_fot.html
+++ b/tp/t/results/formatting/float_copying/res_html/float_copying_fot.html
@@ -40,7 +40,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Foot"></span>
+<div class="Footnotes_element" id="SEC_Foot">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</td>
@@ -79,7 +79,7 @@ ul.no-bullet {list-style: none}
 
 <p>see <a href="#Copying-and-floats">Copying and floats</a>.
 </p>
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</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 e5bb6f9a28..36b22db30f 100644
--- a/tp/t/results/formatting/float_copying/res_html/index.html
+++ b/tp/t/results/formatting/float_copying/res_html/index.html
@@ -42,7 +42,8 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -50,7 +51,8 @@ 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>
-<span id="Top-1"></span><h1 class="top">Top</h1>
+<div class="node" id="Top-1">
+<h1 class="top">Top</h1>
 
 <span id="index-Top"></span>
 
@@ -74,7 +76,7 @@ the author abandon his copyright.
 </td></tr>
 </table>
 
-<hr>
+</div><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>
@@ -83,6 +85,7 @@ the author abandon his copyright.
 <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>
 <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_date_in_header/res_html/simplest.html b/tp/t/results/formatting/simplest_test_date_in_header/res_html/simplest.html
index 43b869ad0a..f5c919e737 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,10 +36,11 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span>
+<div class="node" id="Top">
+
 <p>This is a very simple texi manual &nbsp; &lt;&gt;.
 </p>
-<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 8d4bebf50c..8339f7ca55 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,10 +35,11 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span>
+<div class="node" id="Top">
+
 <p>This is a very simple texi manual &nbsp; &lt;&gt;.
 </p>
-<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 ad24f45790..c143b3b03a 100644
--- a/tp/t/results/formatting/texi_bib_example.pl
+++ b/tp/t/results/formatting/texi_bib_example.pl
@@ -5680,7 +5680,8 @@ ul.no-bullet {list-style: none}
 
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#Introduction" title="Next section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -5688,7 +5689,8 @@ 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>
-<span id="Top-1"></span><h1 class="top">Top</h1>
+<div class="node" id="Top-1">
+<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">
@@ -5699,8 +5701,9 @@ ul.no-bullet {list-style: none}
 
 </pre></th></tr></table>
 
-<hr size="6">
-<span id="Introduction"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -5715,15 +5718,18 @@ 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>
-<span id="Introduction-1"></span><h1 class="chapter">1 Introduction</h1>
+<div class="node" id="Introduction-1">
+<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>
-<hr>
-<span id="References"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+</div>
+<div class="chapter" id="References">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Introduction" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Introduction" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Up section"> Up </a>]</td>
@@ -5738,7 +5744,8 @@ 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>
-<span id="References-1"></span><h1 class="chapter">2 References</h1>
+<div class="node" id="References-1">
+<h1 class="chapter">2 References</h1>
 
 <ul class="no-bullet">
 <li> <span id="LaTeX2e"></span>[LaTeX2e]
@@ -5748,7 +5755,9 @@ Massachusetts, 1994.
 
 </li></ul>
 
-<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>.
 </font></p>
diff --git a/tp/t/results/formatting/texi_cond.pl b/tp/t/results/formatting/texi_cond.pl
index 4eedf4a3b2..221f17702d 100644
--- a/tp/t/results/formatting/texi_cond.pl
+++ b/tp/t/results/formatting/texi_cond.pl
@@ -491,7 +491,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span>
+<div class="node" id="Top">
+
 This is html text.
 
 <p>This is ifhtml text.
@@ -506,7 +507,7 @@ This is html text.
 
 <p>This is ifnottex text.
 </p>
-<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 978edb9bf8..d724c12af6 100644
--- a/tp/t/results/formatting/texi_glossary.pl
+++ b/tp/t/results/formatting/texi_glossary.pl
@@ -1610,7 +1610,8 @@ ul.no-bullet {list-style: none}
 
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#glossary" title="Next section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -1618,7 +1619,8 @@ 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>
-<span id="Top-1"></span><h1 class="top">Top</h1>
+<div class="node" id="Top-1">
+<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">
@@ -1630,8 +1632,9 @@ ul.no-bullet {list-style: none}
 <a href="#id2">name2</a>
  is quite specific
 </p>
-<hr size="6">
-<span id="glossary"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -1646,12 +1649,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>
-<span id="glossary-1"></span><h1 class="chapter">1 glossary</h1>
+<div class="node" id="glossary-1">
+<h1 class="chapter">1 glossary</h1>
 
 <p>name2 <span id="id2"></span>text2
 </p>
 
-<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>.
 </font></p>
diff --git a/tp/t/results/heading/heading_in_copying.pl b/tp/t/results/heading/heading_in_copying.pl
index 7deb60a81f..18aaba32e9 100644
--- a/tp/t/results/heading/heading_in_copying.pl
+++ b/tp/t/results/heading/heading_in_copying.pl
@@ -449,14 +449,17 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
 
-<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="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="second-in-copying-_0040-subheading"></span><h4 class="subheading">second in copying @ <em>subheading</em></h4>
-<hr>
+<div class="subheading" id="second-in-copying-_0040-subheading">
+<h4 class="subheading">second in copying @ <em>subheading</em></h4>
+</div></div><hr></div>
 
 
 
diff --git a/tp/t/results/heading/heading_in_example.pl b/tp/t/results/heading/heading_in_example.pl
index 0d273e42ef..19515ca16d 100644
--- a/tp/t/results/heading/heading_in_example.pl
+++ b/tp/t/results/heading/heading_in_example.pl
@@ -197,8 +197,9 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 <div class="example">
-<span id="in-example-_0040-heading"></span><strong>in example @ <em>heading</em></strong>
-</div>
+<div class="heading" id="in-example-_0040-heading">
+<strong>in example @ <em>heading</em></strong>
+</div></div>
 
 
 
diff --git a/tp/t/results/heading/heading_in_quotation.pl b/tp/t/results/heading/heading_in_quotation.pl
index 32ad756f14..269dc8bbaf 100644
--- a/tp/t/results/heading/heading_in_quotation.pl
+++ b/tp/t/results/heading/heading_in_quotation.pl
@@ -216,8 +216,9 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 <blockquote>
 
-<span id="in-quotation-_0040-heading"></span><h3 class="heading">in quotation @ <em>heading</em></h3>
-
+<div class="heading" id="in-quotation-_0040-heading">
+<h3 class="heading">in quotation @ <em>heading</em></h3>
+</div>
 </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 9b43a81e0d..98133dc5c4 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,7 +335,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="top"></span><h1 class="top">top</h1>
+<div class="top" id="top">
+<h1 class="top">top</h1>
 <span id="SEC_Contents"></span>
 <h2 class="contents-heading">Table of Contents</h2>
 
@@ -360,16 +361,19 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 
-<span id="g_t0"></span><h2 class="chapter">1 0</h2>
-<span id="g_t_005f"></span><h2 class="unnumbered">_</h2>
+</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>
 <ul class="section-toc">
 <li><a href="#g_t_003f" accesskey="1">?</a></li>
 </ul>
-<span id="g_t_003f"></span><h3 class="section">?</h3>
+</div><div class="section" id="g_t_003f">
+<h3 class="section">?</h3>
 
 
 
-<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 d1bd84dac6..303526d18a 100644
--- a/tp/t/results/html_tests/check_htmlxref.pl
+++ b/tp/t/results/html_tests/check_htmlxref.pl
@@ -850,23 +850,27 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="no_existing_no_manual_direction.html#Top" accesskey="n" rel="next">(../there/no_existing_no_manual_direction)</a>, Previous: <a href="#first" accesskey="p" rel="prev">first</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
 </div>
-<span id="top"></span><h1 class="top">top</h1>
+<div class="node" id="top">
+<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>
 
-<hr>
-<span id="first"></span><div class="header">
+</div><hr>
+<div class="node" id="first">
+<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>
-<hr>
+</div><hr>
+</div>
 
 
 
diff --git a/tp/t/results/html_tests/documentdescription.pl b/tp/t/results/html_tests/documentdescription.pl
index c5338d3d48..bad626d685 100644
--- a/tp/t/results/html_tests/documentdescription.pl
+++ b/tp/t/results/html_tests/documentdescription.pl
@@ -443,8 +443,9 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="top"></span><h1 class="top">top</h1>
-<hr>
+<div class="top" id="top">
+<h1 class="top">top</h1>
+</div><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 ef7ccfdec6..1efd43b44b 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
@@ -281,9 +281,12 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><span id="top"></span><h1 class="top">top</h1>
+<div class="top" id="Top">
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
-<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 7258ee6945..2de5288711 100644
--- a/tp/t/results/html_tests/html_in_copying.pl
+++ b/tp/t/results/html_tests/html_in_copying.pl
@@ -387,9 +387,12 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="Top"></span><span id="top"></span><h1 class="top">top</h1>
+<div class="top" id="Top">
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
-<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 2bc06f3052..61f3eb918e 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,8 +286,10 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="top"></span><h1 class="top">top</h1>
-<span id="index-node"></span><h4 class="node-heading">index node</h4>
+<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="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>
@@ -304,7 +306,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<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 ef16e80fcf..e7c69d1841 100644
--- a/tp/t/results/html_tests/index_below.pl
+++ b/tp/t/results/html_tests/index_below.pl
@@ -461,7 +461,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="top"></span><div class="header">
+<div class="top" id="top">
+<div class="header">
 <p>
  &nbsp; [<a href="#chap" title="Index" rel="index">Index</a>]</p>
 </div>
@@ -470,8 +471,9 @@ ul.no-bullet {list-style: none}
 <ul class="section-toc">
 <li><a href="#chap" accesskey="1">chap</a></li>
 </ul>
-<hr>
-<span id="chap"></span><div class="header">
+</div><hr>
+<div class="chapter" id="chap">
+<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>
@@ -480,8 +482,9 @@ ul.no-bullet {list-style: none}
 <ul class="section-toc">
 <li><a href="#sec" accesskey="1">sec</a></li>
 </ul>
-<hr>
-<span id="sec"></span><div class="header">
+</div><hr>
+<div class="section" id="sec">
+<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>
@@ -501,7 +504,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>
-<hr>
+</div><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 fc7f798637..4dc6de934d 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
@@ -36,24 +36,28 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="circumflex"></span><div class="header">
+<div class="chapter" id="circumflex">
+<div class="header">
 <p>
 Previous: <a href="umlaut.html#umlaut" accesskey="p" rel="prev">umlaut</a>, Up: <a href="index.html" accesskey="u" rel="up">the top</a> &nbsp; </p>
 </div>
-<span id="circumflex-1"></span><h2 class="chapter">2 circumflex</h2>
+<div class="node" id="circumflex-1">
+<h2 class="chapter">2 circumflex</h2>
 
 
-<hr>
-<span id="g_t_00ee"></span><div class="header">
+</div><hr>
+<div class="node" id="g_t_00ee">
+<div class="header">
 <p>
 Up: <a href="#circumflex" accesskey="u" rel="up">circumflex</a> &nbsp; </p>
 </div>
 <h4 class="node-heading">&icirc;</h4>
-<hr>
+</div><hr>
 <div class="header">
 <p>
 Up: <a href="#circumflex" accesskey="u" rel="up">circumflex</a> &nbsp; </p>
 </div>
+</div>
 
 
 
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 b92022d66e..cd0c7b07e7 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
@@ -36,22 +36,25 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="umlaut.html#umlaut" accesskey="n" rel="next">umlaut</a> &nbsp; </p>
 </div>
-<span id="the-top"></span><h1 class="top">the top</h1>
+<div class="node" id="the-top">
+<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>
-<hr>
+</div><hr>
 <div class="header">
 <p>
 Next: <a href="umlaut.html#umlaut" accesskey="n" rel="next">umlaut</a> &nbsp; </p>
 </div>
+</div>
 
 
 
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 43e25f1270..41dad09527 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
@@ -37,32 +37,37 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="umlaut"></span><div class="header">
+<div class="chapter" id="umlaut">
+<div class="header">
 <p>
 Next: <a href="circumflex.html#circumflex" accesskey="n" rel="next">circumflex</a>, Previous: <a href="index.html" accesskey="p" rel="prev">the top</a>, Up: <a href="index.html" accesskey="u" rel="up">the top</a> &nbsp; </p>
 </div>
-<span id="umlaut-1"></span><h2 class="chapter">1 umlaut</h2>
+<div class="node" id="umlaut-1">
+<h2 class="chapter">1 umlaut</h2>
 
 
-<hr>
-<span id="g_t_00ef"></span><div class="header">
+</div><hr>
+<div class="node" id="g_t_00ef">
+<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>
 
-<hr>
-<span id="g_t_0129"></span><div class="header">
+</div><hr>
+<div class="node" id="g_t_0129">
+<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>
 
-<hr>
+</div><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>
 </div>
+</div>
 
 
 
diff --git a/tp/t/results/html_tests/ref_in_preformatted.pl b/tp/t/results/html_tests/ref_in_preformatted.pl
index fad587e6c0..9d193c03d4 100644
--- a/tp/t/results/html_tests/ref_in_preformatted.pl
+++ b/tp/t/results/html_tests/ref_in_preformatted.pl
@@ -468,7 +468,8 @@ $result_floats{'ref_in_preformatted'} = {};
 
 
 
-$result_converted{'html_text'}->{'ref_in_preformatted'} = '<span id="Top"></span><div class="header">
+$result_converted{'html_text'}->{'ref_in_preformatted'} = '<div class="node" id="Top">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
@@ -480,13 +481,14 @@ $result_converted{'html_text'}->{'ref_in_preformatted'} = '<span id="Top"></span
 node name</a>
 </pre></div>
 
-<hr>
-<span id="nnn-the-node-name"></span><div class="header">
+</div><hr>
+<div class="node" id="nnn-the-node-name">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
 <h4 class="node-heading">nnn the node name</h4>
-<hr>
+</div><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 30e4f6ec29..849f0a1ebb 100644
--- a/tp/t/results/html_tests/shortcontents_no_top.pl
+++ b/tp/t/results/html_tests/shortcontents_no_top.pl
@@ -267,14 +267,17 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="chap"></span><h2 class="chapter">1 chap</h2>
+<div class="chapter" id="chap">
+<h2 class="chapter">1 chap</h2>
 
-<span id="chap2"></span><h2 class="chapter">2 chap2</h2>
+</div><div class="chapter" id="chap2">
+<h2 class="chapter">2 chap2</h2>
 
 <ul class="section-toc">
 <li><a href="#sec" accesskey="1">sec</a></li>
 </ul>
-<span id="sec"></span><h3 class="section">2.1 sec</h3>
+</div><div class="section" id="sec">
+<h3 class="section">2.1 sec</h3>
 
 <span id="SEC_Overview"></span>
 <h2 class="shortcontents-heading">Short Table of Contents</h2>
@@ -287,7 +290,7 @@ ul.no-bullet {list-style: none}
 </ul>
 </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 19fee2e15a..74e60145ce 100644
--- a/tp/t/results/html_tests/simple_menu.pl
+++ b/tp/t/results/html_tests/simple_menu.pl
@@ -2265,8 +2265,11 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><span id="SEC_Top"></span>
-<hr>
+<div class="top" id="Top">
+<div class="node" id="SEC_Top">
+
+</div><hr></div>
+</div>
 
 
 
diff --git a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
index 497ec7cfa3..3ff4dbc060 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
@@ -707,29 +707,35 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#chap" accesskey="n" rel="next">chap</a> &nbsp; </p>
 </div>
-<span id="top"></span><h1 class="top">top</h1>
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 
 <ul class="section-toc">
 <li><a href="#chap" accesskey="1">chapter</a></li>
 </ul>
-<hr>
-<span id="chap"></span><div class="header">
+</div><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>
-<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
+<div class="node" id="chapter">
+<h2 class="chapter">1 chapter</h2>
 
 
 <p>See <a href="#chap">chapter</a>.
 </p>
 
 <p>See <a href="#chap">chap</a>.
-</p><hr>
+</p></div><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 74a56c5d6d..6b964e1beb 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
@@ -368,17 +368,21 @@ ul.no-bullet {list-style: none}
 
 <p>Some text before top
 </p>
-<span id="Top"></span><span id="top"></span><h1 class="top">top</h1>
+<div class="top" id="Top">
+<div class="node" id="top">
+<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>
-<span id="the-chap"></span><h2 class="chapter">1 the chap</h2>
+</div><div class="chapter" id="the-chap">
+<h2 class="chapter">1 the chap</h2>
 
 
-<hr>
+</div><hr></div>
+</div>
 
 
 
diff --git a/tp/t/results/html_tests/titles.pl b/tp/t/results/html_tests/titles.pl
index 6b669db319..171ddbbc59 100644
--- a/tp/t/results/html_tests/titles.pl
+++ b/tp/t/results/html_tests/titles.pl
@@ -444,12 +444,15 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 <h1 class="settitle" align="center">@title <small>HTML</small> <code>test</code></h1>
 
-<span id="Top"></span><span id="Top-of-_0040title-HTML-test"></span><h1 class="top">Top of @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>
 
 <p>Top.
 </p>
 <p>Second paragraph.
-</p><hr>
+</p></div><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 6a10541bad..ccc00e0c43 100644
--- a/tp/t/results/htmlxref/htmlxref/res_html/test_refs.html
+++ b/tp/t/results/htmlxref/htmlxref/res_html/test_refs.html
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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" title="Next section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -42,15 +43,17 @@ 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>
-<span id="Test-refs"></span><h1 class="top">Test refs</h1>
+<div class="node" id="Test-refs">
+<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>
 
-<span id="Testing-distant-nodes"></span><h3 class="subheading">Testing distant nodes</h3>
-
+<div class="subheading" id="Testing-distant-nodes">
+<h3 class="subheading">Testing distant nodes</h3>
+</div>
 <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
@@ -75,16 +78,18 @@ split: ../manual/index.html#Top
 split: ../mtexinfo/Cross-References.html#Cross-References
 </pre></div>
 
-<span id="Testing-manual-name"></span><h3 class="subheading">Testing manual name</h3>
-
+<div class="subheading" id="Testing-manual-name">
+<h3 class="subheading">Testing manual name</h3>
+</div>
 <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>
 
-<span id="Testing-local-nodes"></span><h3 class="subheading">Testing local nodes</h3>
-
+<div class="subheading" id="Testing-local-nodes">
+<h3 class="subheading">Testing local nodes</h3>
+</div>
 <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
@@ -105,8 +110,9 @@ split: ../doc/node.html#node
 <pre class="example">target: #local-node
 </pre></div>
 
-<hr size="6">
-<span id="other-nodes"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -121,7 +127,8 @@ 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>
-<span id="Chapter-with-nodes"></span><h1 class="chapter">1 Chapter with nodes</h1>
+<div class="node" id="Chapter-with-nodes">
+<h1 class="chapter">1 Chapter with nodes</h1>
 
 <div class="example">
 <pre class="example">id: other-nodes
@@ -141,20 +148,25 @@ split: ../doc/node.html#node
 </td></tr>
 </table>
 
-<span id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></span><div class="example">
+</div><div class="node" id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">
+<div class="example">
 <pre class="example">id: _0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
 </pre></div>
 
-<span id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></span><div class="example">
+</div><div class="node" id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e">
+<div class="example">
 <pre class="example">id: 002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e
 </pre></div>
 
-<span id="local-node"></span><div class="example">
+</div><div class="node" id="local-node">
+<div class="example">
 <pre class="example">id: local-node
 </pre></div>
 
-<hr size="6">
-<span id="SEC_About"></span>
+</div><hr size="6">
+</div>
+</div>
+<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>
 <td valign="middle" align="left">[Contents]</td>
@@ -263,7 +275,7 @@ split: ../doc/node.html#node
   </li>
 </ul>
 
-<hr>
+</div><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/_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 59c70f273d..f47654011a 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,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<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">
+<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">
 <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>
@@ -55,7 +56,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>
 
-<hr>
+</div><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 a10ef48b78..ef81811872 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,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<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">
+<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">
 <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>
@@ -55,7 +56,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>
 
-<hr>
+</div><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 4afc3223da..843ad89552 100644
--- a/tp/t/results/htmlxref/htmlxref_nodes/res_html/index.html
+++ b/tp/t/results/htmlxref/htmlxref_nodes/res_html/index.html
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -43,15 +44,17 @@ 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>
-<span id="Test-refs"></span><h1 class="top">Test refs</h1>
+<div class="node" id="Test-refs">
+<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>
 
-<span id="Testing-distant-nodes"></span><h3 class="subheading">Testing distant nodes</h3>
-
+<div class="subheading" id="Testing-distant-nodes">
+<h3 class="subheading">Testing distant nodes</h3>
+</div>
 <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
@@ -76,16 +79,18 @@ split: ../manual/index.html#Top
 split: ../mtexinfo/Cross-References.html#Cross-References
 </pre></div>
 
-<span id="Testing-manual-name"></span><h3 class="subheading">Testing manual name</h3>
-
+<div class="subheading" id="Testing-manual-name">
+<h3 class="subheading">Testing manual name</h3>
+</div>
 <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>
 
-<span id="Testing-local-nodes"></span><h3 class="subheading">Testing local nodes</h3>
-
+<div class="subheading" id="Testing-local-nodes">
+<h3 class="subheading">Testing local nodes</h3>
+</div>
 <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
@@ -106,7 +111,7 @@ split: ../doc/node.html#node
 <pre class="example">target: #local-node
 </pre></div>
 
-<hr>
+</div><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>
@@ -115,6 +120,7 @@ split: ../doc/node.html#node
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
 </tr></table>
+</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/htmlxref/htmlxref_nodes/res_html/local-node.html b/tp/t/results/htmlxref/htmlxref_nodes/res_html/local-node.html
index 773ba15fbf..de5fa80a4e 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,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="local-node"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="local-node">
+<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>
@@ -55,7 +56,7 @@ ul.no-bullet {list-style: none}
 <pre class="example">id: local-node
 </pre></div>
 
-<hr>
+</div><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 39c4ce8dd6..3dcba94a4e 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="other-nodes"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="other-nodes">
+<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>
@@ -50,7 +51,8 @@ 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>
-<span id="Chapter-with-nodes"></span><h1 class="chapter">1 Chapter with nodes</h1>
+<div class="node" id="Chapter-with-nodes">
+<h1 class="chapter">1 Chapter with nodes</h1>
 
 <div class="example">
 <pre class="example">id: other-nodes
@@ -70,7 +72,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<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/htmlxref/htmlxref_nodes/res_html/test_refs_abt.html b/tp/t/results/htmlxref/htmlxref_nodes/res_html/test_refs_abt.html
index 71b81126e7..defa1c4e81 100644
--- a/tp/t/results/htmlxref/htmlxref_nodes/res_html/test_refs_abt.html
+++ b/tp/t/results/htmlxref/htmlxref_nodes/res_html/test_refs_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</td>
@@ -144,7 +144,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</td>
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono/res_html/test_refs.html b/tp/t/results/htmlxref/htmlxref_only_mono/res_html/test_refs.html
index 6a10541bad..ccc00e0c43 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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" title="Next section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -42,15 +43,17 @@ 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>
-<span id="Test-refs"></span><h1 class="top">Test refs</h1>
+<div class="node" id="Test-refs">
+<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>
 
-<span id="Testing-distant-nodes"></span><h3 class="subheading">Testing distant nodes</h3>
-
+<div class="subheading" id="Testing-distant-nodes">
+<h3 class="subheading">Testing distant nodes</h3>
+</div>
 <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
@@ -75,16 +78,18 @@ split: ../manual/index.html#Top
 split: ../mtexinfo/Cross-References.html#Cross-References
 </pre></div>
 
-<span id="Testing-manual-name"></span><h3 class="subheading">Testing manual name</h3>
-
+<div class="subheading" id="Testing-manual-name">
+<h3 class="subheading">Testing manual name</h3>
+</div>
 <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>
 
-<span id="Testing-local-nodes"></span><h3 class="subheading">Testing local nodes</h3>
-
+<div class="subheading" id="Testing-local-nodes">
+<h3 class="subheading">Testing local nodes</h3>
+</div>
 <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
@@ -105,8 +110,9 @@ split: ../doc/node.html#node
 <pre class="example">target: #local-node
 </pre></div>
 
-<hr size="6">
-<span id="other-nodes"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -121,7 +127,8 @@ 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>
-<span id="Chapter-with-nodes"></span><h1 class="chapter">1 Chapter with nodes</h1>
+<div class="node" id="Chapter-with-nodes">
+<h1 class="chapter">1 Chapter with nodes</h1>
 
 <div class="example">
 <pre class="example">id: other-nodes
@@ -141,20 +148,25 @@ split: ../doc/node.html#node
 </td></tr>
 </table>
 
-<span id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></span><div class="example">
+</div><div class="node" id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">
+<div class="example">
 <pre class="example">id: _0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
 </pre></div>
 
-<span id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></span><div class="example">
+</div><div class="node" id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e">
+<div class="example">
 <pre class="example">id: 002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e
 </pre></div>
 
-<span id="local-node"></span><div class="example">
+</div><div class="node" id="local-node">
+<div class="example">
 <pre class="example">id: local-node
 </pre></div>
 
-<hr size="6">
-<span id="SEC_About"></span>
+</div><hr size="6">
+</div>
+</div>
+<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>
 <td valign="middle" align="left">[Contents]</td>
@@ -263,7 +275,7 @@ split: ../doc/node.html#node
   </li>
 </ul>
 
-<hr>
+</div><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/_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 59c70f273d..f47654011a 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,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<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">
+<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">
 <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>
@@ -55,7 +56,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>
 
-<hr>
+</div><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 a10ef48b78..ef81811872 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,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<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">
+<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">
 <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>
@@ -55,7 +56,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>
 
-<hr>
+</div><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 b9613e3c60..984c5a0e28 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -43,15 +44,17 @@ 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>
-<span id="Test-refs"></span><h1 class="top">Test refs</h1>
+<div class="node" id="Test-refs">
+<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>
 
-<span id="Testing-distant-nodes"></span><h3 class="subheading">Testing distant nodes</h3>
-
+<div class="subheading" id="Testing-distant-nodes">
+<h3 class="subheading">Testing distant nodes</h3>
+</div>
 <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
@@ -76,16 +79,18 @@ split: ../manual/index.html#Top
 split: ../mtexinfo/Cross-References.html#Cross-References
 </pre></div>
 
-<span id="Testing-manual-name"></span><h3 class="subheading">Testing manual name</h3>
-
+<div class="subheading" id="Testing-manual-name">
+<h3 class="subheading">Testing manual name</h3>
+</div>
 <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>
 
-<span id="Testing-local-nodes"></span><h3 class="subheading">Testing local nodes</h3>
-
+<div class="subheading" id="Testing-local-nodes">
+<h3 class="subheading">Testing local nodes</h3>
+</div>
 <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
@@ -106,7 +111,7 @@ split: ../doc/node.html#node
 <pre class="example">target: #local-node
 </pre></div>
 
-<hr>
+</div><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>
@@ -115,6 +120,7 @@ split: ../doc/node.html#node
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
 </tr></table>
+</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/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 773ba15fbf..de5fa80a4e 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,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="local-node"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="local-node">
+<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>
@@ -55,7 +56,7 @@ ul.no-bullet {list-style: none}
 <pre class="example">id: local-node
 </pre></div>
 
-<hr>
+</div><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 39c4ce8dd6..3dcba94a4e 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="other-nodes"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="other-nodes">
+<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>
@@ -50,7 +51,8 @@ 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>
-<span id="Chapter-with-nodes"></span><h1 class="chapter">1 Chapter with nodes</h1>
+<div class="node" id="Chapter-with-nodes">
+<h1 class="chapter">1 Chapter with nodes</h1>
 
 <div class="example">
 <pre class="example">id: other-nodes
@@ -70,7 +72,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<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/htmlxref/htmlxref_only_mono_nodes/res_html/test_refs_abt.html b/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/test_refs_abt.html
index 71b81126e7..defa1c4e81 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/test_refs_abt.html
+++ b/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/test_refs_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</td>
@@ -144,7 +144,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</td>
diff --git a/tp/t/results/htmlxref/htmlxref_only_split/res_html/test_refs.html b/tp/t/results/htmlxref/htmlxref_only_split/res_html/test_refs.html
index a3a818b6d6..0742ae8850 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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" title="Next section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -42,15 +43,17 @@ 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>
-<span id="Test-refs"></span><h1 class="top">Test refs</h1>
+<div class="node" id="Test-refs">
+<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>
 
-<span id="Testing-distant-nodes"></span><h3 class="subheading">Testing distant nodes</h3>
-
+<div class="subheading" id="Testing-distant-nodes">
+<h3 class="subheading">Testing distant nodes</h3>
+</div>
 <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
@@ -75,16 +78,18 @@ split: ../manual/index.html#Top
 split: ../mtexinfo/Cross-References.html#Cross-References
 </pre></div>
 
-<span id="Testing-manual-name"></span><h3 class="subheading">Testing manual name</h3>
-
+<div class="subheading" id="Testing-manual-name">
+<h3 class="subheading">Testing manual name</h3>
+</div>
 <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>
 
-<span id="Testing-local-nodes"></span><h3 class="subheading">Testing local nodes</h3>
-
+<div class="subheading" id="Testing-local-nodes">
+<h3 class="subheading">Testing local nodes</h3>
+</div>
 <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
@@ -105,8 +110,9 @@ split: ../doc/node.html#node
 <pre class="example">target: #local-node
 </pre></div>
 
-<hr size="6">
-<span id="other-nodes"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -121,7 +127,8 @@ 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>
-<span id="Chapter-with-nodes"></span><h1 class="chapter">1 Chapter with nodes</h1>
+<div class="node" id="Chapter-with-nodes">
+<h1 class="chapter">1 Chapter with nodes</h1>
 
 <div class="example">
 <pre class="example">id: other-nodes
@@ -141,20 +148,25 @@ split: ../doc/node.html#node
 </td></tr>
 </table>
 
-<span id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></span><div class="example">
+</div><div class="node" id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">
+<div class="example">
 <pre class="example">id: _0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
 </pre></div>
 
-<span id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></span><div class="example">
+</div><div class="node" id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e">
+<div class="example">
 <pre class="example">id: 002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e
 </pre></div>
 
-<span id="local-node"></span><div class="example">
+</div><div class="node" id="local-node">
+<div class="example">
 <pre class="example">id: local-node
 </pre></div>
 
-<hr size="6">
-<span id="SEC_About"></span>
+</div><hr size="6">
+</div>
+</div>
+<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>
 <td valign="middle" align="left">[Contents]</td>
@@ -263,7 +275,7 @@ split: ../doc/node.html#node
   </li>
 </ul>
 
-<hr>
+</div><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/_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 59c70f273d..f47654011a 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,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<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">
+<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">
 <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>
@@ -55,7 +56,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>
 
-<hr>
+</div><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 a10ef48b78..ef81811872 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,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<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">
+<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">
 <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>
@@ -55,7 +56,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>
 
-<hr>
+</div><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 4afc3223da..843ad89552 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -43,15 +44,17 @@ 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>
-<span id="Test-refs"></span><h1 class="top">Test refs</h1>
+<div class="node" id="Test-refs">
+<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>
 
-<span id="Testing-distant-nodes"></span><h3 class="subheading">Testing distant nodes</h3>
-
+<div class="subheading" id="Testing-distant-nodes">
+<h3 class="subheading">Testing distant nodes</h3>
+</div>
 <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
@@ -76,16 +79,18 @@ split: ../manual/index.html#Top
 split: ../mtexinfo/Cross-References.html#Cross-References
 </pre></div>
 
-<span id="Testing-manual-name"></span><h3 class="subheading">Testing manual name</h3>
-
+<div class="subheading" id="Testing-manual-name">
+<h3 class="subheading">Testing manual name</h3>
+</div>
 <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>
 
-<span id="Testing-local-nodes"></span><h3 class="subheading">Testing local nodes</h3>
-
+<div class="subheading" id="Testing-local-nodes">
+<h3 class="subheading">Testing local nodes</h3>
+</div>
 <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
@@ -106,7 +111,7 @@ split: ../doc/node.html#node
 <pre class="example">target: #local-node
 </pre></div>
 
-<hr>
+</div><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>
@@ -115,6 +120,7 @@ split: ../doc/node.html#node
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
 </tr></table>
+</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/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 773ba15fbf..de5fa80a4e 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,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="local-node"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="local-node">
+<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>
@@ -55,7 +56,7 @@ ul.no-bullet {list-style: none}
 <pre class="example">id: local-node
 </pre></div>
 
-<hr>
+</div><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 39c4ce8dd6..3dcba94a4e 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="other-nodes"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="other-nodes">
+<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>
@@ -50,7 +51,8 @@ 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>
-<span id="Chapter-with-nodes"></span><h1 class="chapter">1 Chapter with nodes</h1>
+<div class="node" id="Chapter-with-nodes">
+<h1 class="chapter">1 Chapter with nodes</h1>
 
 <div class="example">
 <pre class="example">id: other-nodes
@@ -70,7 +72,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<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/htmlxref/htmlxref_only_split_nodes/res_html/test_refs_abt.html b/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/test_refs_abt.html
index 71b81126e7..defa1c4e81 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/test_refs_abt.html
+++ b/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/test_refs_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</td>
@@ -144,7 +144,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</td>
diff --git a/tp/t/results/indices/def_syn_indices.pl b/tp/t/results/indices/def_syn_indices.pl
index 4bd268706a..0b39106e47 100644
--- a/tp/t/results/indices/def_syn_indices.pl
+++ b/tp/t/results/indices/def_syn_indices.pl
@@ -1772,7 +1772,8 @@ $result_converted{'plaintext'}->{'def_syn_indices'} = 'definedx truc after
 
 $result_converted{'html_text'}->{'def_syn_indices'} = '
 
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
 <p>definedx truc
 after
@@ -1866,7 +1867,7 @@ after
 <a class="summary-letter" href="#t_h_fn_letter-I"><b>I</b></a>
  &nbsp; 
 </td></tr></table>
-<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 5724ab48a2..757baf4c1c 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,7 +374,8 @@ $result_converted{'plaintext'}->{'default_cp_index_and_one_letter_syncodeindex'}
 ';
 
 
-$result_converted{'html_text'}->{'default_cp_index_and_one_letter_syncodeindex'} = '<span id="Top"></span><h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'default_cp_index_and_one_letter_syncodeindex'} = '<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
 
 <span id="index-_002d_002dcindex"></span>
@@ -392,7 +393,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>
-<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 076a434864..cfb137163e 100644
--- a/tp/t/results/indices/double_index_entry.pl
+++ b/tp/t/results/indices/double_index_entry.pl
@@ -657,7 +657,8 @@ $result_converted{'plaintext'}->{'double_index_entry'} = 'Text
 ';
 
 
-$result_converted{'html_text'}->{'double_index_entry'} = '<span id="Top"></span><div class="header">
+$result_converted{'html_text'}->{'double_index_entry'} = '<div class="node" id="Top">
+<div class="header">
 <p>
  &nbsp; [<a href="#other-node" title="Index" rel="index">Index</a>]</p>
 </div>
@@ -670,8 +671,9 @@ $result_converted{'html_text'}->{'double_index_entry'} = '<span id="Top"></span>
 <span id="index-aaa-1"></span>
 
 
-<hr>
-<span id="other-node"></span><div class="header">
+</div><hr>
+<div class="node" id="other-node">
+<div class="header">
 <p>
  &nbsp; [<a href="#other-node" title="Index" rel="index">Index</a>]</p>
 </div>
@@ -694,7 +696,7 @@ $result_converted{'html_text'}->{'double_index_entry'} = '<span id="Top"></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>
  &nbsp; 
 </td></tr></table>
-<hr>
+</div><hr>
 ';
 
 1;
diff --git a/tp/t/results/indices/double_syncodeindex.pl b/tp/t/results/indices/double_syncodeindex.pl
index b4f8e60853..8a41be2834 100644
--- a/tp/t/results/indices/double_syncodeindex.pl
+++ b/tp/t/results/indices/double_syncodeindex.pl
@@ -457,7 +457,8 @@ $result_converted{'plaintext'}->{'double_syncodeindex'} = '* Menu:
 
 
 $result_converted{'html_text'}->{'double_syncodeindex'} = '
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
 <span id="index-cindex-entry"></span>
 <span id="index-findex-entry"></span>
@@ -482,7 +483,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>
-<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 4c83117300..57d35a5bb4 100644
--- a/tp/t/results/indices/empty_cindex_entry.pl
+++ b/tp/t/results/indices/empty_cindex_entry.pl
@@ -153,8 +153,9 @@ End:
 $result_converted{'plaintext'}->{'empty_cindex_entry'} = '';
 
 
-$result_converted{'html_text'}->{'empty_cindex_entry'} = '<span id="Top"></span><h1 class="node-heading">Top</h1>
-<hr>
+$result_converted{'html_text'}->{'empty_cindex_entry'} = '<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
+</div><hr></div>
 ';
 
 1;
diff --git a/tp/t/results/indices/empty_index_entry.pl b/tp/t/results/indices/empty_index_entry.pl
index 2cb212cb95..78e399a980 100644
--- a/tp/t/results/indices/empty_index_entry.pl
+++ b/tp/t/results/indices/empty_index_entry.pl
@@ -317,13 +317,14 @@ $result_converted{'plaintext'}->{'empty_index_entry'} = ' -- :
 ';
 
 
-$result_converted{'html_text'}->{'empty_index_entry'} = '<span id="Top"></span><h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'empty_index_entry'} = '<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
 <dl class="def">
 <dt><span class="category">: </span><span><strong></strong></span></dt>
 </dl>
 
-<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 c84ae9be0d..5a85852c01 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -948,7 +948,8 @@ $result_converted{'plaintext'}->{'empty_string_index_entry'} = '\'\'
 ';
 
 
-$result_converted{'html_text'}->{'empty_string_index_entry'} = '<span id="Top"></span><h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'empty_string_index_entry'} = '<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
 <span id="index-"></span>
 
@@ -961,7 +962,7 @@ $result_converted{'html_text'}->{'empty_string_index_entry'} = '<span id="Top"><
 <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>
 
-<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 218cc67a64..7131d7ce43 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
@@ -37,7 +37,9 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="Top"></span><span id="top"></span><h1 class="top">top</h1>
+<div class="top" id="Top">
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 <span id="index-e-e"></span>
 <span id="index-i-iii"></span>
@@ -374,7 +376,8 @@ ul.no-bullet {list-style: none}
 <a class="summary-letter" href="#Top_cp_letter-Z"><b>Z</b></a>
  &nbsp; 
 </td></tr></table>
-<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 218cc67a64..7131d7ce43 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
@@ -37,7 +37,9 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="Top"></span><span id="top"></span><h1 class="top">top</h1>
+<div class="top" id="Top">
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 <span id="index-e-e"></span>
 <span id="index-i-iii"></span>
@@ -374,7 +376,8 @@ ul.no-bullet {list-style: none}
 <a class="summary-letter" href="#Top_cp_letter-Z"><b>Z</b></a>
  &nbsp; 
 </td></tr></table>
-<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 4e7d79d1be..7d2923cfba 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
@@ -36,7 +36,9 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><span id="top"></span><h1 class="top">top</h1>
+<div class="top" id="Top">
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 <span id="index-e-e"></span>
 <span id="index-i-iii"></span>
@@ -379,7 +381,8 @@ ul.no-bullet {list-style: none}
 <a class="summary-letter" href="#Top_cp_letter-�"><b>�</b></a>
  &nbsp; 
 </td></tr></table>
-<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 f5facb9d08..ff9ee0a554 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
@@ -36,7 +36,9 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><span id="top"></span><h1 class="top">top</h1>
+<div class="top" id="Top">
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 <span id="index-e-e"></span>
 <span id="index-i-iii"></span>
@@ -421,7 +423,8 @@ ul.no-bullet {list-style: none}
 <a class="summary-letter" href="#Top_cp_letter-�"><b>�</b></a>
  &nbsp; 
 </td></tr></table>
-<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 2028ff3d59..d0b2e5371b 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
@@ -36,7 +36,9 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><span id="top"></span><h1 class="top">top</h1>
+<div class="top" id="Top">
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 <span id="index-e-e"></span>
 <span id="index-i-iii"></span>
@@ -379,7 +381,8 @@ ul.no-bullet {list-style: none}
 <a class="summary-letter" href="#Top_cp_letter-É"><b>É</b></a>
  &nbsp; 
 </td></tr></table>
-<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 e481cd431c..567fa3af29 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
@@ -36,7 +36,9 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><span id="top"></span><h1 class="top">top</h1>
+<div class="top" id="Top">
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 <span id="index-e-e"></span>
 <span id="index-i-iii"></span>
@@ -439,7 +441,8 @@ ul.no-bullet {list-style: none}
 <a class="summary-letter" href="#Top_cp_letter-Ł"><b>Ł</b></a>
  &nbsp; 
 </td></tr></table>
-<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 f7d257ba58..0812a671d3 100644
--- a/tp/t/results/indices/explicit_sort_key.pl
+++ b/tp/t/results/indices/explicit_sort_key.pl
@@ -997,7 +997,9 @@ $result_converted{'plaintext'}->{'explicit_sort_key'} = 'in a reuglar para.  \'i
 ';
 
 
-$result_converted{'html_text'}->{'explicit_sort_key'} = '<span id="Top"></span><span id="SEC_Top"></span>
+$result_converted{'html_text'}->{'explicit_sort_key'} = '<div class="top" id="Top">
+<div class="node" id="SEC_Top">
+
 
 <span id="index-Abbbbbbb-_0028first_0029"></span>
 <span id="index-Baaaaaaa-_0028second_0029"></span>
@@ -1039,7 +1041,7 @@ $result_converted{'html_text'}->{'explicit_sort_key'} = '<span id="Top"></span><
 <a class="summary-letter" href="#t_h_SK_letter-B"><b>B</b></a>
  &nbsp; 
 </td></tr></table>
-<hr>
+</div><hr></div>
 ';
 
 1;
diff --git a/tp/t/results/indices/ftable_vtable.pl b/tp/t/results/indices/ftable_vtable.pl
index a36da6c67f..f3d7e3eee8 100644
--- a/tp/t/results/indices/ftable_vtable.pl
+++ b/tp/t/results/indices/ftable_vtable.pl
@@ -923,7 +923,8 @@ _var3_
 
 
 $result_converted{'html_text'}->{'ftable_vtable'} = '
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<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>
@@ -976,7 +977,7 @@ $result_converted{'html_text'}->{'ftable_vtable'} = '
  &nbsp; 
 </td></tr></table>
 
-<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 288c17ce51..495eefe9f4 100644
--- a/tp/t/results/indices/image_lines_count.pl
+++ b/tp/t/results/indices/image_lines_count.pl
@@ -291,7 +291,8 @@ ff
 ';
 
 
-$result_converted{'html_text'}->{'image_lines_count'} = '<span id="Top"></span><h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'image_lines_count'} = '<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
 <img src="count_image.png" alt="count_image">
 
@@ -310,7 +311,7 @@ $result_converted{'html_text'}->{'image_lines_count'} = '<span id="Top"></span><
 <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>
-<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 24b3e146ca..3e2af5933c 100644
--- a/tp/t/results/indices/image_text_lines_count.pl
+++ b/tp/t/results/indices/image_text_lines_count.pl
@@ -290,7 +290,8 @@ ff
 ';
 
 
-$result_converted{'html_text'}->{'image_text_lines_count'} = '<span id="Top"></span><h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'image_text_lines_count'} = '<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
 <img src="count_image_text.jpg" alt="count_image_text">
 
@@ -309,7 +310,7 @@ $result_converted{'html_text'}->{'image_text_lines_count'} = '<span id="Top"></s
 <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>
-<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 18e27c4947..2c38f93041 100644
--- a/tp/t/results/indices/index_entries_locations.pl
+++ b/tp/t/results/indices/index_entries_locations.pl
@@ -543,7 +543,8 @@ $result_converted{'plaintext'}->{'index_entries_locations'} = 'Initial paragraph
 
 
 $result_converted{'html_text'}->{'index_entries_locations'} = '
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
 <p>Initial paragraph.
 </p>
@@ -583,7 +584,7 @@ end paragraph.
 <a class="summary-letter" href="#t_h_cp_letter-L"><b>L</b></a>
  &nbsp; 
 </td></tr></table>
-<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 dbd1398607..9d7f563de7 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 640b11fdca..00a4e72073 100644
--- a/tp/t/results/indices/index_entry_before_node.pl
+++ b/tp/t/results/indices/index_entry_before_node.pl
@@ -750,15 +750,17 @@ $result_converted{'plaintext'}->{'index_entry_before_node'} = 'Para.
 ';
 
 
-$result_converted{'html_text'}->{'index_entry_before_node'} = '<span id="Top"></span><div class="header">
+$result_converted{'html_text'}->{'index_entry_before_node'} = '<div class="node" id="Top">
+<div class="header">
 <p>
  &nbsp; [<a href="#second" title="Index" rel="index">Index</a>]</p>
 </div>
 <h1 class="node-heading">Top</h1>
 
 
-<hr>
-<span id="first"></span><div class="header">
+</div><hr>
+<div class="node" id="first">
+<div class="header">
 <p>
  &nbsp; [<a href="#second" title="Index" rel="index">Index</a>]</p>
 </div>
@@ -768,8 +770,9 @@ $result_converted{'html_text'}->{'index_entry_before_node'} = '<span id="Top"></
 </p>
 <span id="index-lone-entry"></span>
 
-<hr>
-<span id="second"></span><div class="header">
+</div><hr>
+<div class="node" id="second">
+<div class="header">
 <p>
  &nbsp; [<a href="#second" title="Index" rel="index">Index</a>]</p>
 </div>
@@ -788,7 +791,7 @@ $result_converted{'html_text'}->{'index_entry_before_node'} = '<span id="Top"></
 <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>
-<hr>
+</div><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 c00c648831..afbe448b67 100644
--- a/tp/t/results/indices/index_entry_in_footnote.pl
+++ b/tp/t/results/indices/index_entry_in_footnote.pl
@@ -298,7 +298,8 @@ $result_converted{'plaintext'}->{'index_entry_in_footnote'} = 'Top node(1)
 ';
 
 
-$result_converted{'html_text'}->{'index_entry_in_footnote'} = '<span id="Top"></span><h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'index_entry_in_footnote'} = '<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
 <p>Top node<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
@@ -315,7 +316,7 @@ $result_converted{'html_text'}->{'index_entry_in_footnote'} = '<span id="Top"></
 <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 class="footnote">
+</div><div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
@@ -324,7 +325,7 @@ $result_converted{'html_text'}->{'index_entry_in_footnote'} = '<span id="Top"></
 <span id="index-index-entry-in-footnote"></span>
 </p>
 </div>
-<hr>
+<hr></div>
 ';
 
 1;
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 143cfe9247..4721d482cf 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,7 +654,8 @@ $result_converted{'plaintext'}->{'index_entry_in_footnote_different_node_end'} =
 ';
 
 
-$result_converted{'html_text'}->{'index_entry_in_footnote_different_node_end'} = '<span id="Top"></span><div class="header">
+$result_converted{'html_text'}->{'index_entry_in_footnote_different_node_end'} = '<div class="node" id="Top">
+<div class="header">
 <p>
  &nbsp; [<a href="#First" title="Index" rel="index">Index</a>]</p>
 </div>
@@ -663,8 +664,9 @@ $result_converted{'html_text'}->{'index_entry_in_footnote_different_node_end'} =
 
 <p>Top node<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
-<hr>
-<span id="First"></span><div class="header">
+</div><hr>
+<div class="node" id="First">
+<div class="header">
 <p>
  &nbsp; [<a href="#First" title="Index" rel="index">Index</a>]</p>
 </div>
@@ -690,7 +692,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 class="footnote">
+</div><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 5a19644275..8ce3d7f74d 100644
--- a/tp/t/results/indices/index_entry_in_footnote_separate.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_separate.pl
@@ -690,7 +690,8 @@ $result_converted{'plaintext'}->{'index_entry_in_footnote_separate'} = 'Top node
 ';
 
 
-$result_converted{'html_text'}->{'index_entry_in_footnote_separate'} = '<span id="Top"></span><div class="header">
+$result_converted{'html_text'}->{'index_entry_in_footnote_separate'} = '<div class="node" id="Top">
+<div class="header">
 <p>
  &nbsp; [<a href="#First" title="Index" rel="index">Index</a>]</p>
 </div>
@@ -699,8 +700,9 @@ $result_converted{'html_text'}->{'index_entry_in_footnote_separate'} = '<span id
 
 <p>Top node<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
-<hr>
-<span id="First"></span><div class="header">
+</div><hr>
+<div class="node" id="First">
+<div class="header">
 <p>
  &nbsp; [<a href="#First" title="Index" rel="index">Index</a>]</p>
 </div>
@@ -726,7 +728,7 @@ $result_converted{'html_text'}->{'index_entry_in_footnote_separate'} = '<span id
 <a class="summary-letter" href="#t_h_cp_letter-I"><b>I</b></a>
  &nbsp; 
 </td></tr></table>
-<hr>
+</div><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 bfbc14fc49..4ca16f0af5 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -1407,11 +1407,13 @@ xftable xitem
 
 
 $result_converted{'html_text'}->{'printindex_index_entry_in_copying'} = '
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
  &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
 </div>
-<span id="top"></span><h1 class="top">top</h1>
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 <p>Top.
 </p>
@@ -1463,12 +1465,14 @@ $result_converted{'html_text'}->{'printindex_index_entry_in_copying'} = '
 <ul class="section-toc">
 <li><a href="#chapter" accesskey="1">Chapter</a></li>
 </ul>
-<hr>
-<span id="chapter"></span><div class="header">
+</div><hr>
+<div class="chapter" id="chapter">
+<div class="header">
 <p>
  &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
 </div>
-<span id="Chapter"></span><h2 class="chapter">1 Chapter</h2>
+<div class="node" id="Chapter">
+<h2 class="chapter">1 Chapter</h2>
 
 
 <span id="index-copying-Copying-this-document"></span>
@@ -1545,7 +1549,7 @@ $result_converted{'html_text'}->{'printindex_index_entry_in_copying'} = '
  &nbsp; 
 </td></tr></table>
 
-<hr>
+</div><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 3ec9bb71b3..58e256695e 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
@@ -890,11 +890,13 @@ Copying(1).
 
 
 $result_converted{'html_text'}->{'printindex_index_entry_in_copying_in_footnote'} = '
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
  &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
 </div>
-<span id="top"></span><h1 class="top">top</h1>
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 <p>Top.
 </p>
@@ -919,12 +921,14 @@ $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>
-<hr>
-<span id="chapter"></span><div class="header">
+</div><hr>
+<div class="chapter" id="chapter">
+<div class="header">
 <p>
  &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
 </div>
-<span id="Chapter"></span><h2 class="chapter">1 Chapter</h2>
+<div class="node" id="Chapter">
+<h2 class="chapter">1 Chapter</h2>
 
 
 <p>Copying<a id="DOCF1_2" href="#FOOT1_2"><sup>2</sup></a>.
@@ -944,7 +948,7 @@ $result_converted{'html_text'}->{'printindex_index_entry_in_copying_in_footnote'
 </td></tr></table>
 
 
-<div class="footnote">
+</div><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 a5e6d5279c..a79430538a 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
@@ -1295,11 +1295,13 @@ Top.
 
 
 $result_converted{'html_text'}->{'printindex_index_entry_in_copying_no_insertcopying'} = '
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
-<span id="top"></span><h1 class="top">top</h1>
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 <p>Top.
 </p>
@@ -1307,12 +1309,14 @@ $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>
-<hr>
-<span id="chapter"></span><div class="header">
+</div><hr>
+<div class="chapter" id="chapter">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
-<span id="Chapter"></span><h2 class="chapter">1 Chapter</h2>
+<div class="node" id="Chapter">
+<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>
@@ -1345,7 +1349,7 @@ $result_converted{'html_text'}->{'printindex_index_entry_in_copying_no_insertcop
  &nbsp; 
 </td></tr></table>
 
-<hr>
+</div><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 105888ce08..c6b865ed85 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 33d6e0c822..eb37aaccc9 100644
--- a/tp/t/results/indices/same_index_entry_merged_indices.pl
+++ b/tp/t/results/indices/same_index_entry_merged_indices.pl
@@ -740,7 +740,9 @@ $result_converted{'plaintext'}->{'same_index_entry_merged_indices'} = 'Text.
 
 
 $result_converted{'html_text'}->{'same_index_entry_merged_indices'} = '
-<span id="Top"></span><span id="SEC_Top"></span>
+<div class="top" id="Top">
+<div class="node" id="SEC_Top">
+
 <p>Text.
 </p>
 <dl class="def">
@@ -767,7 +769,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>
-<hr>
+</div><hr></div>
 ';
 
 1;
diff --git a/tp/t/results/indices/seealso_duplicate.pl b/tp/t/results/indices/seealso_duplicate.pl
index cc78837cb4..be1075aa91 100644
--- a/tp/t/results/indices/seealso_duplicate.pl
+++ b/tp/t/results/indices/seealso_duplicate.pl
@@ -446,7 +446,8 @@ $result_converted{'plaintext'}->{'seealso_duplicate'} = '* Menu:
 ';
 
 
-$result_converted{'html_text'}->{'seealso_duplicate'} = '<span id="Top"></span><h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'seealso_duplicate'} = '<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
 <span id="index-awk"></span>
 <span id="index-awk-1"></span>
@@ -465,7 +466,7 @@ $result_converted{'html_text'}->{'seealso_duplicate'} = '<span id="Top"></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>
  &nbsp; 
 </td></tr></table>
-<hr>
+</div><hr></div>
 ';
 
 1;
diff --git a/tp/t/results/indices/seeentry.pl b/tp/t/results/indices/seeentry.pl
index 666c144bcc..c94a6def71 100644
--- a/tp/t/results/indices/seeentry.pl
+++ b/tp/t/results/indices/seeentry.pl
@@ -345,8 +345,10 @@ End:
 $result_converted{'plaintext'}->{'seeentry'} = '';
 
 
-$result_converted{'html_text'}->{'seeentry'} = '<span id="Top"></span><span id="SEC_Top"></span>
-<hr>
+$result_converted{'html_text'}->{'seeentry'} = '<div class="top" id="Top">
+<div class="node" id="SEC_Top">
+
+</div><hr></div>
 ';
 
 1;
diff --git a/tp/t/results/indices/subentries.pl b/tp/t/results/indices/subentries.pl
index 1fb4d75143..c0bc3e9f4a 100644
--- a/tp/t/results/indices/subentries.pl
+++ b/tp/t/results/indices/subentries.pl
@@ -653,7 +653,9 @@ $result_converted{'plaintext'}->{'subentries'} = '* Menu:
 ';
 
 
-$result_converted{'html_text'}->{'subentries'} = '<span id="Top"></span><span id="SEC_Top"></span>
+$result_converted{'html_text'}->{'subentries'} = '<div class="top" id="Top">
+<div class="node" id="SEC_Top">
+
 <span id="index-aa"></span>
 <span id="index-bb"></span>
 <span id="index-ddd"></span>
@@ -693,7 +695,7 @@ $result_converted{'html_text'}->{'subentries'} = '<span id="Top"></span><span id
 <a class="summary-letter" href="#t_h_cp_letter-G"><b>G</b></a>
  &nbsp; 
 </td></tr></table>
-<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 650e97ccb4..43dfd6e691 100644
--- a/tp/t/results/indices/subentry_and_sortas.pl
+++ b/tp/t/results/indices/subentry_and_sortas.pl
@@ -402,7 +402,9 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><span id="SEC_Top"></span>
+<div class="top" id="Top">
+<div class="node" id="SEC_Top">
+
 <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>
@@ -418,7 +420,8 @@ 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>
-<hr>
+</div><hr></div>
+</div>
 
 
 
@@ -468,7 +471,9 @@ $result_converted{'plaintext'}->{'subentry_and_sortas'} = '* Menu:
 ';
 
 
-$result_converted{'html_text'}->{'subentry_and_sortas'} = '<span id="Top"></span><span id="SEC_Top"></span>
+$result_converted{'html_text'}->{'subentry_and_sortas'} = '<div class="top" id="Top">
+<div class="node" id="SEC_Top">
+
 <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>
@@ -484,7 +489,7 @@ $result_converted{'html_text'}->{'subentry_and_sortas'} = '<span id="Top"></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>
  &nbsp; 
 </td></tr></table>
-<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 c74f0777e8..3ff04a6514 100644
--- a/tp/t/results/indices/syncode_index_print_both.pl
+++ b/tp/t/results/indices/syncode_index_print_both.pl
@@ -504,7 +504,8 @@ $result_converted{'plaintext'}->{'syncode_index_print_both'} = 'Print fn
 
 
 $result_converted{'html_text'}->{'syncode_index_print_both'} = '
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
 <span id="index-c_002d_002d_002doncept"></span>
 <span id="index-f_002d_002d_002dun"></span>
@@ -536,7 +537,7 @@ $result_converted{'html_text'}->{'syncode_index_print_both'} = '
  &nbsp; 
 </td></tr></table>
 
-<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 4c414fc48f..e5885f3a2f 100644
--- a/tp/t/results/indices/syncodeindex_to_plain.pl
+++ b/tp/t/results/indices/syncodeindex_to_plain.pl
@@ -516,7 +516,8 @@ $result_converted{'plaintext'}->{'syncodeindex_to_plain'} = 'cp index.
 
 
 $result_converted{'html_text'}->{'syncodeindex_to_plain'} = '
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
 <span id="index-_002d_002dk1"></span>
 <span id="index-_002d_002dv"></span>
@@ -548,7 +549,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>
-<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 459f297420..d445bb61aa 100644
--- a/tp/t/results/indices/transparent_sort_chars.pl
+++ b/tp/t/results/indices/transparent_sort_chars.pl
@@ -473,7 +473,9 @@ $result_converted{'plaintext'}->{'transparent_sort_chars'} = '* Menu:
 
 
 $result_converted{'html_text'}->{'transparent_sort_chars'} = '
-<span id="Top"></span><span id="SEC_Top"></span>
+<div class="top" id="Top">
+<div class="node" id="SEC_Top">
+
 <span id="index-_002d_002dversion_002c-for-install_002dinfo"></span>
 <span id="index-Source-file-format"></span>
 <span id="index-Semantic-markup"></span>
@@ -499,7 +501,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>
-<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 83b5952fa7..26386f8ff9 100644
--- a/tp/t/results/indices/w_lines_count.pl
+++ b/tp/t/results/indices/w_lines_count.pl
@@ -439,7 +439,9 @@ $result_converted{'plaintext'}->{'w_lines_count'} = 'xzcompilationxdmbufferxmsub
 ';
 
 
-$result_converted{'html_text'}->{'w_lines_count'} = '<span id="Top"></span><span id="SEC_Top"></span>
+$result_converted{'html_text'}->{'w_lines_count'} = '<div class="top" id="Top">
+<div class="node" id="SEC_Top">
+
 <p>xzcompilationxdmbufferxmsubsequentmxCtxaxxmcommandsmadvancemfrommthere.  
 <code><span class="nolinebreak">C-u</span></code><!-- /@w --> starts again from the beginning
 </p>
@@ -459,7 +461,7 @@ $result_converted{'html_text'}->{'w_lines_count'} = '<span id="Top"></span><span
 <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>
-<hr>
+</div><hr></div>
 ';
 
 1;
diff --git a/tp/t/results/languages/appendix_translated.pl b/tp/t/results/languages/appendix_translated.pl
index 4862e495cc..89558d6301 100644
--- a/tp/t/results/languages/appendix_translated.pl
+++ b/tp/t/results/languages/appendix_translated.pl
@@ -367,7 +367,9 @@ ul.no-bullet {list-style: none}
 
 <body lang="fr">
 
-<span id="Top"></span><span id="top"></span><h1 class="top">top</h1>
+<div class="top" id="Top">
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 <span id="SEC_Contents"></span>
 <h2 class="contents-heading">Table des mati&egrave;res</h2>
@@ -379,9 +381,11 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 
-<span id="dernier"></span><h2 class="appendix">Annexe A dernier</h2>
+</div><div class="appendix" id="dernier">
+<h2 class="appendix">Annexe A dernier</h2>
 
-<hr>
+</div><hr></div>
+</div>
 
 
 
diff --git a/tp/t/results/languages/command_translated.pl b/tp/t/results/languages/command_translated.pl
index cab04d665d..5c0732e00f 100644
--- a/tp/t/results/languages/command_translated.pl
+++ b/tp/t/results/languages/command_translated.pl
@@ -330,10 +330,13 @@ ul.no-bullet {list-style: none}
 
 <body lang="fr">
 
-<span id="Top"></span><span id="top-error_002d_002d_003e"></span><h1 class="top">top erreur&rarr;</h1>
+<div class="top" id="Top">
+<div class="node" id="top-error_002d_002d_003e">
+<h1 class="top">top erreur&rarr;</h1>
 
 <p>erreur&rarr;
-</p><hr>
+</p></div><hr></div>
+</div>
 
 
 
diff --git a/tp/t/results/languages/multiple.pl b/tp/t/results/languages/multiple.pl
index cd7394065d..edbb7b40df 100644
--- a/tp/t/results/languages/multiple.pl
+++ b/tp/t/results/languages/multiple.pl
@@ -973,7 +973,8 @@ ul.no-bullet {list-style: none}
 <body lang="pt">
 
 
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<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>
@@ -991,7 +992,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>
-<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 925fe046f8..23840cec53 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
@@ -36,11 +36,13 @@ ul.no-bullet {list-style: none}
 
 <body lang="pt_BR">
 
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Pr&oacute;ximo: <a href="#chapter-ja" accesskey="n" rel="next">ja</a> &nbsp; </p>
 </div>
-<span id="Multi-language-file"></span><h1 class="top">Multi language file</h1>
+<div class="node" id="Multi-language-file">
+<h1 class="top">Multi language file</h1>
 
 
 <ul class="section-toc">
@@ -50,57 +52,73 @@ 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>
-<hr>
-<span id="chapter-ja"></span><div class="header">
+</div><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>
-<span id="ja"></span><h2 class="chapter">1 ja</h2>
+<div class="node" id="ja">
+<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>
 
-<hr>
-<span id="chapter-en"></span><div class="header">
+</div><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>
-<span id="en"></span><h2 class="chapter">2 en</h2>
+<div class="node" id="en">
+<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>
 
-<hr>
-<span id="chapter-fr_005fFR"></span><div class="header">
+</div><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>
-<span id="fr_005fFR"></span><h2 class="chapter">3 fr_FR</h2>
+<div class="node" id="fr_005fFR">
+<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>
 
-<hr>
-<span id="chapter-de"></span><div class="header">
+</div><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>
-<span id="de"></span><h2 class="chapter">4 de</h2>
+<div class="node" id="de">
+<h2 class="chapter">4 de</h2>
 
-<hr>
-<span id="chapter-pt_005fBR"></span><div class="header">
+</div><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>
-<span id="pt_005fbR"></span><h2 class="chapter">5 pt_bR</h2>
+<div class="node" id="pt_005fbR">
+<h2 class="chapter">5 pt_bR</h2>
 
 <p>In brazilian. Veja <a href="#Top">Multi language file</a>.
-</p><hr>
+</p></div><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 473566e320..80c2334920 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="pt_BR">
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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-ja" title="Pr&oacute;xima se&ccedil;&atilde;o na ordem de leitura"> &gt; </a>]</td>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -42,7 +43,8 @@ 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>
-<span id="Multi-language-file"></span><h1 class="top">Multi language file</h1>
+<div class="node" id="Multi-language-file">
+<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">
@@ -57,8 +59,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="chapter-ja"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -73,15 +76,18 @@ 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>
-<span id="ja"></span><h1 class="chapter">1 ja</h1>
+<div class="node" id="ja">
+<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>
 
-<hr>
-<span id="chapter-en"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+</div>
+<div class="chapter" id="chapter-en">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter-ja" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter-ja" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Up section"> Up </a>]</td>
@@ -96,15 +102,18 @@ 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>
-<span id="en"></span><h1 class="chapter">2 en</h1>
+<div class="node" id="en">
+<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>
 
-<hr>
-<span id="chapter-fr_005fFR"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+</div>
+<div class="chapter" id="chapter-fr_005fFR">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter-en" title="D&eacute;but de ce chapitre ou chapitre pr&eacute;c&eacute;dent"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter-en" title="Section pr&eacute;c&eacute;dente dans l&rsquo;ordre de lecture"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Section sup&eacute;rieure">Plus haut</a>]</td>
@@ -119,14 +128,17 @@ 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>
-<span id="fr_005fFR"></span><h1 class="chapter">3 fr_FR</h1>
+<div class="node" id="fr_005fFR">
+<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>
 
-<hr>
-<span id="chapter-de"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+</div>
+<div class="chapter" id="chapter-de">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter-fr_005fFR" title="Anfang dieses oder des letzten Kapitels"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter-fr_005fFR" title="Voriger Abschnitt in Lesereihenfolge"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Abschnitt nach oben"> Nach oben </a>]</td>
@@ -141,10 +153,13 @@ 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>
-<span id="de"></span><h1 class="chapter">4 de</h1>
+<div class="node" id="de">
+<h1 class="chapter">4 de</h1>
 
-<hr>
-<span id="chapter-pt_005fBR"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+</div>
+<div class="chapter" id="chapter-pt_005fBR">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter-de" title="Come&ccedil;o desse cap&iacute;tulo ou cap&iacute;tulo anterior"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter-de" title="Se&ccedil;&atilde;o anterior na ordem de leitura"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Se&ccedil;&atilde;o acima"> Acima </a>]</td>
@@ -159,11 +174,14 @@ 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>
-<span id="pt_005fbR"></span><h1 class="chapter">5 pt_bR</h1>
+<div class="node" id="pt_005fbR">
+<h1 class="chapter">5 pt_bR</h1>
 
 <p>In brazilian. Veja <a href="#Top">Multi language file</a>.
-</p><hr size="6">
-<span id="SEC_About"></span>
+</p></div><hr size="6">
+</div>
+</div>
+<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="In&iacute;cio (topo) do documento">Topo</a>]</td>
 <td valign="middle" align="left">[Conte&uacute;do]</td>
@@ -272,7 +290,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <p><font size="-1">
   Esse documento foi gerado em <em>a sunny day</em>.
 </font></p>
diff --git a/tp/t/results/languages/unknown_language.pl b/tp/t/results/languages/unknown_language.pl
index aa83a30ac5..08c4c4e716 100644
--- a/tp/t/results/languages/unknown_language.pl
+++ b/tp/t/results/languages/unknown_language.pl
@@ -472,13 +472,16 @@ ul.no-bullet {list-style: none}
 
 <body lang="another_UNKNOWN">
 
-<span id="Top"></span><span id="unknkown-language"></span><h1 class="top">unknkown language</h1>
+<div class="top" id="Top">
+<div class="node" id="unknkown-language">
+<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><hr>
+</p></div><hr></div>
+</div>
 
 
 
diff --git a/tp/t/results/languages/unknown_region.pl b/tp/t/results/languages/unknown_region.pl
index 50a4110afb..7f2bbf0974 100644
--- a/tp/t/results/languages/unknown_region.pl
+++ b/tp/t/results/languages/unknown_region.pl
@@ -408,12 +408,13 @@ ul.no-bullet {list-style: none}
 
 <body lang="fr_NOWHERE">
 
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<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>
-<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 868b1bf061..c1c96547de 100644
--- a/tp/t/results/layout/navigation/res_html/navigation.html
+++ b/tp/t/results/layout/navigation/res_html/navigation.html
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -43,15 +44,17 @@ 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>
-<span id="File-used-for-navigation-testing"></span><h1 class="top">File used for navigation testing</h1>
+<div class="node" id="File-used-for-navigation-testing">
+<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>
 
-<hr size="6">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -66,15 +69,17 @@ 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>
-<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
+<div class="node" id="First-chapter">
+<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>
 
-<hr>
-<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Up section"> Up </a>]</td>
@@ -89,7 +94,8 @@ 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>
-<span id="Section-in-chapter"></span><h2 class="section">1.1 Section in chapter</h2>
+<div class="node" id="Section-in-chapter">
+<h2 class="section">1.1 Section in chapter</h2>
 
 <p>AAAA
 </p>
@@ -123,8 +129,9 @@ 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>
 
-<hr>
-<span id="subsection"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#section" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#section" title="Up section"> Up </a>]</td>
@@ -139,11 +146,16 @@ 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>
-<span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub section in section</h3>
+<div class="node" id="Sub-section-in-section">
+<h3 class="subsection">1.1.1 Sub section in section</h3>
 
 
-<hr size="6">
-<span id="SEC_Contents"></span>
+</div><hr size="6">
+</div>
+</div>
+</div>
+</div>
+<div class="Contents_element" id="SEC_Contents">
 <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>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -164,8 +176,8 @@ 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.
   </ul></li>
 </ul>
 </div>
-<hr>
-<span id="SEC_About"></span>
+</div><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>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -274,7 +286,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.
   </li>
 </ul>
 
-<hr>
+</div><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/layout/navigation_chapter/res_html/chapter.html b/tp/t/results/layout/navigation_chapter/res_html/chapter.html
index 7e24b1ffd6..68de709305 100644
--- a/tp/t/results/layout/navigation_chapter/res_html/chapter.html
+++ b/tp/t/results/layout/navigation_chapter/res_html/chapter.html
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="chapter">
+<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>
@@ -49,15 +50,17 @@ 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>
-<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
+<div class="node" id="First-chapter">
+<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>
 
-<hr>
-<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Up section"> Up </a>]</td>
@@ -72,7 +75,8 @@ 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>
-<span id="Section-in-chapter"></span><h2 class="section">1.1 Section in chapter</h2>
+<div class="node" id="Section-in-chapter">
+<h2 class="section">1.1 Section in chapter</h2>
 
 <p>AAAA
 </p>
@@ -106,8 +110,9 @@ 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>
 
-<hr>
-<span id="subsection"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#section" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#section" title="Up section"> Up </a>]</td>
@@ -122,10 +127,11 @@ 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>
-<span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub section in section</h3>
+<div class="node" id="Sub-section-in-section">
+<h3 class="subsection">1.1.1 Sub section in section</h3>
 
 
-<hr>
+</div><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>
@@ -139,6 +145,9 @@ 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>
+</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_chapter/res_html/index.html b/tp/t/results/layout/navigation_chapter/res_html/index.html
index 9e1a8a9a48..53301cc10b 100644
--- a/tp/t/results/layout/navigation_chapter/res_html/index.html
+++ b/tp/t/results/layout/navigation_chapter/res_html/index.html
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -43,14 +44,15 @@ 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>
-<span id="File-used-for-navigation-testing"></span><h1 class="top">File used for navigation testing</h1>
+<div class="node" id="File-used-for-navigation-testing">
+<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>
 
-<hr>
+</div><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>
@@ -59,6 +61,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>
 <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_chapter/res_html/navigation_abt.html b/tp/t/results/layout/navigation_chapter/res_html/navigation_abt.html
index 8f1d88d97b..fa1d009d0d 100644
--- a/tp/t/results/layout/navigation_chapter/res_html/navigation_abt.html
+++ b/tp/t/results/layout/navigation_chapter/res_html/navigation_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -143,7 +143,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/t/results/layout/navigation_chapter/res_html/navigation_toc.html b/tp/t/results/layout/navigation_chapter/res_html/navigation_toc.html
index de54930d52..c320dd7c42 100644
--- a/tp/t/results/layout/navigation_chapter/res_html/navigation_toc.html
+++ b/tp/t/results/layout/navigation_chapter/res_html/navigation_toc.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -55,7 +55,7 @@ ul.no-bullet {list-style: none}
   </ul></li>
 </ul>
 </div>
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</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 34cfb31237..0293854c4b 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="chapter">
+<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>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -48,15 +49,18 @@ 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>
-<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
+<div class="node" id="First-chapter">
+<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>
 
-<hr>
-<span id="section"></span><span id="Section-in-chapter"></span><h2 class="section">1.1 Section in chapter</h2>
+</div><hr>
+<div class="section" id="section">
+<div class="node" id="Section-in-chapter">
+<h2 class="section">1.1 Section in chapter</h2>
 
 <p>AAAA
 </p>
@@ -90,11 +94,13 @@ 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>
 
-<hr>
-<span id="subsection"></span><span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub section in section</h3>
+</div><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>
 
 
-<hr>
+</div><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>
@@ -108,6 +114,9 @@ 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>
+</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_chapter_no_header/res_html/index.html b/tp/t/results/layout/navigation_chapter_no_header/res_html/index.html
index 9e1a8a9a48..53301cc10b 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
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -43,14 +44,15 @@ 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>
-<span id="File-used-for-navigation-testing"></span><h1 class="top">File used for navigation testing</h1>
+<div class="node" id="File-used-for-navigation-testing">
+<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>
 
-<hr>
+</div><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>
@@ -59,6 +61,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>
 <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_chapter_no_header/res_html/navigation_abt.html b/tp/t/results/layout/navigation_chapter_no_header/res_html/navigation_abt.html
index 8f1d88d97b..fa1d009d0d 100644
--- a/tp/t/results/layout/navigation_chapter_no_header/res_html/navigation_abt.html
+++ b/tp/t/results/layout/navigation_chapter_no_header/res_html/navigation_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -143,7 +143,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/t/results/layout/navigation_chapter_no_header/res_html/navigation_toc.html b/tp/t/results/layout/navigation_chapter_no_header/res_html/navigation_toc.html
index de54930d52..c320dd7c42 100644
--- a/tp/t/results/layout/navigation_chapter_no_header/res_html/navigation_toc.html
+++ b/tp/t/results/layout/navigation_chapter_no_header/res_html/navigation_toc.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -55,7 +55,7 @@ ul.no-bullet {list-style: none}
   </ul></li>
 </ul>
 </div>
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</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 e1aa156ef3..bbe837d723 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="chapter"></span><table border="0" cellpadding="0" cellspacing="0">
+<div class="chapter" id="chapter">
+<table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -74,15 +75,18 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
+<div class="node" id="First-chapter">
+<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>
 
-<hr>
-<span id="section"></span><span id="Section-in-chapter"></span><h2 class="section">1.1 Section in chapter</h2>
+</div><hr>
+<div class="section" id="section">
+<div class="node" id="Section-in-chapter">
+<h2 class="section">1.1 Section in chapter</h2>
 
 <p>AAAA
 </p>
@@ -116,11 +120,13 @@ 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>
 
-<hr>
-<span id="subsection"></span><span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub section in section</h3>
+</div><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>
 
 
-</td>
+</div></td>
 </tr>
 </table>
 <hr>
@@ -137,6 +143,9 @@ 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>
+</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_chapter_no_header_vertical/res_html/index.html b/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/index.html
index bb8d639f12..698284f66d 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
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table border="0" cellpadding="0" cellspacing="0">
+<div class="top" id="Top">
+<table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -60,14 +61,15 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<span id="File-used-for-navigation-testing"></span><h1 class="top">File used for navigation testing</h1>
+<div class="node" id="File-used-for-navigation-testing">
+<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>
 
-</td>
+</div></td>
 </tr>
 </table>
 <hr>
@@ -79,6 +81,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>
 <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_chapter_no_header_vertical/res_html/navigation_abt.html b/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/navigation_abt.html
index 4d52c7453d..f98dfedadb 100644
--- a/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/navigation_abt.html
+++ b/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/navigation_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
@@ -156,7 +156,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-</td>
+</div></td>
 </tr>
 </table>
 <hr>
diff --git a/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/navigation_toc.html b/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/navigation_toc.html
index 341a25b002..5210ef089f 100644
--- a/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/navigation_toc.html
+++ b/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/navigation_toc.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
@@ -68,7 +68,7 @@ ul.no-bullet {list-style: none}
   </ul></li>
 </ul>
 </div>
-</td>
+</div></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 9061119e8a..3214db7c19 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="chapter"></span><table border="0" cellpadding="0" cellspacing="0">
+<div class="chapter" id="chapter">
+<table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -80,15 +81,17 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
+<div class="node" id="First-chapter">
+<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>
 
-<hr>
-<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Up section"> Up </a>]</td>
@@ -103,7 +106,8 @@ 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>
-<span id="Section-in-chapter"></span><h2 class="section">1.1 Section in chapter</h2>
+<div class="node" id="Section-in-chapter">
+<h2 class="section">1.1 Section in chapter</h2>
 
 <p>AAAA
 </p>
@@ -137,8 +141,9 @@ 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>
 
-<hr>
-<span id="subsection"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#section" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#section" title="Up section"> Up </a>]</td>
@@ -153,10 +158,11 @@ 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>
-<span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub section in section</h3>
+<div class="node" id="Sub-section-in-section">
+<h3 class="subsection">1.1.1 Sub section in section</h3>
 
 
-</td>
+</div></td>
 </tr>
 </table>
 <hr>
@@ -173,6 +179,9 @@ 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>
+</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_chapter_vertical/res_html/index.html b/tp/t/results/layout/navigation_chapter_vertical/res_html/index.html
index bb8d639f12..698284f66d 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
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table border="0" cellpadding="0" cellspacing="0">
+<div class="top" id="Top">
+<table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -60,14 +61,15 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<span id="File-used-for-navigation-testing"></span><h1 class="top">File used for navigation testing</h1>
+<div class="node" id="File-used-for-navigation-testing">
+<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>
 
-</td>
+</div></td>
 </tr>
 </table>
 <hr>
@@ -79,6 +81,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>
 <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_chapter_vertical/res_html/navigation_abt.html b/tp/t/results/layout/navigation_chapter_vertical/res_html/navigation_abt.html
index 4d52c7453d..f98dfedadb 100644
--- a/tp/t/results/layout/navigation_chapter_vertical/res_html/navigation_abt.html
+++ b/tp/t/results/layout/navigation_chapter_vertical/res_html/navigation_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
@@ -156,7 +156,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-</td>
+</div></td>
 </tr>
 </table>
 <hr>
diff --git a/tp/t/results/layout/navigation_chapter_vertical/res_html/navigation_toc.html b/tp/t/results/layout/navigation_chapter_vertical/res_html/navigation_toc.html
index 341a25b002..5210ef089f 100644
--- a/tp/t/results/layout/navigation_chapter_vertical/res_html/navigation_toc.html
+++ b/tp/t/results/layout/navigation_chapter_vertical/res_html/navigation_toc.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
@@ -68,7 +68,7 @@ ul.no-bullet {list-style: none}
   </ul></li>
 </ul>
 </div>
-</td>
+</div></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 caad493cd9..04e0773644 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
@@ -35,23 +35,29 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><span id="File-used-for-navigation-testing"></span><h1 class="top">File used for navigation testing</h1>
+<div class="top" id="Top">
+<div class="node" id="File-used-for-navigation-testing">
+<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>
 
-<hr size="6">
-<span id="chapter"></span><span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
+</div><hr size="6">
+<div class="chapter" id="chapter">
+<div class="node" id="First-chapter">
+<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>
 
-<hr>
-<span id="section"></span><span id="Section-in-chapter"></span><h2 class="section">1.1 Section in chapter</h2>
+</div><hr>
+<div class="section" id="section">
+<div class="node" id="Section-in-chapter">
+<h2 class="section">1.1 Section in chapter</h2>
 
 <p>AAAA
 </p>
@@ -85,12 +91,18 @@ 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>
 
-<hr>
-<span id="subsection"></span><span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub section in section</h3>
+</div><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>
 
 
-<hr size="6">
-<span id="SEC_Contents"></span>
+</div><hr size="6">
+</div>
+</div>
+</div>
+</div>
+<div class="Contents_element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
 <div class="contents">
@@ -105,7 +117,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.
   </ul></li>
 </ul>
 </div>
-<hr>
+</div><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/layout/navigation_no_header_vertical/res_html/navigation.html b/tp/t/results/layout/navigation_no_header_vertical/res_html/navigation.html
index d036ec9737..7231276841 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
@@ -35,26 +35,32 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><span id="File-used-for-navigation-testing"></span><h1 class="top">File used for navigation testing</h1>
+<div class="top" id="Top">
+<div class="node" id="File-used-for-navigation-testing">
+<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>
 
-</td>
+</div></td>
 </tr>
 </table>
 <hr size="6">
-<span id="chapter"></span><span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
+<div class="chapter" id="chapter">
+<div class="node" id="First-chapter">
+<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>
 
-<hr>
-<span id="section"></span><span id="Section-in-chapter"></span><h2 class="section">1.1 Section in chapter</h2>
+</div><hr>
+<div class="section" id="section">
+<div class="node" id="Section-in-chapter">
+<h2 class="section">1.1 Section in chapter</h2>
 
 <p>AAAA
 </p>
@@ -88,15 +94,21 @@ 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>
 
-<hr>
-<span id="subsection"></span><span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub section in section</h3>
+</div><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>
 
 
-</td>
+</div></td>
 </tr>
 </table>
 <hr size="6">
-<span id="SEC_Contents"></span>
+</div>
+</div>
+</div>
+</div>
+<div class="Contents_element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
 <div class="contents">
@@ -111,7 +123,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.
   </ul></li>
 </ul>
 </div>
-</td>
+</div></td>
 </tr>
 </table>
 <hr>
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 1067101c8c..03e9862c03 100644
--- a/tp/t/results/layout/navigation_node/res_html/chapter.html
+++ b/tp/t/results/layout/navigation_node/res_html/chapter.html
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="chapter">
+<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>
@@ -50,14 +51,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>
-<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
+<div class="node" id="First-chapter">
+<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>
 
-<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/layout/navigation_node/res_html/index.html b/tp/t/results/layout/navigation_node/res_html/index.html
index 33f9c5ff78..2b3f4a2234 100644
--- a/tp/t/results/layout/navigation_node/res_html/index.html
+++ b/tp/t/results/layout/navigation_node/res_html/index.html
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -44,14 +45,15 @@ 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>
-<span id="File-used-for-navigation-testing"></span><h1 class="top">File used for navigation testing</h1>
+<div class="node" id="File-used-for-navigation-testing">
+<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>
 
-<hr>
+</div><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>
@@ -60,6 +62,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>
 <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/res_html/navigation_abt.html b/tp/t/results/layout/navigation_node/res_html/navigation_abt.html
index b6c9d9becb..10a03653c7 100644
--- a/tp/t/results/layout/navigation_node/res_html/navigation_abt.html
+++ b/tp/t/results/layout/navigation_node/res_html/navigation_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -144,7 +144,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/t/results/layout/navigation_node/res_html/navigation_toc.html b/tp/t/results/layout/navigation_node/res_html/navigation_toc.html
index 2300bb182a..208c42d5d2 100644
--- a/tp/t/results/layout/navigation_node/res_html/navigation_toc.html
+++ b/tp/t/results/layout/navigation_node/res_html/navigation_toc.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -56,7 +56,7 @@ ul.no-bullet {list-style: none}
   </ul></li>
 </ul>
 </div>
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</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 98d5e79e94..b2193cda14 100644
--- a/tp/t/results/layout/navigation_node/res_html/section.html
+++ b/tp/t/results/layout/navigation_node/res_html/section.html
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<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>
 <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>
@@ -50,7 +51,8 @@ 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>
-<span id="Section-in-chapter"></span><h2 class="section">1.1 Section in chapter</h2>
+<div class="node" id="Section-in-chapter">
+<h2 class="section">1.1 Section in chapter</h2>
 
 <p>AAAA
 </p>
@@ -84,7 +86,8 @@ 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>
 
-<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/layout/navigation_node/res_html/subsection.html b/tp/t/results/layout/navigation_node/res_html/subsection.html
index 326f85d7e8..3920601db0 100644
--- a/tp/t/results/layout/navigation_node/res_html/subsection.html
+++ b/tp/t/results/layout/navigation_node/res_html/subsection.html
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="subsection"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<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>
 <td valign="middle" align="left">[<a href="section.html" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="section.html" title="Up section"> Up </a>]</td>
@@ -50,10 +51,12 @@ 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>
-<span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub section in section</h3>
+<div class="node" id="Sub-section-in-section">
+<h3 class="subsection">1.1.1 Sub section in section</h3>
 
 
-<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/layout/navigation_node_no_header/res_html/chapter.html b/tp/t/results/layout/navigation_node_no_header/res_html/chapter.html
index 583b13064a..77bcb2cfcf 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="chapter">
+<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>
@@ -49,13 +50,15 @@ 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>
-<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
+<div class="node" id="First-chapter">
+<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>
 <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 4e69fc7525..ad0c6c753d 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
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -44,14 +45,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>
-<span id="File-used-for-navigation-testing"></span><h1 class="top">File used for navigation testing</h1>
+<div class="node" id="File-used-for-navigation-testing">
+<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>
 
-<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/layout/navigation_node_no_header/res_html/navigation_abt.html b/tp/t/results/layout/navigation_node_no_header/res_html/navigation_abt.html
index 2111633d1c..879516c3ca 100644
--- a/tp/t/results/layout/navigation_node_no_header/res_html/navigation_abt.html
+++ b/tp/t/results/layout/navigation_node_no_header/res_html/navigation_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -144,7 +144,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/layout/navigation_node_no_header/res_html/navigation_toc.html b/tp/t/results/layout/navigation_node_no_header/res_html/navigation_toc.html
index e8da55bcd3..48d476a1e9 100644
--- a/tp/t/results/layout/navigation_node_no_header/res_html/navigation_toc.html
+++ b/tp/t/results/layout/navigation_node_no_header/res_html/navigation_toc.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -56,7 +56,7 @@ ul.no-bullet {list-style: none}
   </ul></li>
 </ul>
 </div>
-<hr>
+</div><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/layout/navigation_node_no_header/res_html/section.html b/tp/t/results/layout/navigation_node_no_header/res_html/section.html
index e971c8086d..cb01ea54b0 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<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>
 <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>
@@ -49,7 +50,8 @@ 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>
-<span id="Section-in-chapter"></span><h2 class="section">1.1 Section in chapter</h2>
+<div class="node" id="Section-in-chapter">
+<h2 class="section">1.1 Section in chapter</h2>
 
 <p>AAAA
 </p>
@@ -83,6 +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></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 b8dc2e907c..cc0d4e8a9b 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="subsection"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<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>
 <td valign="middle" align="left">[<a href="section.html" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="section.html" title="Up section"> Up </a>]</td>
@@ -49,9 +50,11 @@ 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>
-<span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub section in section</h3>
+<div class="node" id="Sub-section-in-section">
+<h3 class="subsection">1.1.1 Sub section in section</h3>
 
 
+</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 583b13064a..77bcb2cfcf 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="chapter">
+<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>
@@ -49,13 +50,15 @@ 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>
-<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
+<div class="node" id="First-chapter">
+<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>
 <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 efe753722f..98000831f3 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
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table border="0" cellpadding="0" cellspacing="0">
+<div class="top" id="Top">
+<table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -60,17 +61,19 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<span id="File-used-for-navigation-testing"></span><h1 class="top">File used for navigation testing</h1>
+<div class="node" id="File-used-for-navigation-testing">
+<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>
 
-</td>
+</div></td>
 </tr>
 </table>
 <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/layout/navigation_node_no_header_vertical/res_html/navigation_abt.html b/tp/t/results/layout/navigation_node_no_header_vertical/res_html/navigation_abt.html
index 43aa7a6ec5..ec4ba3456f 100644
--- a/tp/t/results/layout/navigation_node_no_header_vertical/res_html/navigation_abt.html
+++ b/tp/t/results/layout/navigation_node_no_header_vertical/res_html/navigation_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
@@ -156,7 +156,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-</td>
+</div></td>
 </tr>
 </table>
 <hr>
diff --git a/tp/t/results/layout/navigation_node_no_header_vertical/res_html/navigation_toc.html b/tp/t/results/layout/navigation_node_no_header_vertical/res_html/navigation_toc.html
index 58e7348e19..e2fc0ace12 100644
--- a/tp/t/results/layout/navigation_node_no_header_vertical/res_html/navigation_toc.html
+++ b/tp/t/results/layout/navigation_node_no_header_vertical/res_html/navigation_toc.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
@@ -68,7 +68,7 @@ ul.no-bullet {list-style: none}
   </ul></li>
 </ul>
 </div>
-</td>
+</div></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 e971c8086d..cb01ea54b0 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<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>
 <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>
@@ -49,7 +50,8 @@ 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>
-<span id="Section-in-chapter"></span><h2 class="section">1.1 Section in chapter</h2>
+<div class="node" id="Section-in-chapter">
+<h2 class="section">1.1 Section in chapter</h2>
 
 <p>AAAA
 </p>
@@ -83,6 +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></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 b8dc2e907c..cc0d4e8a9b 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="subsection"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<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>
 <td valign="middle" align="left">[<a href="section.html" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="section.html" title="Up section"> Up </a>]</td>
@@ -49,9 +50,11 @@ 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>
-<span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub section in section</h3>
+<div class="node" id="Sub-section-in-section">
+<h3 class="subsection">1.1.1 Sub section in section</h3>
 
 
+</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 7036f92000..bba89aa524 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="chapter"></span><table border="0" cellpadding="0" cellspacing="0">
+<div class="chapter" id="chapter">
+<table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -80,17 +81,19 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
+<div class="node" id="First-chapter">
+<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>
 
-</td>
+</div></td>
 </tr>
 </table>
 <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/layout/navigation_node_vertical/res_html/index.html b/tp/t/results/layout/navigation_node_vertical/res_html/index.html
index ff761bad23..d788df66b3 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
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table border="0" cellpadding="0" cellspacing="0">
+<div class="top" id="Top">
+<table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -60,14 +61,15 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<span id="File-used-for-navigation-testing"></span><h1 class="top">File used for navigation testing</h1>
+<div class="node" id="File-used-for-navigation-testing">
+<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>
 
-</td>
+</div></td>
 </tr>
 </table>
 <hr>
@@ -79,6 +81,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>
 <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/navigation_abt.html b/tp/t/results/layout/navigation_node_vertical/res_html/navigation_abt.html
index 4d52c7453d..f98dfedadb 100644
--- a/tp/t/results/layout/navigation_node_vertical/res_html/navigation_abt.html
+++ b/tp/t/results/layout/navigation_node_vertical/res_html/navigation_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
@@ -156,7 +156,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-</td>
+</div></td>
 </tr>
 </table>
 <hr>
diff --git a/tp/t/results/layout/navigation_node_vertical/res_html/navigation_toc.html b/tp/t/results/layout/navigation_node_vertical/res_html/navigation_toc.html
index bacdf8060b..cceec800f3 100644
--- a/tp/t/results/layout/navigation_node_vertical/res_html/navigation_toc.html
+++ b/tp/t/results/layout/navigation_node_vertical/res_html/navigation_toc.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
@@ -68,7 +68,7 @@ ul.no-bullet {list-style: none}
   </ul></li>
 </ul>
 </div>
-</td>
+</div></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 c4663a861b..c8533fb174 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="section"></span><table border="0" cellpadding="0" cellspacing="0">
+<div class="section" id="section">
+<table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -80,7 +81,8 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<span id="Section-in-chapter"></span><h2 class="section">1.1 Section in chapter</h2>
+<div class="node" id="Section-in-chapter">
+<h2 class="section">1.1 Section in chapter</h2>
 
 <p>AAAA
 </p>
@@ -114,10 +116,11 @@ 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>
 
-</td>
+</div></td>
 </tr>
 </table>
 <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/layout/navigation_node_vertical/res_html/subsection.html b/tp/t/results/layout/navigation_node_vertical/res_html/subsection.html
index d1e93aabff..419838eb3a 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="subsection"></span><table border="0" cellpadding="0" cellspacing="0">
+<div class="subsection" id="subsection">
+<table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -80,13 +81,15 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub section in section</h3>
+<div class="node" id="Sub-section-in-section">
+<h3 class="subsection">1.1.1 Sub section in section</h3>
 
 
-</td>
+</div></td>
 </tr>
 </table>
 <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/layout/navigation_section/res_html/chapter.html b/tp/t/results/layout/navigation_section/res_html/chapter.html
index 4216082b46..784b0d53ee 100644
--- a/tp/t/results/layout/navigation_section/res_html/chapter.html
+++ b/tp/t/results/layout/navigation_section/res_html/chapter.html
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="chapter">
+<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>
@@ -49,14 +50,15 @@ 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>
-<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
+<div class="node" id="First-chapter">
+<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>
 
-<hr>
+</div><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>
@@ -64,6 +66,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="section.html#section" title="Next section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
 </tr></table>
+</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_section/res_html/index.html b/tp/t/results/layout/navigation_section/res_html/index.html
index a62b894381..de5a564d44 100644
--- a/tp/t/results/layout/navigation_section/res_html/index.html
+++ b/tp/t/results/layout/navigation_section/res_html/index.html
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -43,14 +44,15 @@ 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>
-<span id="File-used-for-navigation-testing"></span><h1 class="top">File used for navigation testing</h1>
+<div class="node" id="File-used-for-navigation-testing">
+<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>
 
-<hr>
+</div><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>
@@ -59,6 +61,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>
 <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_section/res_html/navigation_abt.html b/tp/t/results/layout/navigation_section/res_html/navigation_abt.html
index 8f1d88d97b..fa1d009d0d 100644
--- a/tp/t/results/layout/navigation_section/res_html/navigation_abt.html
+++ b/tp/t/results/layout/navigation_section/res_html/navigation_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -143,7 +143,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/t/results/layout/navigation_section/res_html/navigation_toc.html b/tp/t/results/layout/navigation_section/res_html/navigation_toc.html
index dede8702bc..cfda66b646 100644
--- a/tp/t/results/layout/navigation_section/res_html/navigation_toc.html
+++ b/tp/t/results/layout/navigation_section/res_html/navigation_toc.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -55,7 +55,7 @@ ul.no-bullet {list-style: none}
   </ul></li>
 </ul>
 </div>
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</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 502cda5f89..cc521717e4 100644
--- a/tp/t/results/layout/navigation_section/res_html/section.html
+++ b/tp/t/results/layout/navigation_section/res_html/section.html
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<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>
 <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>
@@ -49,7 +50,8 @@ 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>
-<span id="Section-in-chapter"></span><h2 class="section">1.1 Section in chapter</h2>
+<div class="node" id="Section-in-chapter">
+<h2 class="section">1.1 Section in chapter</h2>
 
 <p>AAAA
 </p>
@@ -83,8 +85,9 @@ 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>
 
-<hr>
-<span id="subsection"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#section" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#section" title="Up section"> Up </a>]</td>
@@ -99,10 +102,11 @@ 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>
-<span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub section in section</h3>
+<div class="node" id="Sub-section-in-section">
+<h3 class="subsection">1.1.1 Sub section in section</h3>
 
 
-<hr>
+</div><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>
@@ -110,6 +114,8 @@ 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">[ &gt; ]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
 </tr></table>
+</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_section_no_header/res_html/chapter.html b/tp/t/results/layout/navigation_section_no_header/res_html/chapter.html
index 4216082b46..784b0d53ee 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="chapter">
+<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>
@@ -49,14 +50,15 @@ 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>
-<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
+<div class="node" id="First-chapter">
+<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>
 
-<hr>
+</div><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>
@@ -64,6 +66,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="section.html#section" title="Next section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
 </tr></table>
+</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_section_no_header/res_html/index.html b/tp/t/results/layout/navigation_section_no_header/res_html/index.html
index a62b894381..de5a564d44 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
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -43,14 +44,15 @@ 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>
-<span id="File-used-for-navigation-testing"></span><h1 class="top">File used for navigation testing</h1>
+<div class="node" id="File-used-for-navigation-testing">
+<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>
 
-<hr>
+</div><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>
@@ -59,6 +61,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>
 <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_section_no_header/res_html/navigation_abt.html b/tp/t/results/layout/navigation_section_no_header/res_html/navigation_abt.html
index 8f1d88d97b..fa1d009d0d 100644
--- a/tp/t/results/layout/navigation_section_no_header/res_html/navigation_abt.html
+++ b/tp/t/results/layout/navigation_section_no_header/res_html/navigation_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -143,7 +143,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/t/results/layout/navigation_section_no_header/res_html/navigation_toc.html b/tp/t/results/layout/navigation_section_no_header/res_html/navigation_toc.html
index dede8702bc..cfda66b646 100644
--- a/tp/t/results/layout/navigation_section_no_header/res_html/navigation_toc.html
+++ b/tp/t/results/layout/navigation_section_no_header/res_html/navigation_toc.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -55,7 +55,7 @@ ul.no-bullet {list-style: none}
   </ul></li>
 </ul>
 </div>
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</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 06c13a043e..350c45207c 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<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>
 <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>
@@ -49,7 +50,8 @@ 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>
-<span id="Section-in-chapter"></span><h2 class="section">1.1 Section in chapter</h2>
+<div class="node" id="Section-in-chapter">
+<h2 class="section">1.1 Section in chapter</h2>
 
 <p>AAAA
 </p>
@@ -83,11 +85,13 @@ 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>
 
-<hr>
-<span id="subsection"></span><span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub section in section</h3>
+</div><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>
 
 
-<hr>
+</div><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>
@@ -95,6 +99,8 @@ 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">[ &gt; ]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
 </tr></table>
+</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_section_no_header_vertical/res_html/chapter.html b/tp/t/results/layout/navigation_section_no_header_vertical/res_html/chapter.html
index 378bdcf9f8..8eaf51d2c1 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="chapter"></span><table border="0" cellpadding="0" cellspacing="0">
+<div class="chapter" id="chapter">
+<table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -80,14 +81,15 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
+<div class="node" id="First-chapter">
+<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>
 
-</td>
+</div></td>
 </tr>
 </table>
 <hr>
@@ -98,6 +100,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="section.html#section" title="Next section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
 </tr></table>
+</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_section_no_header_vertical/res_html/index.html b/tp/t/results/layout/navigation_section_no_header_vertical/res_html/index.html
index ff761bad23..d788df66b3 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
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table border="0" cellpadding="0" cellspacing="0">
+<div class="top" id="Top">
+<table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -60,14 +61,15 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<span id="File-used-for-navigation-testing"></span><h1 class="top">File used for navigation testing</h1>
+<div class="node" id="File-used-for-navigation-testing">
+<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>
 
-</td>
+</div></td>
 </tr>
 </table>
 <hr>
@@ -79,6 +81,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>
 <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_section_no_header_vertical/res_html/navigation_abt.html b/tp/t/results/layout/navigation_section_no_header_vertical/res_html/navigation_abt.html
index 4d52c7453d..f98dfedadb 100644
--- a/tp/t/results/layout/navigation_section_no_header_vertical/res_html/navigation_abt.html
+++ b/tp/t/results/layout/navigation_section_no_header_vertical/res_html/navigation_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
@@ -156,7 +156,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-</td>
+</div></td>
 </tr>
 </table>
 <hr>
diff --git a/tp/t/results/layout/navigation_section_no_header_vertical/res_html/navigation_toc.html b/tp/t/results/layout/navigation_section_no_header_vertical/res_html/navigation_toc.html
index 8c2698bf2d..f28c3b9a37 100644
--- a/tp/t/results/layout/navigation_section_no_header_vertical/res_html/navigation_toc.html
+++ b/tp/t/results/layout/navigation_section_no_header_vertical/res_html/navigation_toc.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
@@ -68,7 +68,7 @@ ul.no-bullet {list-style: none}
   </ul></li>
 </ul>
 </div>
-</td>
+</div></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 5761c22604..007732b091 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="section"></span><table border="0" cellpadding="0" cellspacing="0">
+<div class="section" id="section">
+<table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -80,7 +81,8 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<span id="Section-in-chapter"></span><h2 class="section">1.1 Section in chapter</h2>
+<div class="node" id="Section-in-chapter">
+<h2 class="section">1.1 Section in chapter</h2>
 
 <p>AAAA
 </p>
@@ -114,11 +116,13 @@ 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>
 
-<hr>
-<span id="subsection"></span><span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub section in section</h3>
+</div><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>
 
 
-</td>
+</div></td>
 </tr>
 </table>
 <hr>
@@ -129,6 +133,8 @@ 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">[ &gt; ]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
 </tr></table>
+</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_section_vertical/res_html/chapter.html b/tp/t/results/layout/navigation_section_vertical/res_html/chapter.html
index 378bdcf9f8..8eaf51d2c1 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="chapter"></span><table border="0" cellpadding="0" cellspacing="0">
+<div class="chapter" id="chapter">
+<table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -80,14 +81,15 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
+<div class="node" id="First-chapter">
+<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>
 
-</td>
+</div></td>
 </tr>
 </table>
 <hr>
@@ -98,6 +100,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="section.html#section" title="Next section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
 </tr></table>
+</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_section_vertical/res_html/index.html b/tp/t/results/layout/navigation_section_vertical/res_html/index.html
index ff761bad23..d788df66b3 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
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table border="0" cellpadding="0" cellspacing="0">
+<div class="top" id="Top">
+<table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -60,14 +61,15 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<span id="File-used-for-navigation-testing"></span><h1 class="top">File used for navigation testing</h1>
+<div class="node" id="File-used-for-navigation-testing">
+<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>
 
-</td>
+</div></td>
 </tr>
 </table>
 <hr>
@@ -79,6 +81,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>
 <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_section_vertical/res_html/navigation_abt.html b/tp/t/results/layout/navigation_section_vertical/res_html/navigation_abt.html
index 4d52c7453d..f98dfedadb 100644
--- a/tp/t/results/layout/navigation_section_vertical/res_html/navigation_abt.html
+++ b/tp/t/results/layout/navigation_section_vertical/res_html/navigation_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
@@ -156,7 +156,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-</td>
+</div></td>
 </tr>
 </table>
 <hr>
diff --git a/tp/t/results/layout/navigation_section_vertical/res_html/navigation_toc.html b/tp/t/results/layout/navigation_section_vertical/res_html/navigation_toc.html
index 8c2698bf2d..f28c3b9a37 100644
--- a/tp/t/results/layout/navigation_section_vertical/res_html/navigation_toc.html
+++ b/tp/t/results/layout/navigation_section_vertical/res_html/navigation_toc.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
@@ -68,7 +68,7 @@ ul.no-bullet {list-style: none}
   </ul></li>
 </ul>
 </div>
-</td>
+</div></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 57a9aedfb2..108aa27cc3 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="section"></span><table border="0" cellpadding="0" cellspacing="0">
+<div class="section" id="section">
+<table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -80,7 +81,8 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<span id="Section-in-chapter"></span><h2 class="section">1.1 Section in chapter</h2>
+<div class="node" id="Section-in-chapter">
+<h2 class="section">1.1 Section in chapter</h2>
 
 <p>AAAA
 </p>
@@ -114,8 +116,9 @@ 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>
 
-<hr>
-<span id="subsection"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#section" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#section" title="Up section"> Up </a>]</td>
@@ -130,10 +133,11 @@ 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>
-<span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub section in section</h3>
+<div class="node" id="Sub-section-in-section">
+<h3 class="subsection">1.1.1 Sub section in section</h3>
 
 
-</td>
+</div></td>
 </tr>
 </table>
 <hr>
@@ -144,6 +148,8 @@ 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">[ &gt; ]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
 </tr></table>
+</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_vertical/res_html/navigation.html b/tp/t/results/layout/navigation_vertical/res_html/navigation.html
index 38af0efa93..ca97a31629 100644
--- a/tp/t/results/layout/navigation_vertical/res_html/navigation.html
+++ b/tp/t/results/layout/navigation_vertical/res_html/navigation.html
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table border="0" cellpadding="0" cellspacing="0">
+<div class="top" id="Top">
+<table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -60,18 +61,20 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<span id="File-used-for-navigation-testing"></span><h1 class="top">File used for navigation testing</h1>
+<div class="node" id="File-used-for-navigation-testing">
+<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>
 
-</td>
+</div></td>
 </tr>
 </table>
 <hr size="6">
-<span id="chapter"></span><table border="0" cellpadding="0" cellspacing="0">
+<div class="chapter" id="chapter">
+<table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -117,15 +120,17 @@ ul.no-bullet {list-style: none}
 </table>
 </td>
 <td align="left">
-<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
+<div class="node" id="First-chapter">
+<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>
 
-<hr>
-<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Up section"> Up </a>]</td>
@@ -140,7 +145,8 @@ 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>
-<span id="Section-in-chapter"></span><h2 class="section">1.1 Section in chapter</h2>
+<div class="node" id="Section-in-chapter">
+<h2 class="section">1.1 Section in chapter</h2>
 
 <p>AAAA
 </p>
@@ -174,8 +180,9 @@ 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>
 
-<hr>
-<span id="subsection"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#section" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#section" title="Up section"> Up </a>]</td>
@@ -190,14 +197,19 @@ 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>
-<span id="Sub-section-in-section"></span><h3 class="subsection">1.1.1 Sub section in section</h3>
+<div class="node" id="Sub-section-in-section">
+<h3 class="subsection">1.1.1 Sub section in section</h3>
 
 
-</td>
+</div></td>
 </tr>
 </table>
 <hr size="6">
-<span id="SEC_Contents"></span>
+</div>
+</div>
+</div>
+</div>
+<div class="Contents_element" id="SEC_Contents">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
@@ -231,11 +243,11 @@ 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.
   </ul></li>
 </ul>
 </div>
-</td>
+</div></td>
 </tr>
 </table>
 <hr>
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
@@ -357,7 +369,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.
   </li>
 </ul>
 
-</td>
+</div></td>
 </tr>
 </table>
 <hr>
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 912551ba55..ef4a6df7b3 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
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -43,7 +44,8 @@ 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>
-<span id="Not-monolithic"></span><h1 class="top">Not monolithic</h1>
+<div class="node" id="Not-monolithic">
+<h1 class="top">Not monolithic</h1>
 
 <p>Not monolitic manual<a id="DOCF1" href="no_monolithic_fot.html#FOOT1"><sup>1</sup></a>.
 </p>
@@ -54,8 +56,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -70,7 +73,8 @@ 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>
-<span id="Chapter"></span><h1 class="chapter">1 Chapter</h1>
+<div class="node" id="Chapter">
+<h1 class="chapter">1 Chapter</h1>
 
 <p>Chapter.
 </p>
@@ -88,7 +92,9 @@ 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>
-<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>.
 </font></p>
diff --git a/tp/t/results/layout/no_monolithic/res_html/no_monolithic_abt.html b/tp/t/results/layout/no_monolithic/res_html/no_monolithic_abt.html
index 1e3fe20a34..ef5aa3be0a 100644
--- a/tp/t/results/layout/no_monolithic/res_html/no_monolithic_abt.html
+++ b/tp/t/results/layout/no_monolithic/res_html/no_monolithic_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="no_monolithic.html#Top" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="no_monolithic_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -143,7 +143,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="no_monolithic.html#Top" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="no_monolithic_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/t/results/layout/no_monolithic/res_html/no_monolithic_fot.html b/tp/t/results/layout/no_monolithic/res_html/no_monolithic_fot.html
index 444b126e4c..537e394c3d 100644
--- a/tp/t/results/layout/no_monolithic/res_html/no_monolithic_fot.html
+++ b/tp/t/results/layout/no_monolithic/res_html/no_monolithic_fot.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Foot"></span>
+<div class="Footnotes_element" id="SEC_Foot">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="no_monolithic.html#Top" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="no_monolithic_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -45,7 +45,7 @@ ul.no-bullet {list-style: none}
 
 <h5><a id="FOOT1" href="no_monolithic.html#DOCF1">(1)</a></h5>
 <p>my footnote</p>
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="no_monolithic.html#Top" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="no_monolithic_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/t/results/layout/no_monolithic/res_html/no_monolithic_ovr.html b/tp/t/results/layout/no_monolithic/res_html/no_monolithic_ovr.html
index 703d8b73b6..7cc4556d23 100644
--- a/tp/t/results/layout/no_monolithic/res_html/no_monolithic_ovr.html
+++ b/tp/t/results/layout/no_monolithic/res_html/no_monolithic_ovr.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Overview"></span>
+<div class="Overview_element" id="SEC_Overview">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="no_monolithic.html#Top" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="no_monolithic_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 <li><a id="stoc-Chapter" href="no_monolithic.html#chapter" rel="index">1 Chapter</a></li>
 </ul>
 </div>
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="no_monolithic.html#Top" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="no_monolithic_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/t/results/layout/no_monolithic/res_html/no_monolithic_toc.html b/tp/t/results/layout/no_monolithic/res_html/no_monolithic_toc.html
index 3fbc02f484..0fe0c1ae40 100644
--- a/tp/t/results/layout/no_monolithic/res_html/no_monolithic_toc.html
+++ b/tp/t/results/layout/no_monolithic/res_html/no_monolithic_toc.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="no_monolithic.html#Top" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -49,7 +49,7 @@ ul.no-bullet {list-style: none}
   <li><a id="toc-Chapter" href="no_monolithic.html#chapter" rel="index">1 Chapter</a></li>
 </ul>
 </div>
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="no_monolithic.html#Top" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/t/results/menu/block_commands_in_menu_description.pl b/tp/t/results/menu/block_commands_in_menu_description.pl
index 9fd44c1795..78e2c97711 100644
--- a/tp/t/results/menu/block_commands_in_menu_description.pl
+++ b/tp/t/results/menu/block_commands_in_menu_description.pl
@@ -862,7 +862,9 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><span id="top"></span><h1 class="top">top</h1>
+<div class="top" id="Top">
+<div class="node" id="top">
+<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">
@@ -889,7 +891,8 @@ Text.
 <pre class="verbatim">
 </pre></td></tr>
 </table>
-<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 e669dd066a..9b4ddd4a60 100644
--- a/tp/t/results/menu/comment_on_menu_line.pl
+++ b/tp/t/results/menu/comment_on_menu_line.pl
@@ -464,7 +464,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="chapter" id="Top">
+<div class="header">
 <p>
 Next: <a href="#first" accesskey="n" rel="next">first</a> &nbsp; </p>
 </div>
@@ -474,14 +475,17 @@ Next: <a href="#first" accesskey="n" rel="next">first</a> &nbsp; </p>
 </td></tr>
 </table>
 
-<span id="first-1"></span><h2 class="chapter">1 first</h2>
-<hr>
-<span id="first"></span><div class="header">
+<div class="node" id="first-1">
+<h2 class="chapter">1 first</h2>
+</div><hr>
+<div class="node" id="first">
+<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>
-<hr>
+</div><hr>
+</div>
 
 
 
diff --git a/tp/t/results/menu/detailmenu_on_subnodes.pl b/tp/t/results/menu/detailmenu_on_subnodes.pl
index 2d6b7aadca..844e3d3265 100644
--- a/tp/t/results/menu/detailmenu_on_subnodes.pl
+++ b/tp/t/results/menu/detailmenu_on_subnodes.pl
@@ -1973,11 +1973,13 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; </p>
 </div>
-<span id="top"></span><h1 class="top">top</h1>
+<div class="node" id="top">
+<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">
@@ -1998,31 +2000,39 @@ Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; </p>
 </td></tr>
 </table>
 
-<hr>
-<span id="chapter"></span><div class="header">
+</div><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>
-<span id="chapter-1"></span><h2 class="chapter">1 chapter</h2>
+<div class="node" id="chapter-1">
+<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>
 
-<hr>
-<span id="section"></span><div class="header">
+</div><hr>
+<div class="section" id="section">
+<div class="header">
 <p>
 Up: <a href="#chapter" accesskey="u" rel="up">chapter</a> &nbsp; </p>
 </div>
-<span id="section-1"></span><h3 class="section">1.1 section</h3>
+<div class="node" id="section-1">
+<h3 class="section">1.1 section</h3>
 
-<hr>
-<span id="chapter-2"></span><div class="header">
+</div><hr>
+</div>
+</div>
+<div class="chapter" id="chapter-2">
+<div class="header">
 <p>
 Previous: <a href="#chapter" accesskey="p" rel="prev">chapter</a>, Up: <a href="#Top" accesskey="u" rel="up">top</a> &nbsp; </p>
 </div>
-<span id="chapter-2-1"></span><h2 class="chapter">2 chapter 2</h2>
+<div class="node" id="chapter-2-1">
+<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">
@@ -2031,20 +2041,28 @@ Previous: <a href="#chapter" accesskey="p" rel="prev">chapter</a>, Up: <a href="
 </td></tr>
 </table>
 
-<hr>
-<span id="section-chap-2"></span><div class="header">
+</div><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>
-<span id="section-chap-2-1"></span><h3 class="section">2.1 section chap 2</h3>
+<div class="node" id="section-chap-2-1">
+<h3 class="section">2.1 section chap 2</h3>
 
-<hr>
-<span id="unnumberedsec"></span><div class="header">
+</div><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>
-<span id="unnumberedsec-1"></span><h3 class="unnumberedsec">unnumberedsec</h3>
-<hr>
+<div class="node" id="unnumberedsec-1">
+<h3 class="unnumberedsec">unnumberedsec</h3>
+</div><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 da5bf56296..9d2f1b463d 100644
--- a/tp/t/results/menu/detailmenu_unknown_node.pl
+++ b/tp/t/results/menu/detailmenu_unknown_node.pl
@@ -364,13 +364,14 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<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>
-<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 1b2f355c2d..fa99038bbe 100644
--- a/tp/t/results/menu/entry_after_detailmenu.pl
+++ b/tp/t/results/menu/entry_after_detailmenu.pl
@@ -847,7 +847,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="node" id="Top">
+<div class="header">
 <p>
 Next: <a href="#first" accesskey="n" rel="next">first</a> &nbsp; </p>
 </div>
@@ -870,19 +871,21 @@ Menu comment
 </td></tr>
 </table>
 
-<hr>
-<span id="first"></span><div class="header">
+</div><hr>
+<div class="node" id="first">
+<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>
-<hr>
-<span id="second"></span><div class="header">
+</div><hr>
+<div class="node" id="second">
+<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>
-<hr>
+</div><hr>
 
 
 
diff --git a/tp/t/results/menu/example_in_menu_description.pl b/tp/t/results/menu/example_in_menu_description.pl
index 07c02de154..0bcb7f2ac1 100644
--- a/tp/t/results/menu/example_in_menu_description.pl
+++ b/tp/t/results/menu/example_in_menu_description.pl
@@ -508,7 +508,9 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><span id="top"></span><h1 class="top">top</h1>
+<div class="top" id="Top">
+<div class="node" id="top">
+<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">
@@ -521,7 +523,8 @@ example
 <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
 
 </pre></th></tr></table>
-<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 2306037271..248ef2c231 100644
--- a/tp/t/results/menu/formats_in_menu.pl
+++ b/tp/t/results/menu/formats_in_menu.pl
@@ -1049,7 +1049,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<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
@@ -1082,7 +1083,7 @@ Menu comment
 <pre class="menu-comment">
 
 </pre></th></tr></table>
-<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 56d779751a..8df1761c8f 100644
--- a/tp/t/results/menu/inlineraw_in_menu_description.pl
+++ b/tp/t/results/menu/inlineraw_in_menu_description.pl
@@ -479,7 +479,9 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><span id="top"></span><h1 class="top">top</h1>
+<div class="top" id="Top">
+<div class="node" id="top">
+<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">
@@ -490,7 +492,8 @@ end inlineraw
 <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
 
 </pre></th></tr></table>
-<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 71bf179ac5..7da101a435 100644
--- a/tp/t/results/menu/invalid_info_menu_entry.pl
+++ b/tp/t/results/menu/invalid_info_menu_entry.pl
@@ -918,7 +918,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<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">
@@ -932,7 +933,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>
-<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 4d8b9930d3..b9830c883c 100644
--- a/tp/t/results/menu/menu_in_example.pl
+++ b/tp/t/results/menu/menu_in_example.pl
@@ -763,7 +763,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
 <div class="example">
 <table class="menu" border="0" cellspacing="0"><tr><td>
@@ -784,7 +785,7 @@ ul.no-bullet {list-style: none}
 
 </pre></td></tr></table>
 </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 9fc42cdc22..e914240b52 100644
--- a/tp/t/results/menu/menu_pointing_to_anchor.pl
+++ b/tp/t/results/menu/menu_pointing_to_anchor.pl
@@ -454,7 +454,9 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><span id="top"></span><h1 class="top">top</h1>
+<div class="top" id="Top">
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 <p>Text
 </p>
@@ -463,7 +465,8 @@ 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>
-<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 a634c8bc4f..c8fa8ea298 100644
--- a/tp/t/results/menu/menu_title_before_entries.pl
+++ b/tp/t/results/menu/menu_title_before_entries.pl
@@ -397,7 +397,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="node" id="Top">
+<div class="header">
 <p>
 Next: <a href="#subnode" accesskey="n" rel="next">subnode</a> &nbsp; </p>
 </div>
@@ -409,13 +410,14 @@ Next: <a href="#subnode" accesskey="n" rel="next">subnode</a> &nbsp; </p>
 </td></tr>
 </table>
 
-<hr>
-<span id="subnode"></span><div class="header">
+</div><hr>
+<div class="node" id="subnode">
+<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>
-<hr>
+</div><hr>
 
 
 
diff --git a/tp/t/results/menu/no_colon_in_menu.pl b/tp/t/results/menu/no_colon_in_menu.pl
index 475c81ad5f..2d9075f7f7 100644
--- a/tp/t/results/menu/no_colon_in_menu.pl
+++ b/tp/t/results/menu/no_colon_in_menu.pl
@@ -245,12 +245,13 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<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>
-<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 8168779073..76a618331f 100644
--- a/tp/t/results/menu/reference_to_external_manual.pl
+++ b/tp/t/results/menu/reference_to_external_manual.pl
@@ -332,13 +332,14 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<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>
-<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 3139d2762c..78d52429d5 100644
--- a/tp/t/results/menu/sc_in_menu.pl
+++ b/tp/t/results/menu/sc_in_menu.pl
@@ -1158,7 +1158,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><div class="header">
+<div class="node" id="Top">
+<div class="header">
 <p>
 Next: <a href="#NODE" accesskey="n" rel="next"><small>NODE</small></a> &nbsp; </p>
 </div>
@@ -1178,8 +1179,9 @@ MENU-EXAMPLE COMMENT
 </pre></div>
 </th></tr></table>
 
-<hr>
-<span id="NODE"></span><div class="header">
+</div><hr>
+<div class="node" id="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>
@@ -1194,7 +1196,7 @@ EXAMPLE COMMENT
 </pre></td></tr></table>
 </div>
 
-<hr>
+</div><hr>
 
 
 
diff --git a/tp/t/results/menu/verb_in_menu_description.pl b/tp/t/results/menu/verb_in_menu_description.pl
index 2e17f3c4af..4f42444a98 100644
--- a/tp/t/results/menu/verb_in_menu_description.pl
+++ b/tp/t/results/menu/verb_in_menu_description.pl
@@ -463,7 +463,9 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><span id="top"></span><h1 class="top">top</h1>
+<div class="top" id="Top">
+<div class="node" id="top">
+<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">
@@ -474,7 +476,8 @@ ul.no-bullet {list-style: none}
 <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
 
 </pre></th></tr></table>
-<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 23a25bfedb..dc66e3c052 100644
--- a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -5295,7 +5295,9 @@ $result_converted{'html_text'}->{'codequoteundirected_codequotebacktick'} = '
 
 
 
-<span id="Top"></span><span id="test-quotes"></span><h1 class="top">test quotes</h1>
+<div class="top" id="Top">
+<div class="node" id="test-quotes">
+<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>
@@ -5375,7 +5377,7 @@ samp: &lsquo;<samp>``simple-double--three---four----\'\' `simple\' quotedblleft:
 
 </pre></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 6ddcbd9be9..9807c9ae58 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
@@ -837,13 +837,16 @@ Text 1
 
 
 $result_converted{'html_text'}->{'comment_space_command_on_line'} = '
-<span id="Top"></span><span id="top-element-"></span><h1 class="top">top element&nbsp;</h1>
+<div class="top" id="Top">
+<div class="node" id="top-element-">
+<h1 class="top">top element&nbsp;</h1>
 
 
 <span id="index-index-entry--"></span>
 
-<span id="Heading--"></span><h3 class="heading">Heading &nbsp;</h3>
-
+<div class="heading" id="Heading--">
+<h3 class="heading">Heading &nbsp;</h3>
+</div>
 <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>
@@ -863,7 +866,7 @@ $result_converted{'html_text'}->{'comment_space_command_on_line'} = '
 </p><div class="float-caption"><p><strong>Text 1
 </strong></p></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 30565f65d0..2dc9006f5e 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,17 +233,21 @@ Subheading
 ';
 
 
-$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">
+$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">
 <li><a href="#Chapter" accesskey="1">Chapter</a></li>
 </ul>
-<span id="Chapter"></span><h2 class="chapter">1 Chapter</h2>
+</div><div class="chapter" id="Chapter">
+<h2 class="chapter">1 Chapter</h2>
 <ul class="section-toc">
 <li><a href="#Section" accesskey="1">Section</a></li>
 </ul>
-<span id="Section"></span><h3 class="section">1.1 Section</h3>
-<hr>
+</div><div class="section" id="Section">
+<h3 class="section">1.1 Section</h3>
+</div><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 074d203378..5868dc36a3 100644
--- a/tp/t/results/misc_commands/ref_in_center.pl
+++ b/tp/t/results/misc_commands/ref_in_center.pl
@@ -291,14 +291,15 @@ $result_converted{'plaintext'}->{'ref_in_center'} = '
 ';
 
 
-$result_converted{'html_text'}->{'ref_in_center'} = '<span id="Top"></span><h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'ref_in_center'} = '<div class="node" id="Top">
+<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><hr>
+</p></div><hr></div>
 ';
 
 
diff --git a/tp/t/results/misc_commands/test_allowcodebreaks.pl b/tp/t/results/misc_commands/test_allowcodebreaks.pl
index f4dbd84a26..c23750e29a 100644
--- a/tp/t/results/misc_commands/test_allowcodebreaks.pl
+++ b/tp/t/results/misc_commands/test_allowcodebreaks.pl
@@ -2737,7 +2737,8 @@ Out of code -- out-of-code. \'1aaa\' \'2aaa-\' \'-3bbb\' \'4aaa-bbb\'  \' 5aaa-b
 ';
 
 
-$result_converted{'html_text'}->{'test_allowcodebreaks'} = '<span id="Top"></span><h1 class="node-heading">Top</h1>
+$result_converted{'html_text'}->{'test_allowcodebreaks'} = '<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
 
 
@@ -2783,7 +2784,7 @@ anc-hor<span id="A-node2"></span></samp>&rsquo;
 <div class="example">
 <pre class="example"><code>in-example</code>
 </pre></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 7940f7d861..db48c8fdd9 100644
--- a/tp/t/results/morecoverage/formatting_fr.pl
+++ b/tp/t/results/morecoverage/formatting_fr.pl
@@ -4916,7 +4916,8 @@ ul.no-bullet {list-style: none}
 
 </p><hr>
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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="Section suivante dans l&rsquo;ordre de lecture"> &gt; </a>]</td>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -4924,7 +4925,8 @@ 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>
-<span id="Top-section"></span><h1 class="top">Top section</h1>
+<div class="node" id="Top-section">
+<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>
@@ -5052,8 +5054,9 @@ Menu comment
 </p>
 
 
-<hr size="6">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#Top" title="Section pr&eacute;c&eacute;dente dans l&rsquo;ordre de lecture"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Section sup&eacute;rieure">Plus haut</a>]</td>
@@ -5068,7 +5071,8 @@ 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>
-<span id="chapter-1"></span><h1 class="chapter">1 chapter</h1>
+<div class="node" id="chapter-1">
+<h1 class="chapter">1 chapter</h1>
 
 <p><a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
@@ -5084,8 +5088,9 @@ Menu comment
 </pre></td></tr></table>
 </div>
 
-<hr>
-<span id="s_002d_002dect_002cion"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#chapter" title="Section pr&eacute;c&eacute;dente dans l&rsquo;ordre de lecture"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Section sup&eacute;rieure">Plus haut</a>]</td>
@@ -5100,7 +5105,8 @@ 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>
-<span id="A-section"></span><h2 class="section">1.1 A section</h2>
+<div class="node" id="A-section">
+<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">
@@ -5115,8 +5121,9 @@ Menu comment
 </td></tr>
 </table>
 
-<hr>
-<span id="subsection"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#s_002d_002dect_002cion" title="Section pr&eacute;c&eacute;dente dans l&rsquo;ordre de lecture"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#s_002d_002dect_002cion" title="Section sup&eacute;rieure">Plus haut</a>]</td>
@@ -5131,7 +5138,8 @@ 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>
-<span id="subsection-1"></span><h3 class="subsection">1.1.1 subsection</h3>
+<div class="node" id="subsection-1">
+<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">
@@ -5141,8 +5149,9 @@ Menu comment
 </table>
 
 <span id="anchor"></span>
-<hr>
-<span id="subsubsection-_0060_0060simple_002ddouble_002d_002d"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#subsection" title="Section pr&eacute;c&eacute;dente dans l&rsquo;ordre de lecture"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#subsection" title="Section sup&eacute;rieure">Plus haut</a>]</td>
@@ -5157,10 +5166,13 @@ 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>
-<span id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1"></span><h4 class="subsubsection">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</h4>
+<div class="node" id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1">
+<h4 class="subsubsection">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</h4>
 
-<hr>
-<span id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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">
 <tr><td valign="middle" align="left">[<a href="#chapter" title="D&eacute;but de ce chapitre ou chapitre pr&eacute;c&eacute;dent"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#subsubsection-_0060_0060simple_002ddouble_002d_002d" title="Section pr&eacute;c&eacute;dente dans l&rsquo;ordre de lecture"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#subsection" title="Section sup&eacute;rieure">Plus haut</a>]</td>
@@ -5175,10 +5187,16 @@ 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>
-<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 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>
 
-<hr>
-<span id="chapter2"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+</div>
+</div>
+</div>
+</div>
+<div class="centerchap" id="chapter2">
+<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>
 <td valign="middle" align="left">[<a href="#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" title="Section pr&eacute;c&eacute;dente dans l&rsquo;ordre de lecture"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Section sup&eacute;rieure">Plus haut</a>]</td>
@@ -5193,7 +5211,8 @@ 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>
-<span id="chapter-2"></span><h1 class="centerchap" align="center">chapter 2</h1>
+<div class="node" id="chapter-2">
+<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; 
@@ -5270,7 +5289,9 @@ Menu comment
  &nbsp; 
 </td></tr></table>
 
-<hr>
+</div><hr>
+</div>
+</div>
 <p><font size="-1">
   Ce document a &eacute;t&eacute; g&eacute;n&eacute;r&eacute; le <em>a sunny day</em>.
 </font></p>
diff --git a/tp/t/results/morecoverage/texi_formatting.pl b/tp/t/results/morecoverage/texi_formatting.pl
index 7360ebb3c5..2978c21fe5 100644
--- a/tp/t/results/morecoverage/texi_formatting.pl
+++ b/tp/t/results/morecoverage/texi_formatting.pl
@@ -4907,11 +4907,13 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Top" title="Index" rel="index">Index</a>]</p>
 </div>
-<span id="Top-section"></span><h1 class="top">Top section</h1>
+<div class="node" id="Top-section">
+<h1 class="top">Top section</h1>
 
 
 
@@ -5061,12 +5063,14 @@ Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; [<a href="#
 </ul>
 </div>
 
-<hr>
-<span id="chapter"></span><div class="header">
+</div><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>
-<span id="chapter-1"></span><h2 class="chapter">1 chapter</h2>
+<div class="node" id="chapter-1">
+<h2 class="chapter">1 chapter</h2>
 
 <p><a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
@@ -5074,23 +5078,27 @@ 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>
-<hr>
-<span id="s_002d_002dect_002cion"></span><div class="header">
+</div><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>
-<span id="A-section"></span><h3 class="section">1.1 A section</h3>
+<div class="node" id="A-section">
+<h3 class="section">1.1 A section</h3>
 
 
 <ul class="section-toc">
 <li><a href="#subsection" accesskey="1">subsection</a></li>
 </ul>
-<hr>
-<span id="subsection"></span><div class="header">
+</div><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>
-<span id="subsection-1"></span><h4 class="subsection">1.1.1 subsection</h4>
+<div class="node" id="subsection-1">
+<h4 class="subsection">1.1.1 subsection</h4>
 
 
 <span id="anchor"></span>
@@ -5098,26 +5106,37 @@ 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>
-<hr>
-<span id="subsubsection-_0060_0060simple_002ddouble_002d_002d"></span><div class="header">
+</div><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>
-<span id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1"></span><h4 class="subsubsection">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</h4>
+<div class="node" id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1">
+<h4 class="subsubsection">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</h4>
 
-<hr>
-<span id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027"></span><div class="header">
+</div><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>
-<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 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>
 
-<hr>
-<span id="chapter2"></span><div class="header">
+</div><hr>
+</div>
+</div>
+</div>
+</div>
+<div class="centerchap" id="chapter2">
+<div class="header">
 <p>
 Previous: <a href="#chapter" accesskey="p" rel="prev">chapter</a>, Up: <a href="#Top" accesskey="u" rel="up">Top section</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Top" title="Index" rel="index">Index</a>]</p>
 </div>
-<span id="chapter-2"></span><h2 class="centerchap" align="center">chapter 2</h2>
+<div class="node" id="chapter-2">
+<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; 
@@ -5194,7 +5213,7 @@ Previous: <a href="#chapter" accesskey="p" rel="prev">chapter</a>, Up: <a href="
  &nbsp; 
 </td></tr></table>
 
-<div class="footnote">
+</div><div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
@@ -5202,6 +5221,8 @@ Previous: <a href="#chapter" accesskey="p" rel="prev">chapter</a>, Up: <a href="
 <p>in footnote</p>
 </div>
 <hr>
+</div>
+</div>
 
 
 
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 50e563c278..e7579fb067 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,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span>
+<div class="node" id="Top">
+
 <span id="index-aaa"></span>
 
 <p>Text
@@ -46,7 +47,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<span id="other-node"></span>
+</div><div class="node" id="other-node">
+
 <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>
@@ -65,7 +67,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<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 54a1f4d01c..c8002bf023 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,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Chapter-2"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="Chapter-2">
+<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>
@@ -53,7 +54,7 @@ ul.no-bullet {list-style: none}
 
 <p>In chapter 2
 </p>
-<hr>
+</div><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 c1e5c1e7b7..e991fa3b49 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,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="Chapter">
+<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>
@@ -99,7 +100,7 @@ ul.no-bullet {list-style: none}
 <p>Text of chapter
 <span id="index-Chapter2"></span>
 </p>
-<hr>
+</div><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 1b70c3779b..d57c0ea2dd 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,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="top-section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="top-section">
+<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>
@@ -100,8 +101,9 @@ ul.no-bullet {list-style: none}
 <span id="index-top-section1"></span>
 
 
-<hr size="6">
-<span id="second"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr size="6">
+<div class="section" id="second">
+<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>
@@ -210,7 +212,7 @@ ul.no-bullet {list-style: none}
 <a class="summary-letter" href="#second_cp_letter-U"><b>U</b></a>
  &nbsp; 
 </td></tr></table>
-<hr>
+</div><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/index_no_node_abt.html b/tp/t/results/moreindices/index_no_node/res_html/index_no_node_abt.html
index 54c349c8ca..3d5fe37482 100644
--- a/tp/t/results/moreindices/index_no_node/res_html/index_no_node_abt.html
+++ b/tp/t/results/moreindices/index_no_node/res_html/index_no_node_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html#top-section" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</td>
@@ -143,7 +143,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html#top-section" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</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 9fe3dc1b35..ca3400ef17 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,7 +83,8 @@ ul.no-bullet {list-style: none}
 </td></tr></table>
 
 
-<span id="unnumbered"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="unnumbered" id="unnumbered">
+<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>
@@ -149,7 +150,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<hr>
+</div><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 3497808b53..aa8d888c92 100644
--- a/tp/t/results/moreindices/index_split/res_html/first.html
+++ b/tp/t/results/moreindices/index_split/res_html/first.html
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="first"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="first">
+<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>
@@ -153,7 +154,8 @@ ul.no-bullet {list-style: none}
 
 <span id="index-entry-after-printindex"></span>
 
-<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
+<div class="node" id="First-chapter">
+<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>
@@ -173,8 +175,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
-<span id="section-1"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -189,7 +192,8 @@ 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>
-<span id="Section-1"></span><h2 class="section">1.1 Section 1</h2>
+<div class="node" id="Section-1">
+<h2 class="section">1.1 Section 1</h2>
 
 <span id="index-something"></span>
 
@@ -270,8 +274,9 @@ ul.no-bullet {list-style: none}
 
 <span id="index-another"></span>
 
-<hr>
-<span id="subsection-1"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#section-1" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#section-1" title="Up section"> Up </a>]</td>
@@ -286,12 +291,15 @@ 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>
-<span id="Subsection-1"></span><h3 class="subsection">1.1.1 Subsection 1</h3>
+<div class="node" id="Subsection-1">
+<h3 class="subsection">1.1.1 Subsection 1</h3>
 
 <p>In subsection 1
 </p>
-<hr>
-<span id="subsection-2"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+</div>
+<div class="subsection" id="subsection-2">
+<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="#subsection-1" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#section-1" title="Up section"> Up </a>]</td>
@@ -306,7 +314,8 @@ 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>
-<span id="Subsection-2"></span><h3 class="subsection">1.1.2 Subsection 2</h3>
+<div class="node" id="Subsection-2">
+<h3 class="subsection">1.1.2 Subsection 2</h3>
 
 <p>index in subsction 2
 </p>
@@ -381,8 +390,11 @@ ul.no-bullet {list-style: none}
 
 <span id="index-printindex-subsection-2"></span>
 
-<hr>
-<span id="section-2"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+</div>
+</div>
+<div class="section" id="section-2">
+<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="#subsection-2" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#first" title="Up section"> Up </a>]</td>
@@ -397,12 +409,15 @@ 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>
-<span id="Section-2"></span><h2 class="section">1.2 Section 2</h2>
+<div class="node" id="Section-2">
+<h2 class="section">1.2 Section 2</h2>
 
 <p>Section 2
 </p>
-<hr>
-<span id="section-3"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+</div>
+<div class="section" id="section-3">
+<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="#section-2" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#first" title="Up section"> Up </a>]</td>
@@ -417,7 +432,8 @@ 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>
-<span id="Section-3"></span><h2 class="section">1.3 Section 3</h2>
+<div class="node" id="Section-3">
+<h2 class="section">1.3 Section 3</h2>
 
 <span id="index-section-3"></span>
 
@@ -488,11 +504,13 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<span id="node-in-section-3"></span>
+</div><div class="node" id="node-in-section-3">
+
 <span id="index-node-in-section-3"></span>
 <p>Text for the node in section 3
 </p>
-<span id="node-2-in-section-3"></span>
+</div><div class="node" id="node-2-in-section-3">
+
 <span id="index-node-2-in-section-3"></span>
 <p>Text for the node 2 in section 3
 </p>
@@ -634,10 +652,11 @@ ul.no-bullet {list-style: none}
 
 <span id="index-after-second-printindex-node-in-section-3"></span>
 
-<span id="node-3-in-section-3"></span>
+</div><div class="node" id="node-3-in-section-3">
+
 <span id="index-node-3-in-section-3"></span>
 
-<hr>
+</div><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>
@@ -651,6 +670,8 @@ 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>
+</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_split/res_html/index.html b/tp/t/results/moreindices/index_split/res_html/index.html
index 1ea548227c..8b2715deec 100644
--- a/tp/t/results/moreindices/index_split/res_html/index.html
+++ b/tp/t/results/moreindices/index_split/res_html/index.html
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -43,7 +44,8 @@ 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>
-<span id="split-indices"></span><h1 class="top">split indices</h1>
+<div class="node" id="split-indices">
+<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>
@@ -219,7 +221,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
+</div><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>
@@ -228,6 +230,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>
 <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/res_html/index_split_abt.html b/tp/t/results/moreindices/index_split/res_html/index_split_abt.html
index 0e5385f101..dfc4f6976a 100644
--- a/tp/t/results/moreindices/index_split/res_html/index_split_abt.html
+++ b/tp/t/results/moreindices/index_split/res_html/index_split_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</td>
@@ -143,7 +143,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</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 167cebb539..b2acc593e3 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="second-chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="second-chapter">
+<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">[<a href="first.html#section-3" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
@@ -49,11 +50,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="index_split_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
 </tr></table>
-<span id="Second-chapter"></span><h1 class="chapter">2 Second chapter</h1>
+<div class="node" id="Second-chapter">
+<h1 class="chapter">2 Second chapter</h1>
 
 <p>Second chapter
 </p>
-<hr>
+</div><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>
@@ -67,6 +69,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>
 <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/first.html b/tp/t/results/moreindices/index_split_nodes/res_html/first.html
index f7e4785592..7a461ba6ce 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="first"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="first">
+<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>
@@ -154,7 +155,8 @@ ul.no-bullet {list-style: none}
 
 <span id="index-entry-after-printindex"></span>
 
-<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
+<div class="node" id="First-chapter">
+<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>
@@ -174,7 +176,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
+</div><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>
@@ -190,6 +192,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>
 <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/index.html b/tp/t/results/moreindices/index_split_nodes/res_html/index.html
index d67d2d862c..85912c1515 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
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -44,7 +45,8 @@ 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>
-<span id="split-indices"></span><h1 class="top">split indices</h1>
+<div class="node" id="split-indices">
+<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>
@@ -220,7 +222,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
+</div><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>
@@ -229,6 +231,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>
 <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/index_split_abt.html b/tp/t/results/moreindices/index_split_nodes/res_html/index_split_abt.html
index 7dfa101af1..33b1bd2c83 100644
--- a/tp/t/results/moreindices/index_split_nodes/res_html/index_split_abt.html
+++ b/tp/t/results/moreindices/index_split_nodes/res_html/index_split_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</td>
@@ -144,7 +144,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</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 1231c95560..0f25ca12d8 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,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="node-2-in-section-3"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="node-2-in-section-3">
+<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>
@@ -193,7 +194,7 @@ ul.no-bullet {list-style: none}
 
 <span id="index-after-second-printindex-node-in-section-3"></span>
 
-<hr>
+</div><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 f7bda3bae1..5a1cc199fb 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,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="node-3-in-section-3"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="node-3-in-section-3">
+<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>
@@ -54,7 +55,7 @@ ul.no-bullet {list-style: none}
 
 <span id="index-node-3-in-section-3"></span>
 
-<hr>
+</div><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 c635872969..3ecf577f86 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,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="node-in-section-3"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="node-in-section-3">
+<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>
@@ -55,7 +56,7 @@ ul.no-bullet {list-style: none}
 <span id="index-node-in-section-3"></span>
 <p>Text for the node in section 3
 </p>
-<hr>
+</div><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 215cc0b48b..f372619ebd 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="second-chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="second-chapter">
+<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="node-3-in-section-3.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>
@@ -50,11 +51,13 @@ 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>
-<span id="Second-chapter"></span><h1 class="chapter">2 Second chapter</h1>
+<div class="node" id="Second-chapter">
+<h1 class="chapter">2 Second chapter</h1>
 
 <p>Second chapter
 </p>
-<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_split_nodes/res_html/section-1.html b/tp/t/results/moreindices/index_split_nodes/res_html/section-1.html
index b5c9f29b1e..471e4a6cb8 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="section-1"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="section" id="section-1">
+<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>
 <td valign="middle" align="left">[<a href="first.html" title="Up section"> Up </a>]</td>
@@ -50,7 +51,8 @@ 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>
-<span id="Section-1"></span><h2 class="section">1.1 Section 1</h2>
+<div class="node" id="Section-1">
+<h2 class="section">1.1 Section 1</h2>
 
 <span id="index-something"></span>
 
@@ -131,7 +133,7 @@ ul.no-bullet {list-style: none}
 
 <span id="index-another"></span>
 
-<hr>
+</div><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>
@@ -147,6 +149,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>
 <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/section-2.html b/tp/t/results/moreindices/index_split_nodes/res_html/section-2.html
index bd117e685c..59c82b02c0 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="section-2"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="section" id="section-2">
+<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-2.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>
@@ -50,11 +51,13 @@ 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>
-<span id="Section-2"></span><h2 class="section">1.2 Section 2</h2>
+<div class="node" id="Section-2">
+<h2 class="section">1.2 Section 2</h2>
 
 <p>Section 2
 </p>
-<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_split_nodes/res_html/section-3.html b/tp/t/results/moreindices/index_split_nodes/res_html/section-3.html
index b557bc5356..565db043b4 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="section-3"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="section" id="section-3">
+<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>
 <td valign="middle" align="left">[<a href="first.html" title="Up section"> Up </a>]</td>
@@ -50,7 +51,8 @@ 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>
-<span id="Section-3"></span><h2 class="section">1.3 Section 3</h2>
+<div class="node" id="Section-3">
+<h2 class="section">1.3 Section 3</h2>
 
 <span id="index-section-3"></span>
 
@@ -121,7 +123,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<hr>
+</div><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>
@@ -137,6 +139,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>
 <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/subsection-1.html b/tp/t/results/moreindices/index_split_nodes/res_html/subsection-1.html
index ed9314a2bd..9346de109b 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="subsection-1"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="subsection" id="subsection-1">
+<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-1.html" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="section-1.html" title="Up section"> Up </a>]</td>
@@ -50,11 +51,13 @@ 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>
-<span id="Subsection-1"></span><h3 class="subsection">1.1.1 Subsection 1</h3>
+<div class="node" id="Subsection-1">
+<h3 class="subsection">1.1.1 Subsection 1</h3>
 
 <p>In subsection 1
 </p>
-<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_split_nodes/res_html/subsection-2.html b/tp/t/results/moreindices/index_split_nodes/res_html/subsection-2.html
index ce67320422..7dcb3426e6 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="subsection-2"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="subsection" id="subsection-2">
+<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>
 <td valign="middle" align="left">[<a href="section-1.html" title="Up section"> Up </a>]</td>
@@ -50,7 +51,8 @@ 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>
-<span id="Subsection-2"></span><h3 class="subsection">1.1.2 Subsection 2</h3>
+<div class="node" id="Subsection-2">
+<h3 class="subsection">1.1.2 Subsection 2</h3>
 
 <p>index in subsction 2
 </p>
@@ -125,7 +127,7 @@ ul.no-bullet {list-style: none}
 
 <span id="index-printindex-subsection-2"></span>
 
-<hr>
+</div><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>
@@ -141,6 +143,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>
 <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/res_html/first-before-top.html b/tp/t/results/moreindices/nodes_before_top/res_html/first-before-top.html
index b990e6513e..4fbfa5d3c8 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,7 +36,8 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="first-before-top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="first-before-top">
+<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>
@@ -119,8 +120,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
-<span id="node-in-menu-before-top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+<div class="node" id="node-in-menu-before-top">
+<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>
@@ -203,8 +205,9 @@ ul.no-bullet {list-style: none}
 <span id="index-printindex-node-in-menu-before-top"></span>
 
 
-<hr size="6">
-<span id="first"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr size="6">
+<div class="node" id="first">
+<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>
@@ -291,8 +294,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
-<span id="second"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+<div class="node" id="second">
+<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>
@@ -343,8 +347,9 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<hr>
-<span id="another"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+<div class="node" id="another">
+<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>
@@ -365,8 +370,9 @@ ul.no-bullet {list-style: none}
 <span id="index-somewhere"></span>
 <span id="index-another"></span>
 
-<hr>
-<span id="a-node"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+<div class="node" id="a-node">
+<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>
@@ -509,7 +515,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<hr>
+</div><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 b140b58156..2f57bb26b2 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,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="Top">
+<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>
@@ -202,7 +203,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
+</div><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/res_html/nodes_before_top_abt.html b/tp/t/results/moreindices/nodes_before_top/res_html/nodes_before_top_abt.html
index d3bdc51fdf..e7b4368fb5 100644
--- a/tp/t/results/moreindices/nodes_before_top/res_html/nodes_before_top_abt.html
+++ b/tp/t/results/moreindices/nodes_before_top/res_html/nodes_before_top_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</td>
@@ -143,7 +143,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</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 16bf725d71..1299872c4b 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,7 +36,8 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="first-before-top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="first-before-top">
+<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>
@@ -190,7 +191,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<span id="node-in-menu-before-top"></span>
+</div><div class="node" id="node-in-menu-before-top">
+
 <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>
@@ -266,7 +268,8 @@ ul.no-bullet {list-style: none}
 <span id="index-printindex-node-in-menu-before-top"></span>
 
 
-<span id="Top"></span><span id="index-entry-a"></span>
+</div><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>
  &nbsp; 
@@ -436,7 +439,8 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<span id="top-section"></span><h1 class="top">top section</h1>
+<div class="node" id="top-section">
+<h1 class="top">top section</h1>
 <span id="index-top-section"></span>
 
 <p>in top section
@@ -450,7 +454,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<span id="first"></span><p>Text and then index entries
+</div><div class="node" id="first">
+<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>
@@ -529,7 +534,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<span id="second"></span><table class="menu" border="0" cellspacing="0">
+</div><div class="node" id="second">
+<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">
@@ -564,12 +570,14 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<span id="another"></span>
+</div><div class="node" id="another">
+
 <span id="index-something"></span>
 <span id="index-somewhere"></span>
 <span id="index-another"></span>
 
-<span id="a-node"></span><span id="index-entry-after-printindex"></span>
+</div><div class="node" id="a-node">
+<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; 
@@ -712,8 +720,9 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<hr size="6">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -728,7 +737,8 @@ 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>
-<span id="A-chapter"></span><h1 class="chapter">1 A chapter</h1>
+<div class="node" id="A-chapter">
+<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; 
@@ -799,11 +809,14 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<span id="node-in-chapter"></span>
+</div><div class="node" id="node-in-chapter">
+
 <span id="index-node-in-chapter"></span>
 
-<hr size="6">
-<span id="SEC_About"></span>
+</div><hr size="6">
+</div>
+</div>
+<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>
 <td valign="middle" align="left">[Contents]</td>
@@ -912,7 +925,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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_no_nodes/res_html/index.html b/tp/t/results/moreindices/nodes_before_top_no_nodes/res_html/index.html
index 85f73a04ba..a20b7c289c 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,7 +36,8 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="first-before-top"></span><span id="index-first-before-top"></span>
+<div class="node" id="first-before-top">
+<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>
@@ -103,7 +104,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<span id="node-in-menu-before-top"></span>
+</div><div class="node" id="node-in-menu-before-top">
+
 <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; 
@@ -170,7 +172,8 @@ ul.no-bullet {list-style: none}
 <span id="index-printindex-node-in-menu-before-top"></span>
 
 
-<span id="Top"></span><span id="index-entry-a"></span>
+</div><div class="node" id="Top">
+<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; 
@@ -329,7 +332,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<span id="first"></span><p>Text and then index entries
+</div><div class="node" id="first">
+<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>
@@ -400,7 +404,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<span id="second"></span><table class="menu" border="0" cellspacing="0">
+</div><div class="node" id="second">
+<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">
@@ -435,12 +440,14 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<span id="another"></span>
+</div><div class="node" id="another">
+
 <span id="index-something"></span>
 <span id="index-somewhere"></span>
 <span id="index-another"></span>
 
-<span id="a-node"></span><span id="index-entry-after-printindex"></span>
+</div><div class="node" id="a-node">
+<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; 
@@ -567,7 +574,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<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 489a6d28d8..b614cc33cb 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,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="a-node"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="a-node">
+<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>
@@ -178,7 +179,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<hr>
+</div><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 79b3fef239..5a08b206ec 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,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="another"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="another">
+<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>
@@ -56,7 +57,7 @@ ul.no-bullet {list-style: none}
 <span id="index-somewhere"></span>
 <span id="index-another"></span>
 
-<hr>
+</div><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 7ef6938c32..71291d3df4 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,7 +36,8 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="first-before-top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="first-before-top">
+<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,7 +121,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
+</div><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 8c421fd560..d63ed8a85e 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,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="first"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="first">
+<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>
@@ -122,7 +123,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
+</div><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 753aa740df..2a3f11d751 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,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="Top">
+<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>
@@ -203,7 +204,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
+</div><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 49f26d9bfa..98958c834c 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,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="node-in-menu-before-top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="node-in-menu-before-top">
+<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>
@@ -118,7 +119,7 @@ ul.no-bullet {list-style: none}
 <span id="index-printindex-node-in-menu-before-top"></span>
 
 
-<hr>
+</div><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/nodes_before_top_abt.html b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/nodes_before_top_abt.html
index 5a973a196c..edb0da8c2d 100644
--- a/tp/t/results/moreindices/nodes_before_top_nodes/res_html/nodes_before_top_abt.html
+++ b/tp/t/results/moreindices/nodes_before_top_nodes/res_html/nodes_before_top_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</td>
@@ -144,7 +144,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</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 9ff909fbb5..c37cbd0400 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,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="second"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="second">
+<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>
@@ -86,7 +87,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<hr>
+</div><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 10152b8634..4c53c7b3a8 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="first"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="first">
+<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>
@@ -49,7 +50,8 @@ 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>
-<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
+<div class="node" id="First-chapter">
+<h1 class="chapter">1 First chapter</h1>
 
 <p>Text and then index entries
 <span id="index-entry-in-node"></span>
@@ -116,8 +118,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
-<span id="section-1"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -132,7 +135,8 @@ 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>
-<span id="Section-1"></span><h2 class="section">1.1 Section 1</h2>
+<div class="node" id="Section-1">
+<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">
@@ -143,8 +147,9 @@ ul.no-bullet {list-style: none}
 
 <span id="index-another"></span>
 
-<hr>
-<span id="subsection-1"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#section-1" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#section-1" title="Up section"> Up </a>]</td>
@@ -159,13 +164,14 @@ 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>
-<span id="Subsection-1"></span><h3 class="subsection">1.1.1 Subsection 1</h3>
+<div class="node" id="Subsection-1">
+<h3 class="subsection">1.1.1 Subsection 1</h3>
 
 <p>In subsection 1
 </p>
 <span id="index-printindex-subsection-2"></span>
 
-<hr>
+</div><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>
@@ -179,6 +185,9 @@ 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>
+</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/moreindices/split_chapter_index/res_html/index.html b/tp/t/results/moreindices/split_chapter_index/res_html/index.html
index 7d12904fdb..bc9f7a1e67 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
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -43,7 +44,8 @@ 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>
-<span id="split-indices"></span><h1 class="top">split indices</h1>
+<div class="node" id="split-indices">
+<h1 class="top">split indices</h1>
 <span id="index-entry-a"></span>
 
 <p>Text in top.
@@ -54,7 +56,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
+</div><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>
@@ -63,6 +65,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>
 <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/split_chapter_index_abt.html b/tp/t/results/moreindices/split_chapter_index/res_html/split_chapter_index_abt.html
index c39fdd5468..f50823f9a9 100644
--- a/tp/t/results/moreindices/split_chapter_index/res_html/split_chapter_index_abt.html
+++ b/tp/t/results/moreindices/split_chapter_index/res_html/split_chapter_index_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</td>
@@ -143,7 +143,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</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 e2be1b7757..e4213fee90 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,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="before-top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="before-top">
+<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>
@@ -52,8 +53,9 @@ ul.no-bullet {list-style: none}
 </tr></table>
 <h3 class="node-heading">before top</h3>
 
-<hr size="6">
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr size="6">
+<div class="node" id="Top">
+<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>
@@ -70,8 +72,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="node"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr size="6">
+<div class="node" id="node">
+<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>
@@ -99,8 +102,8 @@ ul.no-bullet {list-style: none}
 </p>
 <p>Ref to @samp{node} <a href="#node">node</a>.
 </p>
-<hr size="6">
-<span id="SEC_About"></span>
+</div><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>
 <td valign="middle" align="left">[Contents]</td>
@@ -209,7 +212,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/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 2909d04f50..7fa0b6bdb0 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,8 +35,10 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="before-top"></span>
-<span id="Top"></span>
+<div class="node" id="before-top">
+
+</div><div class="node" id="Top">
+
 <p>Equivalent nodes in node line and in menu.
 </p>
 <table class="menu" border="0" cellspacing="0">
@@ -44,7 +46,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<span id="node"></span>
+</div><div class="node" id="node">
+
 <div class="float">
 <p>A figure
 </p><div class="float-caption"><p><strong>Figure
@@ -56,7 +59,7 @@ ul.no-bullet {list-style: none}
 </p>
 <p>Ref to @samp{node} <a href="#node">node</a>.
 </p>
-<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 0aeba8d558..1141944c3f 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
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#c1" title="Next section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -43,7 +44,8 @@ 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>
-<span id="top"></span><h1 class="top">top</h1>
+<div class="node" id="top">
+<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">
@@ -54,8 +56,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="c1"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr size="6">
+<div class="chapter" id="c1">
+<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>
@@ -72,8 +75,9 @@ ul.no-bullet {list-style: none}
 </tr></table>
 <h1 class="chapter">1 c1</h1>
 
-<hr>
-<span id="n-c2"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#c1" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Up section"> Up </a>]</td>
@@ -88,10 +92,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>
-<span id="c2"></span><h1 class="chapter">2 c2</h1>
+<div class="node" id="c2">
+<h1 class="chapter">2 c2</h1>
 
-<hr>
-<span id="s1"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+<div class="section" id="s1">
+<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>
@@ -108,8 +114,10 @@ ul.no-bullet {list-style: none}
 </tr></table>
 <h2 class="section">2.1 s1</h2>
 
-<hr>
-<span id="n-c3"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+</div>
+<div class="chapter" id="n-c3">
+<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="#s1" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Up section"> Up </a>]</td>
@@ -124,15 +132,17 @@ 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>
-<span id="c3"></span><h1 class="chapter">3 c3</h1>
+<div class="node" id="c3">
+<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>
 
-<hr>
-<span id="C3-s1"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+<div class="section" id="C3-s1">
+<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>
@@ -149,8 +159,9 @@ ul.no-bullet {list-style: none}
 </tr></table>
 <h2 class="section">3.1 C3 s1</h2>
 
-<hr>
-<span id="n-c3-s-2"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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="#n-c3" title="Up section"> Up </a>]</td>
@@ -165,10 +176,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>
-<span id="c3-s2"></span><h2 class="section">3.2 c3 s2</h2>
+<div class="node" id="c3-s2">
+<h2 class="section">3.2 c3 s2</h2>
 
-<hr>
-<span id="c3-s3"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+<div class="section" id="c3-s3">
+<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>
@@ -185,8 +198,9 @@ ul.no-bullet {list-style: none}
 </tr></table>
 <h2 class="section">3.3 c3 s3</h2>
 
-<hr>
-<span id="c4"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+<div class="chapter" id="c4">
+<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>
@@ -203,8 +217,9 @@ ul.no-bullet {list-style: none}
 </tr></table>
 <h1 class="chapter">4 c4</h1>
 
-<hr>
-<span id="c3-s1"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+<div class="section" id="c3-s1">
+<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>
@@ -221,8 +236,9 @@ ul.no-bullet {list-style: none}
 </tr></table>
 <h2 class="section">4.1 c3 s1</h2>
 
-<hr>
-<span id="c3-s1-s1"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+<div class="subsection" id="c3-s1-s1">
+<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>
@@ -239,8 +255,9 @@ ul.no-bullet {list-style: none}
 </tr></table>
 <h3 class="subsection">4.1.1 c3 s1 s1</h3>
 
-<hr>
-<span id="n-c3-s1-s2"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#c3-s1-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,10 +272,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>
-<span id="c3-s1-s2"></span><h3 class="subsection">4.1.2 c3 s1 s2</h3>
+<div class="node" id="c3-s1-s2">
+<h3 class="subsection">4.1.2 c3 s1 s2</h3>
 
-<hr>
-<span id="appendix"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+<div class="appendix" id="appendix">
+<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>
@@ -275,8 +294,12 @@ ul.no-bullet {list-style: none}
 </tr></table>
 <h1 class="appendix">Appendix A appendix</h1>
 
-<hr size="6">
-<span id="SEC_About"></span>
+</div><hr size="6">
+</div>
+</div>
+</div>
+</div>
+<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>
 <td valign="middle" align="left">[Contents]</td>
@@ -385,7 +408,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/moresectioning/node_footnote_end/res_html/node_footnote.html b/tp/t/results/moresectioning/node_footnote_end/res_html/node_footnote.html
index 870acf12a4..2a0398a1d2 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,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span>
+<div class="node" id="Top">
+
 <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>
@@ -47,26 +48,31 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<span id="g_t_00e1"></span>
+</div><div class="node" id="g_t_00e1">
+
 <p>node &aacute;,
 Footnote 1<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>.
 </p>
-<span id="g_t_00e2"></span>
+</div><div class="node" id="g_t_00e2">
+
 <p>node &acirc;,
 Footnote 2<a id="DOCF2" href="#FOOT2"><sup>2</sup></a>.
 </p>
-<span id="chapter"></span><span id="chapter-1"></span><h1 class="chapter">1 chapter</h1>
+</div><div class="chapter" id="chapter">
+<div class="node" id="chapter-1">
+<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>
 
-<span id="g_t_00e0"></span>
+</div><div class="node" id="g_t_00e0">
+
 <p>node &agrave;,
 Footnote 3<a id="DOCF3" href="#FOOT3"><sup>3</sup></a>.
 </p>
-<div class="footnote">
+</div><div class="footnote">
 <hr>
 <h3 class="footnotes-heading">Footnotes</h3>
 
@@ -77,7 +83,8 @@ Footnote 3<a id="DOCF3" href="#FOOT3"><sup>3</sup></a>.
 <h5><a id="FOOT3" href="#DOCF3">(3)</a></h5>
 <p>foot 3 &agrave;</p>
 </div>
-<hr>
+<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>.
 </font></p>
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 870acf12a4..2a0398a1d2 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,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span>
+<div class="node" id="Top">
+
 <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>
@@ -47,26 +48,31 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<span id="g_t_00e1"></span>
+</div><div class="node" id="g_t_00e1">
+
 <p>node &aacute;,
 Footnote 1<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>.
 </p>
-<span id="g_t_00e2"></span>
+</div><div class="node" id="g_t_00e2">
+
 <p>node &acirc;,
 Footnote 2<a id="DOCF2" href="#FOOT2"><sup>2</sup></a>.
 </p>
-<span id="chapter"></span><span id="chapter-1"></span><h1 class="chapter">1 chapter</h1>
+</div><div class="chapter" id="chapter">
+<div class="node" id="chapter-1">
+<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>
 
-<span id="g_t_00e0"></span>
+</div><div class="node" id="g_t_00e0">
+
 <p>node &agrave;,
 Footnote 3<a id="DOCF3" href="#FOOT3"><sup>3</sup></a>.
 </p>
-<div class="footnote">
+</div><div class="footnote">
 <hr>
 <h3 class="footnotes-heading">Footnotes</h3>
 
@@ -77,7 +83,8 @@ Footnote 3<a id="DOCF3" href="#FOOT3"><sup>3</sup></a>.
 <h5><a id="FOOT3" href="#DOCF3">(3)</a></h5>
 <p>foot 3 &agrave;</p>
 </div>
-<hr>
+<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>.
 </font></p>
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 cd18057ab2..4df5a83f4c 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,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_00e1"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="g_t_00e1">
+<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>
@@ -55,8 +56,9 @@ ul.no-bullet {list-style: none}
 <p>node &aacute;,
 Footnote 1<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>.
 </p>
-<hr>
-<span id="g_t_00e2"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+<div class="node" id="g_t_00e2">
+<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>
@@ -76,7 +78,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 class="footnote">
+</div><div class="footnote">
 <hr>
 <h3 class="footnotes-heading">Footnotes</h3>
 
@@ -86,7 +88,8 @@ Footnote 2<a id="DOCF2" href="#FOOT2"><sup>2</sup></a>.
 <p>foot 2 &acirc;</p>
 </div>
 <hr>
-<span id="g_t_00e0"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="g_t_00e0">
+<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>
@@ -106,7 +109,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 class="footnote">
+</div><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 e71304f5b0..f412100b78 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="chapter">
+<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="a.html#g_t_00e2" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
@@ -50,14 +51,16 @@ 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>
-<span id="chapter-1"></span><h1 class="chapter">1 chapter</h1>
+<div class="node" id="chapter-1">
+<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>
 
-<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/node_footnote_use_node/res_html/index.html b/tp/t/results/moresectioning/node_footnote_use_node/res_html/index.html
index 55baf8a304..8532094e7b 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,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="Top">
+<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>
@@ -57,7 +58,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
+</div><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/node_footnote_use_node/res_html/node_footnote_abt.html b/tp/t/results/moresectioning/node_footnote_use_node/res_html/node_footnote_abt.html
index 4937216036..f905d7f1f6 100644
--- a/tp/t/results/moresectioning/node_footnote_use_node/res_html/node_footnote_abt.html
+++ b/tp/t/results/moresectioning/node_footnote_use_node/res_html/node_footnote_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</td>
@@ -144,7 +144,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</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 2c99645767..5bdc2cd4d3 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,7 +36,8 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="Top"></span><p>Top node
+<div class="node" id="Top">
+<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>
@@ -44,13 +45,17 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<span id="second-node"></span>
+</div><div class="node" id="second-node">
+
 <p>second node
 </p>
-<span id="third-node"></span><span id="chapter"></span><h1 class="chapter">1 chapter</h1>
+</div><div class="chapter" id="third-node">
+<div class="node" id="chapter">
+<h1 class="chapter">1 chapter</h1>
 
 
-<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>.
 </font></p>
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 6e17c81869..6e9a1f49ed 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,7 +36,8 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="Top">
+<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>
@@ -53,8 +54,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="second-node"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr size="6">
+<div class="node" id="second-node">
+<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>
@@ -73,7 +75,7 @@ ul.no-bullet {list-style: none}
 
 <p>second node
 </p>
-<hr>
+</div><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/nodes_after_top_before_chapter_abt.html b/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/nodes_after_top_before_chapter_abt.html
index d245d912c8..a49d36ae36 100644
--- a/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/nodes_after_top_before_chapter_abt.html
+++ b/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/nodes_after_top_before_chapter_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</td>
@@ -143,7 +143,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</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 dd50632d65..d26fcd5afa 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="third-node"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="third-node">
+<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#second-node" 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>
@@ -49,10 +50,11 @@ 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>
-<span id="chapter"></span><h1 class="chapter">1 chapter</h1>
+<div class="node" id="chapter">
+<h1 class="chapter">1 chapter</h1>
 
 
-<hr>
+</div><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>
@@ -66,6 +68,7 @@ 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>
 <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/nodes_after_top_before_section/res_html/index.html b/tp/t/results/moresectioning/nodes_after_top_before_section/res_html/index.html
index 49cc39f0ba..fce843f483 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,7 +36,8 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="Top"></span><p>Top node
+<div class="node" id="Top">
+<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>
@@ -44,13 +45,17 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<span id="second-node"></span>
+</div><div class="node" id="second-node">
+
 <p>second node
 </p>
-<span id="third-node"></span><span id="subsection"></span><h3 class="subsection">1 subsection</h3>
+</div><div class="subsection" id="third-node">
+<div class="node" id="subsection">
+<h3 class="subsection">1 subsection</h3>
 
 
-<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>.
 </font></p>
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 71f4ac12aa..bec88d503e 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,7 +36,8 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="Top">
+<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>
@@ -53,8 +54,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="second-node"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr size="6">
+<div class="node" id="second-node">
+<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>
@@ -73,8 +75,9 @@ ul.no-bullet {list-style: none}
 
 <p>second node
 </p>
-<hr>
-<span id="third-node"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#second-node" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Up section"> Up </a>]</td>
@@ -89,11 +92,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>
-<span id="subsection"></span><h3 class="subsection">1 subsection</h3>
+<div class="node" id="subsection">
+<h3 class="subsection">1 subsection</h3>
 
 
-<hr size="6">
-<span id="SEC_About"></span>
+</div><hr size="6">
+</div>
+<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>
 <td valign="middle" align="left">[Contents]</td>
@@ -202,7 +207,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/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 1bd046f703..b26c58887a 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,7 +36,8 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="Top">
+<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>
@@ -53,8 +54,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="second-node"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr size="6">
+<div class="node" id="second-node">
+<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>
@@ -73,8 +75,9 @@ ul.no-bullet {list-style: none}
 
 <p>second node
 </p>
-<hr>
-<span id="third-node"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#second-node" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Up section"> Up </a>]</td>
@@ -89,10 +92,11 @@ 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>
-<span id="subsection"></span><h3 class="subsection">1 subsection</h3>
+<div class="node" id="subsection">
+<h3 class="subsection">1 subsection</h3>
 
 
-<hr>
+</div><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>
@@ -106,6 +110,7 @@ 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>
 <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/nodes_after_top_before_section_use_nodes_chapter/res_html/nodes_after_top_before_section_abt.html b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter/res_html/nodes_after_top_before_section_abt.html
index d245d912c8..a49d36ae36 100644
--- a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter/res_html/nodes_after_top_before_section_abt.html
+++ b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter/res_html/nodes_after_top_before_section_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</td>
@@ -143,7 +143,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</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 a09f0a3023..474aee90e2 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,7 +61,8 @@ ul.no-bullet {list-style: none}
 
 <span id="index-index-entry"></span>
 
-<span id="section"></span><h2 class="section">1 section</h2>
+<div class="section" id="section">
+<h2 class="section">1 section</h2>
 
 <p>Ref to anchor
 <a href="#An-anchor">An anchor</a>
@@ -69,7 +70,7 @@ ul.no-bullet {list-style: none}
 <p>Ref to footnote anchor
 <a href="#Anchor-in-footnote">Anchor in footnote</a>
 </p>
-<div class="footnote">
+</div><div class="footnote">
 <hr>
 <h3 class="footnotes-heading">Footnotes</h3>
 
@@ -81,7 +82,7 @@ ul.no-bullet {list-style: none}
 <a href="#An-anchor">An anchor</a>
 </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>.
 </font></p>
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 e56cf40d75..030b21eac7 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="First-node"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="First-node">
+<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>
@@ -49,7 +50,8 @@ 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>
-<span id="first-node-chapter"></span><h1 class="chapter">1 first node chapter</h1>
+<div class="node" id="first-node-chapter">
+<h1 class="chapter">1 first node chapter</h1>
 
 <p>first node chapter text
 </p><table class="menu" border="0" cellspacing="0">
@@ -63,8 +65,9 @@ ul.no-bullet {list-style: none}
 
 </pre></th></tr></table>
 
-<hr>
-<span id="unnumbered"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#First-node" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#First-node" title="Up section"> Up </a>]</td>
@@ -79,7 +82,8 @@ 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>
-<span id="unnumbered-section"></span><h2 class="unnumberedsec">unnumbered section</h2>
+<div class="node" id="unnumbered-section">
+<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
@@ -92,8 +96,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
-<span id="unnumbered-sub"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#unnumbered" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#unnumbered" title="Up section"> Up </a>]</td>
@@ -108,10 +113,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>
-<span id="unnumbered-subsection"></span><h3 class="unnumberedsubsec">unnumbered subsection</h3>
+<div class="node" id="unnumbered-subsection">
+<h3 class="unnumberedsubsec">unnumbered subsection</h3>
 
-<hr>
-<span id="numbered-sub"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+</div>
+<div class="subsection" id="numbered-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>
 <td valign="middle" align="left">[<a href="#unnumbered-sub" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#unnumbered" title="Up section"> Up </a>]</td>
@@ -126,10 +134,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>
-<span id="numbered-subsection"></span><h3 class="subsection">numbered subsection</h3>
+<div class="node" id="numbered-subsection">
+<h3 class="subsection">numbered subsection</h3>
 
-<hr>
-<span id="unnumbered-sub2"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+</div>
+<div class="unnumberedsubsec" id="unnumbered-sub2">
+<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="#numbered-sub" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#unnumbered" title="Up section"> Up </a>]</td>
@@ -144,10 +155,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>
-<span id="unnumbered-subsection2"></span><h3 class="unnumberedsubsec">unnumbered subsection2</h3>
+<div class="node" id="unnumbered-subsection2">
+<h3 class="unnumberedsubsec">unnumbered subsection2</h3>
 
-<hr>
-<span id="numbered-sub2"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+</div>
+<div class="subsection" id="numbered-sub2">
+<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="#unnumbered-sub2" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#unnumbered" title="Up section"> Up </a>]</td>
@@ -162,10 +176,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>
-<span id="numbered-subsection2"></span><h3 class="subsection">numbered subsection2</h3>
+<div class="node" id="numbered-subsection2">
+<h3 class="subsection">numbered subsection2</h3>
 
-<hr>
-<span id="unnumbered2"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+</div>
+</div>
+<div class="unnumberedsec" id="unnumbered2">
+<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="#numbered-sub2" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#First-node" title="Up section"> Up </a>]</td>
@@ -180,15 +198,17 @@ 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>
-<span id="unnumbered-section2"></span><h2 class="unnumberedsec">unnumbered section2</h2>
+<div class="node" id="unnumbered-section2">
+<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>
 
-<hr>
-<span id="numbered-sub3"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#unnumbered2" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#unnumbered2" title="Up section"> Up </a>]</td>
@@ -203,11 +223,15 @@ 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>
-<span id="numbered-subsection3"></span><h3 class="subsection">numbered subsection3</h3>
+<div class="node" id="numbered-subsection3">
+<h3 class="subsection">numbered subsection3</h3>
 
 
-<hr>
-<span id="numbered"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+</div>
+</div>
+<div class="section" id="numbered">
+<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="#numbered-sub3" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#First-node" title="Up section"> Up </a>]</td>
@@ -222,12 +246,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>
-<span id="numbered-section"></span><h2 class="section">1.1 numbered section</h2>
+<div class="node" id="numbered-section">
+<h2 class="section">1.1 numbered section</h2>
+
+</div><div class="node" id="between-node">
 
-<span id="between-node"></span>
 <p>between node, node without sectioning node
 </p>
-<hr>
+</div><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>
@@ -241,6 +267,8 @@ 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>
+</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/sectioning_frames/res_html/Second-node.html b/tp/t/results/moresectioning/sectioning_frames/res_html/Second-node.html
index db3c6bc966..44297db1df 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Second-node"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="Second-node">
+<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="First-node.html#numbered" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
@@ -52,11 +53,12 @@ ul.no-bullet {list-style: none}
 
 <p>Second node text
 </p>
-<span id="second-node-chapter"></span><h1 class="chapter">2 second node chapter</h1>
+<div class="node" id="second-node-chapter">
+<h1 class="chapter">2 second node chapter</h1>
 
 <p>second node chapter text.
 </p>
-<hr>
+</div><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>
@@ -70,6 +72,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>
 <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/sectioning_frames/res_html/Third-node-unnumbered.html b/tp/t/results/moresectioning/sectioning_frames/res_html/Third-node-unnumbered.html
index 5b57ebd910..36654794c8 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Third-node-unnumbered"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="unnumbered" id="Third-node-unnumbered">
+<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">[<a href="Second-node.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>
@@ -49,13 +50,15 @@ 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>
-<span id="unnumbered-chapter"></span><h1 class="unnumbered">unnumbered chapter</h1>
+<div class="node" id="unnumbered-chapter">
+<h1 class="unnumbered">unnumbered chapter</h1>
 
 <p>unnumbered chapter text.
 </p>
 
-<span id="Last-node-no-description"></span>
-<hr>
+</div><div class="node" id="Last-node-no-description">
+
+</div><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>
@@ -69,6 +72,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>
 <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/sectioning_frames/res_html/index.html b/tp/t/results/moresectioning/sectioning_frames/res_html/index.html
index 8dd8633384..edba441835 100644
--- a/tp/t/results/moresectioning/sectioning_frames/res_html/index.html
+++ b/tp/t/results/moresectioning/sectioning_frames/res_html/index.html
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -42,7 +43,8 @@ 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>
-<span id="SEC_Top"></span><table class="menu" border="0" cellspacing="0">
+<div class="node" id="SEC_Top">
+<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 ?
@@ -75,7 +77,7 @@ description here
 
 </pre></th></tr></table>
 
-<hr>
+</div><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>
@@ -84,6 +86,7 @@ description here
 <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>
 <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/sectioning_frames/res_html/sectioning_abt.html b/tp/t/results/moresectioning/sectioning_frames/res_html/sectioning_abt.html
index b76bcec395..d9745752db 100644
--- a/tp/t/results/moresectioning/sectioning_frames/res_html/sectioning_abt.html
+++ b/tp/t/results/moresectioning/sectioning_frames/res_html/sectioning_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="sectioning_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -143,7 +143,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="sectioning_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/t/results/moresectioning/sectioning_frames/res_html/sectioning_ovr.html b/tp/t/results/moresectioning/sectioning_frames/res_html/sectioning_ovr.html
index 5d5477acf1..3c98ac311c 100644
--- a/tp/t/results/moresectioning/sectioning_frames/res_html/sectioning_ovr.html
+++ b/tp/t/results/moresectioning/sectioning_frames/res_html/sectioning_ovr.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Overview"></span>
+<div class="Overview_element" id="SEC_Overview">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="sectioning_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -50,7 +50,7 @@ ul.no-bullet {list-style: none}
 <li><a id="stoc-unnumbered-chapter" href="Third-node-unnumbered.html">unnumbered chapter</a></li>
 </ul>
 </div>
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="sectioning_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/t/results/moresectioning/sectioning_frames/res_html/sectioning_toc.html b/tp/t/results/moresectioning/sectioning_frames/res_html/sectioning_toc.html
index 0a77107163..7e5d2df1df 100644
--- a/tp/t/results/moresectioning/sectioning_frames/res_html/sectioning_toc.html
+++ b/tp/t/results/moresectioning/sectioning_frames/res_html/sectioning_toc.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -65,7 +65,7 @@ ul.no-bullet {list-style: none}
   <li><a id="toc-unnumbered-chapter" href="Third-node-unnumbered.html">unnumbered chapter</a></li>
 </ul>
 </div>
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</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 40354439a3..e6ea5458c1 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
@@ -36,7 +36,8 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#Chap" title="Next section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -44,7 +45,8 @@ 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>
-<span id="The-top"></span><h1 class="top">The top</h1>
+<div class="node" id="The-top">
+<h1 class="top">The top</h1>
 
 <p>Just a top node.
 </p>
@@ -53,8 +55,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="Chap"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -69,12 +72,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>
-<span id="A-chapter"></span><h1 class="chapter">1 A chapter</h1>
+<div class="node" id="A-chapter">
+<h1 class="chapter">1 A chapter</h1>
 
 <p>Without the chapter, no up node from top is generated.
 </p>
-<hr size="6">
-<span id="SEC_About"></span>
+</div><hr size="6">
+</div>
+</div>
+<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>
 <td valign="middle" align="left">[Contents]</td>
@@ -183,7 +189,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/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 40354439a3..e6ea5458c1 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
@@ -36,7 +36,8 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#Chap" title="Next section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -44,7 +45,8 @@ 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>
-<span id="The-top"></span><h1 class="top">The top</h1>
+<div class="node" id="The-top">
+<h1 class="top">The top</h1>
 
 <p>Just a top node.
 </p>
@@ -53,8 +55,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="Chap"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -69,12 +72,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>
-<span id="A-chapter"></span><h1 class="chapter">1 A chapter</h1>
+<div class="node" id="A-chapter">
+<h1 class="chapter">1 A chapter</h1>
 
 <p>Without the chapter, no up node from top is generated.
 </p>
-<hr size="6">
-<span id="SEC_About"></span>
+</div><hr size="6">
+</div>
+</div>
+<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>
 <td valign="middle" align="left">[Contents]</td>
@@ -183,7 +189,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/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 0e20f6961f..d592367398 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
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -43,7 +44,8 @@ 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>
-<span id="g_t2-footnotes-in-2-nodes"></span><h1 class="top">2 footnotes in 2 nodes</h1>
+<div class="node" id="g_t2-footnotes-in-2-nodes">
+<h1 class="top">2 footnotes in 2 nodes</h1>
 
 <p>A<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
@@ -54,8 +56,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -70,14 +73,17 @@ 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>
-<span id="chapter-1"></span><h1 class="chapter">1 chapter</h1>
+<div class="node" id="chapter-1">
+<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>
-<hr size="6">
-<span id="SEC_Foot"></span>
+</div><hr size="6">
+</div>
+</div>
+<div class="Footnotes_element" id="SEC_Foot">
 <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>
 <td valign="middle" align="left">[Contents]</td>
@@ -102,8 +108,8 @@ ul.no-bullet {list-style: none}
 <p>Footnote chapter/2
 </p>
 <p>para2</p>
-<hr>
-<span id="SEC_About"></span>
+</div><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>
 <td valign="middle" align="left">[Contents]</td>
@@ -212,7 +218,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/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 0e20f6961f..d592367398 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
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -43,7 +44,8 @@ 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>
-<span id="g_t2-footnotes-in-2-nodes"></span><h1 class="top">2 footnotes in 2 nodes</h1>
+<div class="node" id="g_t2-footnotes-in-2-nodes">
+<h1 class="top">2 footnotes in 2 nodes</h1>
 
 <p>A<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
@@ -54,8 +56,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -70,14 +73,17 @@ 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>
-<span id="chapter-1"></span><h1 class="chapter">1 chapter</h1>
+<div class="node" id="chapter-1">
+<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>
-<hr size="6">
-<span id="SEC_Foot"></span>
+</div><hr size="6">
+</div>
+</div>
+<div class="Footnotes_element" id="SEC_Foot">
 <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>
 <td valign="middle" align="left">[Contents]</td>
@@ -102,8 +108,8 @@ ul.no-bullet {list-style: none}
 <p>Footnote chapter/2
 </p>
 <p>para2</p>
-<hr>
-<span id="SEC_About"></span>
+</div><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>
 <td valign="middle" align="left">[Contents]</td>
@@ -212,7 +218,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/regions/anchor_in_copying.pl b/tp/t/results/regions/anchor_in_copying.pl
index b33611b918..3eda7ed0cc 100644
--- a/tp/t/results/regions/anchor_in_copying.pl
+++ b/tp/t/results/regions/anchor_in_copying.pl
@@ -459,7 +459,8 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
 
 <p>Copying.
@@ -471,7 +472,7 @@ ul.no-bullet {list-style: none}
 
 <p>See <a href="#Copying-information">Copying information</a>.
 </p>
-<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 1595991e57..702bbf1813 100644
--- a/tp/t/results/regions/anchor_in_copying_in_footnote.pl
+++ b/tp/t/results/regions/anchor_in_copying_in_footnote.pl
@@ -505,7 +505,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
 
 <p>Copying<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>.
@@ -517,7 +518,7 @@ ul.no-bullet {list-style: none}
 
 <p>See <a href="#Copying-footnote">Copying footnote</a>.
 </p>
-<div class="footnote">
+</div><div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
@@ -528,7 +529,7 @@ ul.no-bullet {list-style: none}
 <p>In footnote.
 <span id="Copying-footnote"></span></p>
 </div>
-<hr>
+<hr></div>
 
 
 
diff --git a/tp/t/results/regions/anchor_in_titlepage.pl b/tp/t/results/regions/anchor_in_titlepage.pl
index c1274d0a79..79fc822b20 100644
--- a/tp/t/results/regions/anchor_in_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage.pl
@@ -388,11 +388,13 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="top"></span><h1 class="top">top</h1>
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="top" id="top">
+<h1 class="top">top</h1>
+</div><div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
 <p>See <a href="#in-titlepage">in titlepage</a>.
-</p><hr>
+</p></div><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 0148f57583..80a002b5d4 100644
--- a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
@@ -390,11 +390,13 @@ ul.no-bullet {list-style: none}
 
 <span id="in-titlepage"></span><hr>
 
-<span id="top"></span><h1 class="top">top</h1>
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="top" id="top">
+<h1 class="top">top</h1>
+</div><div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
 <p>See <a href="#in-titlepage">in titlepage</a>.
-</p><hr>
+</p></div><hr></div>
 
 
 
diff --git a/tp/t/results/regions/format_in_titlepage.pl b/tp/t/results/regions/format_in_titlepage.pl
index 973153f47a..5eb3f7d996 100644
--- a/tp/t/results/regions/format_in_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage.pl
@@ -324,9 +324,10 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
-<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 0b8ea3d077..688c09cb0d 100644
--- a/tp/t/results/regions/format_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage_titlepage.pl
@@ -330,9 +330,10 @@ ul.no-bullet {list-style: none}
 
 <hr>
 
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
-<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 644fc1af66..d49e72d2b1 100644
--- a/tp/t/results/regions/ref_in_copying.pl
+++ b/tp/t/results/regions/ref_in_copying.pl
@@ -698,11 +698,13 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#GFDL" accesskey="n" rel="next">GFDL</a> &nbsp; </p>
 </div>
-<span id="top"></span><h1 class="top">top</h1>
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 <p><a href="#GFDL">GFDL</a>
 </p>
@@ -710,14 +712,18 @@ 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>
-<hr>
-<span id="GFDL"></span><div class="header">
+</div><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>
-<span id="GFDL-1"></span><h2 class="chapter">1 GFDL</h2>
+<div class="node" id="GFDL-1">
+<h2 class="chapter">1 GFDL</h2>
 
-<hr>
+</div><hr>
+</div>
+</div>
 
 
 
diff --git a/tp/t/results/regions/today_in_copying.pl b/tp/t/results/regions/today_in_copying.pl
index 12bc110c8f..8f52d6a201 100644
--- a/tp/t/results/regions/today_in_copying.pl
+++ b/tp/t/results/regions/today_in_copying.pl
@@ -355,10 +355,13 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><span id="top"></span><h1 class="top">top</h1>
+<div class="top" id="Top">
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 <p>a sunny day.
-</p><hr>
+</p></div><hr></div>
+</div>
 
 
 
diff --git a/tp/t/results/sectioning/anchor_in_footnote.pl b/tp/t/results/sectioning/anchor_in_footnote.pl
index a30c6ae14d..f05543b386 100644
--- a/tp/t/results/sectioning/anchor_in_footnote.pl
+++ b/tp/t/results/sectioning/anchor_in_footnote.pl
@@ -703,11 +703,13 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">Chap</a> &nbsp; </p>
 </div>
-<span id="Top-1"></span><h1 class="top">Top</h1>
+<div class="node" id="Top-1">
+<h1 class="top">Top</h1>
 
 <p>In top node<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
@@ -715,15 +717,17 @@ 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>
-<hr>
-<span id="chapter"></span><div class="header">
+</div><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>
-<span id="Chap"></span><h2 class="chapter">1 Chap</h2>
+<div class="node" id="Chap">
+<h2 class="chapter">1 Chap</h2>
 
 <p><a href="#Anchor-in-footnote">Anchor in footnote</a>.
-</p><div class="footnote">
+</p></div><div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
@@ -733,6 +737,8 @@ Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" ac
 </p>
 </div>
 <hr>
+</div>
+</div>
 
 
 
diff --git a/tp/t/results/sectioning/anchor_in_footnote_separate.pl b/tp/t/results/sectioning/anchor_in_footnote_separate.pl
index d24d635bf9..dbc757c3a8 100644
--- a/tp/t/results/sectioning/anchor_in_footnote_separate.pl
+++ b/tp/t/results/sectioning/anchor_in_footnote_separate.pl
@@ -741,11 +741,13 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">Chap</a> &nbsp; </p>
 </div>
-<span id="Top-1"></span><h1 class="top">Top</h1>
+<div class="node" id="Top-1">
+<h1 class="top">Top</h1>
 
 <p>In top node<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
@@ -753,15 +755,19 @@ 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>
-<hr>
-<span id="chapter"></span><div class="header">
+</div><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>
-<span id="Chap"></span><h2 class="chapter">1 Chap</h2>
+<div class="node" id="Chap">
+<h2 class="chapter">1 Chap</h2>
 
 <p><a href="#Anchor-in-footnote">Anchor in footnote</a>.
-</p><hr>
+</p></div><hr>
+</div>
+</div>
 
 
 
diff --git a/tp/t/results/sectioning/anchor_zero.pl b/tp/t/results/sectioning/anchor_zero.pl
index 5cb35b25cc..08dbb3ec27 100644
--- a/tp/t/results/sectioning/anchor_zero.pl
+++ b/tp/t/results/sectioning/anchor_zero.pl
@@ -270,12 +270,13 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
 <span id="g_t0"></span><p>.
 </p>
 <p>See <a href="#g_t0">0</a>.
-</p><hr>
+</p></div><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 35ceafba7d..9d0aab7097 100644
--- a/tp/t/results/sectioning/chapter_before_and_after_part.pl
+++ b/tp/t/results/sectioning/chapter_before_and_after_part.pl
@@ -371,15 +371,18 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
+<div class="chapter" id="chapter">
+<h2 class="chapter">1 chapter</h2>
 
-<span id="part"></span><h1 class="part">part</h1>
+</div><div class="part" id="part">
+<h1 class="part">part</h1>
 <hr>
 
 <ul class="section-toc">
 <li><a href="#chapter-2" accesskey="1">chapter 2</a></li>
 </ul>
-<span id="chapter-2"></span><h2 class="chapter">2 chapter 2</h2>
+</div><div class="chapter" id="chapter-2">
+<h2 class="chapter">2 chapter 2</h2>
 
 <span id="SEC_Contents"></span>
 <h2 class="contents-heading">Table of Contents</h2>
@@ -395,7 +398,7 @@ ul.no-bullet {list-style: none}
 </ul>
 </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 ca6f4236cd..131e250f79 100644
--- a/tp/t/results/sectioning/chapter_before_part.pl
+++ b/tp/t/results/sectioning/chapter_before_part.pl
@@ -263,11 +263,13 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
+<div class="chapter" id="chapter">
+<h2 class="chapter">1 chapter</h2>
 
-<span id="part"></span><h1 class="part">part</h1>
-<hr>
+</div><div class="part" id="part">
+<h1 class="part">part</h1>
 <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 dd6af63b45..47c70145ac 100644
--- a/tp/t/results/sectioning/chapter_between_nodes.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes.pl
@@ -737,27 +737,32 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#section-node" accesskey="n" rel="next">section</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-<span id="top-section"></span><h1 class="top">top section</h1>
+<div class="node" id="top-section">
+<h1 class="top">top section</h1>
 <p>Top node
 </p>
 
-<span id="Chapter"></span><h2 class="chapter">1 Chapter</h2>
+</div><div class="chapter" id="Chapter">
+<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>
-<hr>
-<span id="section-node"></span><div class="header">
+</div><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>
-<span id="section"></span><h3 class="section">1.1 section</h3>
+<div class="node" id="section">
+<h3 class="section">1.1 section</h3>
 
 <p>section.
 </p>
@@ -774,7 +779,9 @@ Previous: <a href="#Top" accesskey="p" rel="prev">top section</a>, Up: <a href="
 </ul>
 </div>
 
-<hr>
+</div><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 d79712de76..4a27bbc589 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
@@ -664,15 +664,18 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><div class="header">
+<div class="chapter" id="Top">
+<div class="header">
 <p>
 Next: <a href="#after" accesskey="n" rel="next">chapter 2</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
+<div class="node" id="chapter">
+<h2 class="chapter">1 chapter</h2>
 
 
-<hr>
-<span id="part"></span><div class="header">
+</div><hr>
+<div class="part" id="part">
+<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>
@@ -682,7 +685,10 @@ 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>
-<span id="after"></span><span id="chapter-2"></span><h2 class="chapter">2 chapter 2</h2>
+</div></div>
+<div class="chapter" id="after">
+<div class="node" id="chapter-2">
+<h2 class="chapter">2 chapter 2</h2>
 
 <span id="SEC_Contents"></span>
 <h2 class="contents-heading">Table of Contents</h2>
@@ -698,7 +704,8 @@ Previous: <a href="#Top" accesskey="p" rel="prev">chapter</a>, Up: <a href="#Top
 </ul>
 </div>
 
-<hr>
+</div><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 99dc584490..86d6b28724 100644
--- a/tp/t/results/sectioning/character_and_spaces_in_node.pl
+++ b/tp/t/results/sectioning/character_and_spaces_in_node.pl
@@ -595,36 +595,41 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><div class="header">
+<div class="node" id="Top">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
 <h1 class="node-heading">Top</h1>
-<hr>
-<span id="other-nodes"></span><div class="header">
+</div><hr>
+<div class="node" 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">Top</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <h4 class="node-heading">other nodes</h4>
-<hr>
-<span id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></span><div class="header">
+</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">
 <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>
-<hr>
-<span id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></span><div class="header">
+</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">
 <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>
-<hr>
-<span id="local-node"></span><div class="header">
+</div><hr>
+<div class="node" id="local-node">
+<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>
-<hr>
+</div><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 1f4dab7165..8901b9615f 100644
--- a/tp/t/results/sectioning/character_and_spaces_in_refs.pl
+++ b/tp/t/results/sectioning/character_and_spaces_in_refs.pl
@@ -2008,23 +2008,27 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#other-nodes" accesskey="n" rel="next">Chapter with nodes</a> &nbsp; </p>
 </div>
-<span id="Test-refs"></span><h1 class="top">Test refs</h1>
+<div class="node" id="Test-refs">
+<h1 class="top">Test refs</h1>
 
 
-<span id="Testing-distant-nodes"></span><h4 class="subheading">Testing distant nodes</h4>
-
+<div class="subheading" id="Testing-distant-nodes">
+<h4 class="subheading">Testing distant nodes</h4>
+</div>
 <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>
-<span id="Testing-local-nodes"></span><h4 class="subheading">Testing local nodes</h4>
-
+<div class="subheading" id="Testing-local-nodes">
+<h4 class="subheading">Testing local nodes</h4>
+</div>
 <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>
@@ -2033,36 +2037,43 @@ 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>
-<hr>
-<span id="other-nodes"></span><div class="header">
+</div><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>
-<span id="Chapter-with-nodes"></span><h2 class="chapter">1 Chapter with nodes</h2>
+<div class="node" id="Chapter-with-nodes">
+<h2 class="chapter">1 Chapter with nodes</h2>
 
 
-<hr>
-<span id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></span><div class="header">
+</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">
 <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>
 
-<hr>
-<span id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></span><div class="header">
+</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">
 <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>
 
-<hr>
-<span id="local-node"></span><div class="header">
+</div><hr>
+<div class="node" id="local-node">
+<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>
 
-<hr>
+</div><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 5565b9e6cf..b512aa8075 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,14 +37,15 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></span><div class="header">
+<div class="node" id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">
+<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 1ccd5d2963..314f79527e 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,14 +37,15 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></span><div class="header">
+<div class="node" id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e">
+<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 de74458fdf..d23cfcb9af 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
@@ -35,24 +35,28 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="other-nodes.html" accesskey="n" rel="next">Chapter with nodes</a> &nbsp; </p>
 </div>
 <hr>
-<span id="Test-refs"></span><h1 class="top">Test refs</h1>
-
+<div class="node" id="Test-refs">
+<h1 class="top">Test refs</h1>
 
-<span id="Testing-distant-nodes"></span><h4 class="subheading">Testing distant nodes</h4>
 
+<div class="subheading" id="Testing-distant-nodes">
+<h4 class="subheading">Testing distant nodes</h4>
+</div>
 <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>
-<span id="Testing-local-nodes"></span><h4 class="subheading">Testing local nodes</h4>
-
+<div class="subheading" id="Testing-local-nodes">
+<h4 class="subheading">Testing local nodes</h4>
+</div>
 <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>
@@ -61,11 +65,12 @@ 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>
-<hr>
+</div><hr>
 <div class="header">
 <p>
 Next: <a href="other-nodes.html" accesskey="n" rel="next">Chapter with nodes</a> &nbsp; </p>
 </div>
+</div>
 
 
 
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 5758da4bb5..711b28e388 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,14 +36,15 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="local-node"></span><div class="header">
+<div class="node" id="local-node">
+<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 ca4d775e3a..6ff804f346 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
@@ -37,14 +37,17 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="other-nodes"></span><div class="header">
+<div class="chapter" id="other-nodes">
+<div class="header">
 <p>
 Next: <a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html" accesskey="n" rel="next">!_&quot;#$%&amp;'()*+-.</a>, Previous: <a href="index.html" accesskey="p" rel="prev">Test refs</a>, Up: <a href="index.html" accesskey="u" rel="up">Test refs</a> &nbsp; </p>
 </div>
 <hr>
-<span id="Chapter-with-nodes"></span><h2 class="chapter">1 Chapter with nodes</h2>
+<div class="node" id="Chapter-with-nodes">
+<h2 class="chapter">1 Chapter with nodes</h2>
 
 
+</div></div>
 
 
 
diff --git a/tp/t/results/sectioning/contents.pl b/tp/t/results/sectioning/contents.pl
index d72c352efd..8a1a6884cc 100644
--- a/tp/t/results/sectioning/contents.pl
+++ b/tp/t/results/sectioning/contents.pl
@@ -802,7 +802,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="top"></span><h1 class="top">top</h1>
+<div class="top" id="top">
+<h1 class="top">top</h1>
 
 <span id="SEC_Contents"></span>
 <h2 class="contents-heading">Table of Contents</h2>
@@ -836,24 +837,29 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 
-<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
+</div><div class="chapter" id="chapter">
+<h2 class="chapter">1 chapter</h2>
 
 <ul class="section-toc">
 <li><a href="#section" accesskey="1">section</a></li>
 </ul>
-<span id="section"></span><h3 class="section">1.1 section</h3>
+</div><div class="section" id="section">
+<h3 class="section">1.1 section</h3>
 
 <ul class="section-toc">
 <li><a href="#subsection" accesskey="1">subsection</a></li>
 </ul>
-<span id="subsection"></span><h4 class="subsection">1.1.1 subsection</h4>
+</div><div class="subsection" id="subsection">
+<h4 class="subsection">1.1.1 subsection</h4>
 
 <ul class="section-toc">
 <li><a href="#subsubsection" accesskey="1">subsubsection</a></li>
 </ul>
-<span id="subsubsection"></span><h4 class="subsubsection">1.1.1.1 subsubsection</h4>
+</div><div class="subsubsection" id="subsubsection">
+<h4 class="subsubsection">1.1.1.1 subsubsection</h4>
 
-<span id="part"></span><h1 class="part">part</h1>
+</div><div class="part" id="part">
+<h1 class="part">part</h1>
 <hr>
 
 <ul class="section-toc">
@@ -861,20 +867,25 @@ 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>
-<span id="chapter-in-part"></span><h2 class="chapter">2 chapter in part</h2>
+</div><div class="chapter" id="chapter-in-part">
+<h2 class="chapter">2 chapter in part</h2>
 
-<span id="second-chapter-in-part"></span><h2 class="chapter">3 second chapter in part</h2>
+</div><div class="chapter" id="second-chapter-in-part">
+<h2 class="chapter">3 second chapter in part</h2>
 
-<span id="unnumbered"></span><h2 class="unnumbered">unnumbered</h2>
+</div><div class="unnumbered" id="unnumbered">
+<h2 class="unnumbered">unnumbered</h2>
 
-<span id="appendix"></span><h2 class="appendix">Appendix A appendix</h2>
+</div><div class="appendix" id="appendix">
+<h2 class="appendix">Appendix A appendix</h2>
 
 <ul class="section-toc">
 <li><a href="#appendixsec" accesskey="1">appendixsec</a></li>
 </ul>
-<span id="appendixsec"></span><h3 class="appendixsec">A.1 appendixsec</h3>
+</div><div class="appendixsec" id="appendixsec">
+<h3 class="appendixsec">A.1 appendixsec</h3>
 
-<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 7bd79ea242..d480e410ff 100644
--- a/tp/t/results/sectioning/contents_and_shortcontents.pl
+++ b/tp/t/results/sectioning/contents_and_shortcontents.pl
@@ -838,7 +838,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="top"></span><h1 class="top">top</h1>
+<div class="top" id="top">
+<h1 class="top">top</h1>
 
 <span id="SEC_Contents"></span>
 <h2 class="contents-heading">Table of Contents</h2>
@@ -890,24 +891,29 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 
-<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
+</div><div class="chapter" id="chapter">
+<h2 class="chapter">1 chapter</h2>
 
 <ul class="section-toc">
 <li><a href="#section" accesskey="1">section</a></li>
 </ul>
-<span id="section"></span><h3 class="section">1.1 section</h3>
+</div><div class="section" id="section">
+<h3 class="section">1.1 section</h3>
 
 <ul class="section-toc">
 <li><a href="#subsection" accesskey="1">subsection</a></li>
 </ul>
-<span id="subsection"></span><h4 class="subsection">1.1.1 subsection</h4>
+</div><div class="subsection" id="subsection">
+<h4 class="subsection">1.1.1 subsection</h4>
 
 <ul class="section-toc">
 <li><a href="#subsubsection" accesskey="1">subsubsection</a></li>
 </ul>
-<span id="subsubsection"></span><h4 class="subsubsection">1.1.1.1 subsubsection</h4>
+</div><div class="subsubsection" id="subsubsection">
+<h4 class="subsubsection">1.1.1.1 subsubsection</h4>
 
-<span id="part"></span><h1 class="part">part</h1>
+</div><div class="part" id="part">
+<h1 class="part">part</h1>
 <hr>
 
 <ul class="section-toc">
@@ -915,21 +921,26 @@ 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>
-<span id="chapter-in-part"></span><h2 class="chapter">2 chapter in part</h2>
+</div><div class="chapter" id="chapter-in-part">
+<h2 class="chapter">2 chapter in part</h2>
 
-<span id="second-chapter-in-part"></span><h2 class="chapter">3 second chapter in part</h2>
+</div><div class="chapter" id="second-chapter-in-part">
+<h2 class="chapter">3 second chapter in part</h2>
 
-<span id="unnumbered"></span><h2 class="unnumbered">unnumbered</h2>
+</div><div class="unnumbered" id="unnumbered">
+<h2 class="unnumbered">unnumbered</h2>
 
-<span id="appendix"></span><h2 class="appendix">Appendix A appendix</h2>
+</div><div class="appendix" id="appendix">
+<h2 class="appendix">Appendix A appendix</h2>
 
 <ul class="section-toc">
 <li><a href="#appendixsec" accesskey="1">appendixsec</a></li>
 </ul>
-<span id="appendixsec"></span><h3 class="appendixsec">A.1 appendixsec</h3>
+</div><div class="appendixsec" id="appendixsec">
+<h3 class="appendixsec">A.1 appendixsec</h3>
 
 
-<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 ac8c62cb8d..2fb7918221 100644
--- a/tp/t/results/sectioning/contents_in_html_text.pl
+++ b/tp/t/results/sectioning/contents_in_html_text.pl
@@ -315,16 +315,20 @@ $result_floats{'contents_in_html_text'} = {};
 
 
 
-$result_converted{'html_text'}->{'contents_in_html_text'} = '<span id="top"></span><h1 class="top">top</h1>
+$result_converted{'html_text'}->{'contents_in_html_text'} = '<div class="top" id="top">
+<h1 class="top">top</h1>
 
-<span id="Chap1"></span><h2 class="chapter">1 Chap1</h2>
+</div><div class="chapter" id="Chap1">
+<h2 class="chapter">1 Chap1</h2>
 
 <ul class="section-toc">
 <li><a href="#Sec-1" accesskey="1">Sec 1</a></li>
 </ul>
-<span id="Sec-1"></span><h3 class="section">1.1 Sec 1</h3>
+</div><div class="section" id="Sec-1">
+<h3 class="section">1.1 Sec 1</h3>
 
-<span id="Chap2"></span><h2 class="chapter">2 Chap2</h2>
+</div><div class="chapter" id="Chap2">
+<h2 class="chapter">2 Chap2</h2>
 
 <h2 class="shortcontents-heading">Short Table of Contents</h2>
 
@@ -348,7 +352,7 @@ $result_converted{'html_text'}->{'contents_in_html_text'} = '<span id="top"></sp
 </ul>
 </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 8e997aa81a..cb33c10433 100644
--- a/tp/t/results/sectioning/contents_with_only_top_node.pl
+++ b/tp/t/results/sectioning/contents_with_only_top_node.pl
@@ -174,9 +174,10 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
-<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 c4aea3b7be..20bd03c3bc 100644
--- a/tp/t/results/sectioning/double_node_anchor_float.pl
+++ b/tp/t/results/sectioning/double_node_anchor_float.pl
@@ -901,13 +901,15 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="node1"></span><div class="header">
+<div class="node" id="node1">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
 <h4 class="node-heading">node1</h4>
 
-<hr>
+</div><hr>
+<div class="node">
 <div class="header">
 <p>
  &nbsp; </p>
@@ -915,7 +917,8 @@ ul.no-bullet {list-style: none}
 
 
 <span id="anchor1"></span>
-<hr>
+</div><hr>
+<div class="node">
 <div class="header">
 <p>
  &nbsp; </p>
@@ -930,12 +933,13 @@ 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>
-<hr>
+</div><hr>
+<div class="node">
 <div class="header">
 <p>
  &nbsp; </p>
 </div>
-<hr>
+</div><hr>
 
 
 
diff --git a/tp/t/results/sectioning/double_part.pl b/tp/t/results/sectioning/double_part.pl
index 0a3989250d..b0a23fe00d 100644
--- a/tp/t/results/sectioning/double_part.pl
+++ b/tp/t/results/sectioning/double_part.pl
@@ -896,19 +896,23 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#node-chapter" accesskey="n" rel="next">chapter after 2 parts</a> &nbsp; </p>
 </div>
-<span id="top"></span><h1 class="top">top</h1>
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 
-<span id="part-first"></span><h1 class="part">part first</h1>
+</div><div class="part" id="part-first">
+<h1 class="part">part first</h1>
 <hr>
 
 <p>Text part first.
-</p><hr>
-<span id="part-second"></span><div class="header">
+</p></div><hr>
+<div class="part" id="part-second">
+<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>
@@ -919,9 +923,13 @@ 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>
-<span id="node-chapter"></span><span id="chapter-after-2-parts"></span><h2 class="chapter">1 chapter after 2 parts</h2>
+</div><div class="chapter" id="node-chapter">
+<div class="node" id="chapter-after-2-parts">
+<h2 class="chapter">1 chapter after 2 parts</h2>
 
-<hr>
+</div><hr>
+</div>
+</div>
 
 
 
diff --git a/tp/t/results/sectioning/double_top.pl b/tp/t/results/sectioning/double_top.pl
index 6c30cc5001..32ad084b20 100644
--- a/tp/t/results/sectioning/double_top.pl
+++ b/tp/t/results/sectioning/double_top.pl
@@ -366,20 +366,22 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="node" id="Top">
+<div class="header">
 <p>
 Next: <a href="#Top" accesskey="n" rel="next">ToP</a> &nbsp; </p>
 </div>
 <h1 class="node-heading">ToP</h1>
 
-<hr>
+</div><hr>
+<div class="node">
 <div class="header">
 <p>
  &nbsp; </p>
 </div>
 
 <p>.
-</p><hr>
+</p></div><hr>
 
 
 
diff --git a/tp/t/results/sectioning/empty_top_node_up.pl b/tp/t/results/sectioning/empty_top_node_up.pl
index 60e0909908..3d50a86527 100644
--- a/tp/t/results/sectioning/empty_top_node_up.pl
+++ b/tp/t/results/sectioning/empty_top_node_up.pl
@@ -460,20 +460,24 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#first" accesskey="n" rel="next">first</a> &nbsp; </p>
 </div>
-<span id="empty-top-node-up"></span><h1 class="top">empty top node up</h1>
+<div class="node" id="empty-top-node-up">
+<h1 class="top">empty top node up</h1>
 
 
-<hr>
-<span id="first"></span><div class="header">
+</div><hr>
+<div class="node" id="first">
+<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>
-<hr>
+</div><hr>
+</div>
 
 
 
diff --git a/tp/t/results/sectioning/equivalent_labels.pl b/tp/t/results/sectioning/equivalent_labels.pl
index 222fcf771a..660341d369 100644
--- a/tp/t/results/sectioning/equivalent_labels.pl
+++ b/tp/t/results/sectioning/equivalent_labels.pl
@@ -701,7 +701,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 
 <span id="anch"></span><p>.
 </p>
@@ -709,7 +710,7 @@ ul.no-bullet {list-style: none}
 <p>In float
 </p><div class="float-caption"><p><strong>truc 1
 </strong></p></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 6addf2ef5a..63ecacb3fa 100644
--- a/tp/t/results/sectioning/equivalent_nodes.pl
+++ b/tp/t/results/sectioning/equivalent_nodes.pl
@@ -562,22 +562,24 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="node" id="Top">
+<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>
 
 
-<hr>
-<span id="node"></span><div class="header">
+</div><hr>
+<div class="node" id="node">
+<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><hr>
+</p></div><hr>
 
 
 
diff --git a/tp/t/results/sectioning/explicit_node_directions.pl b/tp/t/results/sectioning/explicit_node_directions.pl
index 690e35a400..30e34db536 100644
--- a/tp/t/results/sectioning/explicit_node_directions.pl
+++ b/tp/t/results/sectioning/explicit_node_directions.pl
@@ -847,15 +847,17 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="node" id="Top">
+<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>
-<hr>
-<span id="second-node"></span><div class="header">
+</div><hr>
+<div class="node" id="second-node">
+<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>
@@ -863,13 +865,14 @@ Next: <a href="#third-node" accesskey="n" rel="next">third node</a>, Previous: <
 
 <p>second node
 </p>
-<hr>
-<span id="third-node"></span><div class="header">
+</div><hr>
+<div class="node" 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>
 <h4 class="node-heading">third node</h4>
-<hr>
+</div><hr>
 
 
 
diff --git a/tp/t/results/sectioning/external_node_in_menu.pl b/tp/t/results/sectioning/external_node_in_menu.pl
index 8a16a70fc3..323bc924e1 100644
--- a/tp/t/results/sectioning/external_node_in_menu.pl
+++ b/tp/t/results/sectioning/external_node_in_menu.pl
@@ -843,31 +843,40 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#nchapter1" accesskey="n" rel="next">chap1</a> &nbsp; </p>
 </div>
-<span id="top"></span><h1 class="top">top</h1>
+<div class="node" id="top">
+<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>
-<hr>
-<span id="nchapter1"></span><div class="header">
+</div><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>
-<span id="chap1"></span><h2 class="chapter">1 chap1</h2>
+<div class="node" id="chap1">
+<h2 class="chapter">1 chap1</h2>
 
-<hr>
-<span id="nchapter2"></span><div class="header">
+</div><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>
-<span id="chap2"></span><h2 class="chapter">2 chap2</h2>
-<hr>
+<div class="node" id="chap2">
+<h2 class="chapter">2 chap2</h2>
+</div><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 1378723391..078fd1ef08 100644
--- a/tp/t/results/sectioning/internal_top_node_up.pl
+++ b/tp/t/results/sectioning/internal_top_node_up.pl
@@ -568,20 +568,24 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#first" accesskey="n" rel="next">first</a> &nbsp; </p>
 </div>
-<span id="internal-top-node-up"></span><h1 class="top">internal top node up</h1>
+<div class="node" id="internal-top-node-up">
+<h1 class="top">internal top node up</h1>
 
 
-<hr>
-<span id="first"></span><div class="header">
+</div><hr>
+<div class="node" id="first">
+<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>
-<hr>
+</div><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 944bed10e5..2998cc1d1b 100644
--- a/tp/t/results/sectioning/next_in_menu_is_below.pl
+++ b/tp/t/results/sectioning/next_in_menu_is_below.pl
@@ -1245,45 +1245,57 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; </p>
 </div>
-<span id="top"></span><h1 class="top">top</h1>
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 
 <ul class="section-toc">
 <li><a href="#chapter" accesskey="1">chapter</a></li>
 </ul>
-<hr>
-<span id="chapter"></span><div class="header">
+</div><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>
-<span id="chapter-1"></span><h2 class="chapter">1 chapter</h2>
+<div class="node" id="chapter-1">
+<h2 class="chapter">1 chapter</h2>
 
 
 <ul class="section-toc">
 <li><a href="#section" accesskey="1">section</a></li>
 </ul>
-<hr>
-<span id="section"></span><div class="header">
+</div><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>
-<span id="section-1"></span><h3 class="section">1.1 section</h3>
+<div class="node" id="section-1">
+<h3 class="section">1.1 section</h3>
 
 
 <ul class="section-toc">
 <li><a href="#subsection" accesskey="1">subsection</a></li>
 </ul>
-<hr>
-<span id="subsection"></span><div class="header">
+</div><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>
-<span id="subsection-1"></span><h4 class="subsection">1.1.1 subsection</h4>
-<hr>
+<div class="node" id="subsection-1">
+<h4 class="subsection">1.1.1 subsection</h4>
+</div><hr>
+</div>
+</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 ceda8a6b1d..941f39169f 100644
--- a/tp/t/results/sectioning/no_argument_and_contents.pl
+++ b/tp/t/results/sectioning/no_argument_and_contents.pl
@@ -245,7 +245,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="for-example"></span><h1 class="top">for example</h1>
+<div class="top" id="for-example">
+<h1 class="top">for example</h1>
 
 <span id="SEC_Contents"></span>
 <h2 class="contents-heading">Table of Contents</h2>
@@ -257,9 +258,10 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 
+</div><div class="chapter">
 <h2 class="chapter">1 </h2>
 
-<hr>
+</div><hr></div>
 
 
 
diff --git a/tp/t/results/sectioning/no_menu.pl b/tp/t/results/sectioning/no_menu.pl
index f68dcd3eac..7ba69e1237 100644
--- a/tp/t/results/sectioning/no_menu.pl
+++ b/tp/t/results/sectioning/no_menu.pl
@@ -577,37 +577,49 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
-<span id="SEC_Top"></span>
+<div class="node" id="SEC_Top">
+
 <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>
-<hr>
-<span id="c1"></span><div class="header">
+</div><hr>
+<div class="chapter" id="c1">
+<div class="header">
 <p>
 Next: <a href="#c2" accesskey="n" rel="next">c2</a> &nbsp; </p>
 </div>
-<span id="c1-1"></span><h2 class="chapter">1 c1</h2>
+<div class="node" id="c1-1">
+<h2 class="chapter">1 c1</h2>
 
-<hr>
-<span id="c2"></span><div class="header">
+</div><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>
-<span id="c2-1"></span><h2 class="chapter">2 c2</h2>
+<div class="node" id="c2-1">
+<h2 class="chapter">2 c2</h2>
 
-<hr>
-<span id="c3"></span><div class="header">
+</div><hr>
+</div>
+<div class="chapter" id="c3">
+<div class="header">
 <p>
 Previous: <a href="#c2" accesskey="p" rel="prev">c2</a> &nbsp; </p>
 </div>
-<span id="c3-1"></span><h2 class="chapter">3 c3</h2>
-<hr>
+<div class="node" id="c3-1">
+<h2 class="chapter">3 c3</h2>
+</div><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 ac065bebd4..22f9aecbc8 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
@@ -1108,11 +1108,13 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#chapter-node" accesskey="n" rel="next">chapter node</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-<span id="top"></span><h1 class="top">top</h1>
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 
 <span id="SEC_Contents"></span>
@@ -1132,28 +1134,36 @@ Next: <a href="#chapter-node" accesskey="n" rel="next">chapter node</a> &nbsp; [
 </ul>
 </div>
 
-<hr>
-<span id="chapter-node"></span><div class="header">
+</div><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>
 
-<span id="chapter-node-1"></span><h2 class="chapter">1 chapter node</h2>
+<div class="node" id="chapter-node-1">
+<h2 class="chapter">1 chapter node</h2>
 
-<hr>
-<span id="part-chapter-node"></span><div class="header">
+</div><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>
-<span id="part"></span><h1 class="part">part</h1>
+<div class="part" id="part">
+<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>
-<span id="chapter-with-part-node"></span><h2 class="chapter">2 chapter with part node</h2>
+</div><div class="node" id="chapter-with-part-node">
+<h2 class="chapter">2 chapter with part node</h2>
 
-<hr>
+</div><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 73dab7f4e8..471bdf287c 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_top.pl
@@ -742,26 +742,33 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#chapter-node" accesskey="n" rel="next">chapter</a> &nbsp; </p>
 </div>
-<span id="top"></span><h1 class="top">top</h1>
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 
-<hr>
-<span id="chapter-node"></span><div class="header">
+</div><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>
-<span id="part"></span><h1 class="part">part</h1>
+<div class="part" id="part">
+<h1 class="part">part</h1>
 <hr>
 
 <ul class="section-toc">
 <li><a href="#chapter-node" accesskey="1">chapter</a></li>
 </ul>
-<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
-<hr>
+</div><div class="node" id="chapter">
+<h2 class="chapter">1 chapter</h2>
+</div><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 83d2328585..50c518dab4 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,8 +211,9 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><h1 class="node-heading">Top</h1>
-<hr>
+<div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
+</div><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 3b4d9102cc..669d1515f5 100644
--- a/tp/t/results/sectioning/node_up_external_node.pl
+++ b/tp/t/results/sectioning/node_up_external_node.pl
@@ -616,20 +616,22 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="node" id="Top">
+<div class="header">
 <p>
 Next: <a href="#first" accesskey="n" rel="next">first</a> &nbsp; </p>
 </div>
 <h1 class="node-heading">Top</h1>
 
 
-<hr>
-<span id="first"></span><div class="header">
+</div><hr>
+<div class="node" id="first">
+<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>
-<hr>
+</div><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 9ad50be2e0..2bd1bc14d8 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,15 +926,17 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="node" id="Top">
+<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>
-<hr>
-<span id="second-node"></span><div class="header">
+</div><hr>
+<div class="node" id="second-node">
+<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>
@@ -942,13 +944,16 @@ Next: <a href="#third-node" accesskey="n" rel="next">chapter</a>, Previous: <a h
 
 <p>second node
 </p>
-<hr>
-<span id="third-node"></span><div class="header">
+</div><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>
-<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
-<hr>
+<div class="node" id="chapter">
+<h2 class="chapter">1 chapter</h2>
+</div><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 4ed9f9a7e6..c817009288 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,15 +729,17 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="node" id="Top">
+<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>
-<hr>
-<span id="second-node"></span><div class="header">
+</div><hr>
+<div class="node" id="second-node">
+<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>
@@ -745,13 +747,16 @@ Next: <a href="#third-node" accesskey="n" rel="next">chapter</a>, Previous: <a h
 
 <p>second node
 </p>
-<hr>
-<span id="third-node"></span><div class="header">
+</div><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>
-<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
-<hr>
+<div class="node" id="chapter">
+<h2 class="chapter">1 chapter</h2>
+</div><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 655a7e1549..a0515d6c01 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,15 +729,17 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="node" id="Top">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
 <h1 class="node-heading">Top</h1>
 <p>Top node
 </p>
-<hr>
-<span id="second-node"></span><div class="header">
+</div><hr>
+<div class="node" id="second-node">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
@@ -745,13 +747,16 @@ ul.no-bullet {list-style: none}
 
 <p>second node
 </p>
-<hr>
-<span id="third-node"></span><div class="header">
+</div><hr>
+<div class="chapter" id="third-node">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
-<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
-<hr>
+<div class="node" id="chapter">
+<h2 class="chapter">1 chapter</h2>
+</div><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 3658da10b4..2a484052d2 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,15 +834,17 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="node" id="Top">
+<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>
-<hr>
-<span id="second-node"></span><div class="header">
+</div><hr>
+<div class="node" id="second-node">
+<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>
@@ -850,13 +852,16 @@ Next: <a href="#third-node" accesskey="n" rel="next">chapter</a>, Previous: <a h
 
 <p>second node
 </p>
-<hr>
-<span id="third-node"></span><div class="header">
+</div><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>
-<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
-<hr>
+<div class="node" id="chapter">
+<h2 class="chapter">1 chapter</h2>
+</div><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 2b3d478950..0a83e7be0b 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,15 +928,17 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="node" id="Top">
+<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>
-<hr>
-<span id="second-node"></span><div class="header">
+</div><hr>
+<div class="node" id="second-node">
+<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>
@@ -944,13 +946,16 @@ Next: <a href="#third-node" accesskey="n" rel="next">subsection</a>, Previous: <
 
 <p>second node
 </p>
-<hr>
-<span id="third-node"></span><div class="header">
+</div><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>
-<span id="subsection"></span><h4 class="subsection">1 subsection</h4>
-<hr>
+<div class="node" id="subsection">
+<h4 class="subsection">1 subsection</h4>
+</div><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 9c6e370f0c..e9f695be37 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,15 +836,17 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="node" id="Top">
+<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>
-<hr>
-<span id="second-node"></span><div class="header">
+</div><hr>
+<div class="node" id="second-node">
+<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>
@@ -852,13 +854,16 @@ Next: <a href="#third-node" accesskey="n" rel="next">subsection</a>, Previous: <
 
 <p>second node
 </p>
-<hr>
-<span id="third-node"></span><div class="header">
+</div><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>
-<span id="subsection"></span><h4 class="subsection">1 subsection</h4>
-<hr>
+<div class="node" id="subsection">
+<h4 class="subsection">1 subsection</h4>
+</div><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 9b2c5d0273..421a92df17 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,7 +636,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="first"></span><div class="header">
+<div class="node" id="first">
+<div class="header">
 <p>
 Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
 </div>
@@ -644,14 +645,15 @@ Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
 <p>first node
 </p>
 
-<hr>
-<span id="second-node"></span><div class="header">
+</div><hr>
+<div class="node" id="second-node">
+<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><hr>
+</p></div><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 e3659856fd..baf81471f4 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
@@ -919,20 +919,24 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#first" accesskey="n" rel="next">first</a> &nbsp; </p>
 </div>
-<span id="internal-top-node-up"></span><h1 class="top">internal top node up</h1>
+<div class="node" id="internal-top-node-up">
+<h1 class="top">internal top node up</h1>
 
 
-<hr>
-<span id="first"></span><div class="header">
+</div><hr>
+<div class="node" id="first">
+<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>
-<hr>
+</div><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 e853bc0cc2..41c60b2459 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
@@ -920,20 +920,24 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#first" accesskey="n" rel="next">first</a>, Up: <a href="http://www.gnu.org/manual/" accesskey="u" rel="up">@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals</a> &nbsp; </p>
 </div>
-<span id="internal-top-node-up"></span><h1 class="top">internal top node up</h1>
+<div class="node" id="internal-top-node-up">
+<h1 class="top">internal top node up</h1>
 
 
-<hr>
-<span id="first"></span><div class="header">
+</div><hr>
+<div class="node" id="first">
+<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>
-<hr>
+</div><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 b8c4c9f0fe..1b0263a133 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
@@ -767,20 +767,24 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#first" accesskey="n" rel="next">first</a>, Previous: <a href="dir.html#Top" accesskey="p" rel="prev">(dir)</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
 </div>
-<span id="internal-top-node-up"></span><h1 class="top">internal top node up</h1>
+<div class="node" id="internal-top-node-up">
+<h1 class="top">internal top node up</h1>
 
 
-<hr>
-<span id="first"></span><div class="header">
+</div><hr>
+<div class="node" id="first">
+<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>
-<hr>
+</div><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 e7db1195da..25ce063142 100644
--- a/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
+++ b/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
@@ -358,13 +358,14 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="one-node"></span><h4 class="node-heading">one node</h4>
+<div class="node" id="one-node">
+<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><hr>
+</p></div><hr></div>
 
 
 
diff --git a/tp/t/results/sectioning/one_subsection.pl b/tp/t/results/sectioning/one_subsection.pl
index b677aa86cf..04df519830 100644
--- a/tp/t/results/sectioning/one_subsection.pl
+++ b/tp/t/results/sectioning/one_subsection.pl
@@ -123,8 +123,9 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="The-subsection"></span><h4 class="subsection">1 The subsection</h4>
-<hr>
+<div class="subsection" id="The-subsection">
+<h4 class="subsection">1 The subsection</h4>
+</div><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 47d3a88f5a..fc99a15e4f 100644
--- a/tp/t/results/sectioning/one_subsection_and_node.pl
+++ b/tp/t/results/sectioning/one_subsection_and_node.pl
@@ -228,8 +228,11 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="one-node"></span><span id="The-subsection"></span><h4 class="subsection">1 The subsection</h4>
-<hr>
+<div class="subsection" id="one-node">
+<div class="node" id="The-subsection">
+<h4 class="subsection">1 The subsection</h4>
+</div><hr></div>
+</div>
 
 
 
diff --git a/tp/t/results/sectioning/part_before_chapter.pl b/tp/t/results/sectioning/part_before_chapter.pl
index b03071f2d6..a9c70acb83 100644
--- a/tp/t/results/sectioning/part_before_chapter.pl
+++ b/tp/t/results/sectioning/part_before_chapter.pl
@@ -229,14 +229,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="part"></span><h1 class="part">part</h1>
+<div class="part" id="part">
+<h1 class="part">part</h1>
 <hr>
 
 <ul class="section-toc">
 <li><a href="#chapter" accesskey="1">chapter</a></li>
 </ul>
-<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
-<hr>
+</div><div class="chapter" id="chapter">
+<h2 class="chapter">1 chapter</h2>
+</div><hr></div>
 
 
 
diff --git a/tp/t/results/sectioning/part_before_section.pl b/tp/t/results/sectioning/part_before_section.pl
index fa6a589db3..01e20ae873 100644
--- a/tp/t/results/sectioning/part_before_section.pl
+++ b/tp/t/results/sectioning/part_before_section.pl
@@ -198,14 +198,16 @@ $result_directions_text{'part_before_section'} = 'element: @section section
 ';
 
 
-$result_converted{'html_text'}->{'part_before_section'} = '<span id="part"></span><h1 class="part">part</h1>
+$result_converted{'html_text'}->{'part_before_section'} = '<div class="part" id="part">
+<h1 class="part">part</h1>
 <hr>
 
 <ul class="section-toc">
 <li><a href="#section" accesskey="1">section</a></li>
 </ul>
-<span id="section"></span><h2 class="chapter">1 section</h2>
-<hr>
+</div><div class="section" id="section">
+<h2 class="chapter">1 section</h2>
+</div><hr></div>
 ';
 
 
diff --git a/tp/t/results/sectioning/part_before_top.pl b/tp/t/results/sectioning/part_before_top.pl
index 90ec7f2cfe..3a18fc93c0 100644
--- a/tp/t/results/sectioning/part_before_top.pl
+++ b/tp/t/results/sectioning/part_before_top.pl
@@ -236,11 +236,13 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="part"></span><h1 class="part">part</h1>
+<div class="part" id="part">
+<h1 class="part">part</h1>
 <hr>
 
-<span id="top"></span><h1 class="top">top</h1>
-<hr>
+</div><div class="top" id="top">
+<h1 class="top">top</h1>
+</div><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 7124896dfd..3835b13152 100644
--- a/tp/t/results/sectioning/part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_chapter_after_top.pl
@@ -732,15 +732,18 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; </p>
 </div>
-<span id="top"></span><h1 class="top">top</h1>
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 
-<hr>
-<span id="part"></span><div class="header">
+</div><hr>
+<div class="part" id="part">
+<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>
@@ -750,8 +753,12 @@ 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>
-<span id="chapter"></span><span id="chapter-1"></span><h2 class="chapter">1 chapter</h2>
-<hr>
+</div><div class="chapter" id="chapter">
+<div class="node" id="chapter-1">
+<h2 class="chapter">1 chapter</h2>
+</div><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 1d30967030..b04a89cb09 100644
--- a/tp/t/results/sectioning/part_node_after_top.pl
+++ b/tp/t/results/sectioning/part_node_after_top.pl
@@ -642,22 +642,27 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#part-node-after-top" accesskey="n" rel="next">part node after top</a> &nbsp; </p>
 </div>
-<span id="top"></span><h1 class="top">top</h1>
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 
-<hr>
-<span id="part-node-after-top"></span><div class="header">
+</div><hr>
+<div class="node" id="part-node-after-top">
+<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>
-<span id="part"></span><h1 class="part">part</h1>
-<hr>
+</div><div class="part" id="part">
+<h1 class="part">part</h1>
 <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 e44cef8bdf..20330f181e 100644
--- a/tp/t/results/sectioning/part_node_before_top.pl
+++ b/tp/t/results/sectioning/part_node_before_top.pl
@@ -661,22 +661,27 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="part-node-before-top"></span><div class="header">
+<div class="node" id="part-node-before-top">
+<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>
-<hr>
-<span id="part"></span><div class="header">
+</div><hr>
+<div class="part" id="part">
+<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>
 
-<span id="Top"></span><span id="top"></span><h1 class="top">top</h1>
+</div><div class="top" id="Top">
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
-<hr>
+</div><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 9c77db32b5..935754964b 100644
--- a/tp/t/results/sectioning/part_node_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_node_chapter_after_top.pl
@@ -1035,15 +1035,18 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#a-node-after-part" accesskey="n" rel="next">a node after part</a> &nbsp; </p>
 </div>
-<span id="top"></span><h1 class="top">top</h1>
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 
-<hr>
-<span id="part"></span><div class="header">
+</div><hr>
+<div class="part" id="part">
+<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>
@@ -1053,16 +1056,21 @@ 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>
-<span id="a-node-after-part"></span><h4 class="node-heading">a node after part</h4>
+</div><div class="node" id="a-node-after-part">
+<h4 class="node-heading">a node after part</h4>
 <p>After a node after part
 </p>
-<hr>
-<span id="chapter"></span><div class="header">
+</div><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>
-<span id="chapter-1"></span><h2 class="chapter">1 chapter</h2>
-<hr>
+<div class="node" id="chapter-1">
+<h2 class="chapter">1 chapter</h2>
+</div><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 0913bd0fb3..66e2d6aaf3 100644
--- a/tp/t/results/sectioning/part_node_chapter_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_appendix.pl
@@ -847,15 +847,18 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#chapter-node" accesskey="n" rel="next">chapter</a> &nbsp; </p>
 </div>
-<span id="top"></span><h1 class="top">top</h1>
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 
-<hr>
-<span id="Part-1"></span><div class="header">
+</div><hr>
+<div class="part" id="Part-1">
+<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>
@@ -865,10 +868,15 @@ 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>
-<span id="chapter-node"></span><span id="chapter"></span><h2 class="chapter">1 chapter</h2>
+</div><div class="chapter" id="chapter-node">
+<div class="node" id="chapter">
+<h2 class="chapter">1 chapter</h2>
 
-<span id="Appendix"></span><h2 class="appendix">Appendix A Appendix</h2>
-<hr>
+</div><div class="appendix" id="Appendix">
+<h2 class="appendix">Appendix A Appendix</h2>
+</div><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 adf8160c65..6255f3def0 100644
--- a/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
@@ -1041,15 +1041,18 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#chapter-node" accesskey="n" rel="next">chapter</a> &nbsp; </p>
 </div>
-<span id="top"></span><h1 class="top">top</h1>
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 
-<hr>
-<span id="Part-1"></span><div class="header">
+</div><hr>
+<div class="part" id="Part-1">
+<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>
@@ -1059,15 +1062,22 @@ 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>
-<span id="chapter-node"></span><span id="chapter"></span><h2 class="chapter">1 chapter</h2>
+</div><div class="chapter" id="chapter-node">
+<div class="node" id="chapter">
+<h2 class="chapter">1 chapter</h2>
 
-<hr>
-<span id="appendix-node"></span><div class="header">
+</div><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>
-<span id="Appendix"></span><h2 class="appendix">Appendix A Appendix</h2>
-<hr>
+<div class="node" id="Appendix">
+<h2 class="appendix">Appendix A Appendix</h2>
+</div><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 56a3007016..f79625401f 100644
--- a/tp/t/results/sectioning/part_node_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_node_part_appendix.pl
@@ -1125,15 +1125,18 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#chapter-node" accesskey="n" rel="next">chapter</a> &nbsp; </p>
 </div>
-<span id="top"></span><h1 class="top">top</h1>
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 
-<hr>
-<span id="Part-1"></span><div class="header">
+</div><hr>
+<div class="part" id="Part-1">
+<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>
@@ -1143,21 +1146,29 @@ 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>
-<span id="chapter-node"></span><span id="chapter"></span><h2 class="chapter">1 chapter</h2>
+</div><div class="chapter" id="chapter-node">
+<div class="node" id="chapter">
+<h2 class="chapter">1 chapter</h2>
 
-<hr>
-<span id="appendix-part"></span><div class="header">
+</div><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>
-<span id="Part-Appendix"></span><h1 class="part">Part Appendix</h1>
+<div class="part" id="Part-Appendix">
+<h1 class="part">Part Appendix</h1>
 <hr>
 
 <ul class="section-toc">
 <li><a href="#appendix-part" accesskey="1">Appendix</a></li>
 </ul>
-<span id="Appendix"></span><h2 class="appendix">Appendix A Appendix</h2>
-<hr>
+</div><div class="node" id="Appendix">
+<h2 class="appendix">Appendix A Appendix</h2>
+</div><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 e6564c36b3..0022b99c4e 100644
--- a/tp/t/results/sectioning/part_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_appendix.pl
@@ -914,15 +914,18 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#chapter-node" accesskey="n" rel="next">chapter</a> &nbsp; </p>
 </div>
-<span id="top"></span><h1 class="top">top</h1>
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 
-<hr>
-<span id="Part-1"></span><div class="header">
+</div><hr>
+<div class="part" id="Part-1">
+<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>
@@ -932,16 +935,22 @@ 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>
-<span id="chapter-node"></span><span id="chapter"></span><h2 class="chapter">1 chapter</h2>
+</div><div class="chapter" id="chapter-node">
+<div class="node" id="chapter">
+<h2 class="chapter">1 chapter</h2>
 
-<span id="Part-Appendix"></span><h1 class="part">Part Appendix</h1>
+</div><div class="part" id="Part-Appendix">
+<h1 class="part">Part Appendix</h1>
 <hr>
 
 <ul class="section-toc">
 <li><a href="#Appendix" accesskey="1">Appendix</a></li>
 </ul>
-<span id="Appendix"></span><h2 class="appendix">Appendix A Appendix</h2>
-<hr>
+</div><div class="appendix" id="Appendix">
+<h2 class="appendix">Appendix A Appendix</h2>
+</div><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 8586467baf..8669bccc3f 100644
--- a/tp/t/results/sectioning/part_node_part_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_node_appendix.pl
@@ -1115,15 +1115,18 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#chapter-node" accesskey="n" rel="next">chapter</a> &nbsp; </p>
 </div>
-<span id="top"></span><h1 class="top">top</h1>
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 
-<hr>
-<span id="Part-1"></span><div class="header">
+</div><hr>
+<div class="part" id="Part-1">
+<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>
@@ -1133,10 +1136,13 @@ 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>
-<span id="chapter-node"></span><span id="chapter"></span><h2 class="chapter">1 chapter</h2>
+</div><div class="chapter" id="chapter-node">
+<div class="node" id="chapter">
+<h2 class="chapter">1 chapter</h2>
 
-<hr>
-<span id="Part-Appendix"></span><div class="header">
+</div><hr>
+<div class="part" id="Part-Appendix">
+<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>
@@ -1146,8 +1152,13 @@ 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>
-<span id="appendix-node"></span><span id="Appendix"></span><h2 class="appendix">Appendix A Appendix</h2>
-<hr>
+</div></div>
+<div class="appendix" id="appendix-node">
+<div class="node" id="Appendix">
+<h2 class="appendix">Appendix A Appendix</h2>
+</div><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 03b04b4c23..8106de441e 100644
--- a/tp/t/results/sectioning/placed_things_before_element.pl
+++ b/tp/t/results/sectioning/placed_things_before_element.pl
@@ -1130,14 +1130,15 @@ ul.no-bullet {list-style: none}
 
 <span id="index-index-entry"></span>
 
-<span id="section"></span><h3 class="section">1 section</h3>
+<div class="section" id="section">
+<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 class="footnote">
+</p></div><div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
@@ -1149,7 +1150,7 @@ ul.no-bullet {list-style: none}
 <a href="#An-anchor">An anchor</a>
 </p>
 </div>
-<hr>
+<hr></div>
 
 
 
diff --git a/tp/t/results/sectioning/placed_things_before_node.pl b/tp/t/results/sectioning/placed_things_before_node.pl
index 05e883eeac..335cda512e 100644
--- a/tp/t/results/sectioning/placed_things_before_node.pl
+++ b/tp/t/results/sectioning/placed_things_before_node.pl
@@ -1196,14 +1196,16 @@ ul.no-bullet {list-style: none}
 
 <span id="index-index-entry"></span>
 
-<span id="Top"></span><span id="top-section"></span><h1 class="top">top section</h1>
+<div class="top" id="Top">
+<div class="node" id="top-section">
+<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 class="footnote">
+</p></div><div class="footnote">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
 
@@ -1215,7 +1217,8 @@ ul.no-bullet {list-style: none}
 <a href="#An-anchor">An anchor</a>
 </p>
 </div>
-<hr>
+<hr></div>
+</div>
 
 
 
diff --git a/tp/t/results/sectioning/protected_node_parentheses.pl b/tp/t/results/sectioning/protected_node_parentheses.pl
index ee61ba4588..38fa825ae8 100644
--- a/tp/t/results/sectioning/protected_node_parentheses.pl
+++ b/tp/t/results/sectioning/protected_node_parentheses.pl
@@ -693,15 +693,18 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#g_t_0028manual_0029-name" accesskey="n" rel="next">(manual) name</a> &nbsp; </p>
 </div>
-<span id="top"></span><h1 class="top">top</h1>
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 
-<hr>
-<span id="g_t_0028manual_0029-name"></span><div class="header">
+</div><hr>
+<div class="node" id="g_t_0028manual_0029-name">
+<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>
@@ -709,7 +712,8 @@ 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><hr>
+</p></div><hr>
+</div>
 
 
 
diff --git a/tp/t/results/sectioning/ref_to_top.pl b/tp/t/results/sectioning/ref_to_top.pl
index c2b2a39b9c..2c2552453b 100644
--- a/tp/t/results/sectioning/ref_to_top.pl
+++ b/tp/t/results/sectioning/ref_to_top.pl
@@ -298,10 +298,13 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><span id="top"></span><h1 class="top">top</h1>
+<div class="top" id="Top">
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 <p>See <a href="#Top">top</a>.
-</p><hr>
+</p></div><hr></div>
+</div>
 
 
 
diff --git a/tp/t/results/sectioning/section_before_part.pl b/tp/t/results/sectioning/section_before_part.pl
index 2386a386d1..bb03e70c74 100644
--- a/tp/t/results/sectioning/section_before_part.pl
+++ b/tp/t/results/sectioning/section_before_part.pl
@@ -239,9 +239,11 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="section"></span><h3 class="section">1 section</h3>
+<div class="section" id="section">
+<h3 class="section">1 section</h3>
 
-<span id="part"></span><h1 class="part">part</h1>
+</div><div class="part" id="part">
+<h1 class="part">part</h1>
 <hr>
 
 <span id="SEC_Contents"></span>
@@ -255,7 +257,7 @@ ul.no-bullet {list-style: none}
 </ul>
 </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 54670870d5..7cee50c3ee 100644
--- a/tp/t/results/sectioning/section_before_top.pl
+++ b/tp/t/results/sectioning/section_before_top.pl
@@ -572,20 +572,26 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="section-node"></span><div class="header">
+<div class="section" id="section-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>
-<span id="section"></span><h3 class="section">1 section</h3>
+<div class="node" id="section">
+<h3 class="section">1 section</h3>
 
-<hr>
-<span id="Top"></span><div class="header">
+</div><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>
-<span id="top"></span><h3 class="unnumberedsec">top</h3>
+<div class="node" id="top">
+<h3 class="unnumberedsec">top</h3>
 
-<hr>
+</div><hr>
+</div>
 
 
 
diff --git a/tp/t/results/sectioning/section_below_unnumbered.pl b/tp/t/results/sectioning/section_below_unnumbered.pl
index 92d5a7d8e9..e951d2ae55 100644
--- a/tp/t/results/sectioning/section_below_unnumbered.pl
+++ b/tp/t/results/sectioning/section_below_unnumbered.pl
@@ -932,11 +932,13 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#Unn" accesskey="n" rel="next">Unn</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-<span id="Top-1"></span><h1 class="top">Top</h1>
+<div class="node" id="Top-1">
+<h1 class="top">Top</h1>
 
 <p>Top node.
 </p>
@@ -955,27 +957,34 @@ Next: <a href="#Unn" accesskey="n" rel="next">Unn</a> &nbsp; [<a href="#SEC_Cont
 </ul>
 </div>
 
-<hr>
-<span id="Unn"></span><div class="header">
+</div><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>
-<span id="Unn-1"></span><h2 class="unnumbered">Unn</h2>
+<div class="node" id="Unn-1">
+<h2 class="unnumbered">Unn</h2>
 
 
 <ul class="section-toc">
 <li><a href="#Sec" accesskey="1">Sec</a></li>
 </ul>
-<hr>
-<span id="Sec"></span><div class="header">
+</div><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>
-<span id="Sec-1"></span><h3 class="section">Sec</h3>
+<div class="node" id="Sec-1">
+<h3 class="section">Sec</h3>
 
 <p>Should be unnumbered.
 </p>
-<hr>
+</div><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 8259273d00..bebe009d9d 100644
--- a/tp/t/results/sectioning/section_below_unnumbered_no_top.pl
+++ b/tp/t/results/sectioning/section_below_unnumbered_no_top.pl
@@ -171,12 +171,14 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="U"></span><h2 class="unnumbered">U</h2>
+<div class="unnumbered" id="U">
+<h2 class="unnumbered">U</h2>
 <ul class="section-toc">
 <li><a href="#S" accesskey="1">S</a></li>
 </ul>
-<span id="S"></span><h3 class="section">S</h3>
-<hr>
+</div><div class="section" id="S">
+<h3 class="section">S</h3>
+</div><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 fd140dabc7..879a5375de 100644
--- a/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
+++ b/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
@@ -890,29 +890,38 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="section-node"></span><div class="header">
+<div class="section" id="section-node">
+<div class="header">
 <p>
 Next: <a href="#chapter-node" accesskey="n" rel="next">chapter</a>, Up: <a href="#chapter-node" accesskey="u" rel="up">chapter</a> &nbsp; </p>
 </div>
-<span id="section"></span><h3 class="section">1 section</h3>
+<div class="node" id="section">
+<h3 class="section">1 section</h3>
 
-<hr>
-<span id="chapter-node"></span><div class="header">
+</div><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>
-<span id="chapter"></span><h3 class="section">2 chapter</h3>
+<div class="node" id="chapter">
+<h3 class="section">2 chapter</h3>
 
 
-<hr>
-<span id="Top"></span><div class="header">
+</div><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>
-<span id="top"></span><h3 class="unnumberedsec">top</h3>
+<div class="node" id="top">
+<h3 class="unnumberedsec">top</h3>
 
 
-<hr>
+</div><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 2ccafd83d5..9e38ae8301 100644
--- a/tp/t/results/sectioning/section_in_unnumbered_info.pl
+++ b/tp/t/results/sectioning/section_in_unnumbered_info.pl
@@ -8261,11 +8261,13 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-<span id="Test-section-in-unnumbered"></span><h1 class="top">Test section in unnumbered</h1>
+<div class="node" id="Test-section-in-unnumbered">
+<h1 class="top">Test section in unnumbered</h1>
 
 
 <p>Menu:
@@ -8335,60 +8337,76 @@ Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; [<a href="#
 </ul>
 </div>
 
-<hr>
-<span id="chapter"></span><div class="header">
+</div><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>
-<span id="chapter-1"></span><h2 class="chapter">1 chapter</h2>
+<div class="node" id="chapter-1">
+<h2 class="chapter">1 chapter</h2>
 
 
 <ul class="section-toc">
 <li><a href="#section-in-chapter" accesskey="1">section in chapter</a></li>
 </ul>
-<hr>
-<span id="section-in-chapter"></span><div class="header">
+</div><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>
-<span id="section-in-chapter-1"></span><h3 class="section">1.1 section in chapter</h3>
+<div class="node" id="section-in-chapter-1">
+<h3 class="section">1.1 section in chapter</h3>
 
-<hr>
-<span id="unnumbered"></span><div class="header">
+</div><hr>
+</div>
+</div>
+<div class="unnumbered" id="unnumbered">
+<div class="header">
 <p>
 Next: <a href="#chapter-2" accesskey="n" rel="next">chapter 2</a>, Previous: <a href="#chapter" accesskey="p" rel="prev">chapter</a>, Up: <a href="#Top" accesskey="u" rel="up">Test section in unnumbered</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-<span id="unnumbered-1"></span><h2 class="unnumbered">unnumbered</h2>
+<div class="node" id="unnumbered-1">
+<h2 class="unnumbered">unnumbered</h2>
 
 
 <ul class="section-toc">
 <li><a href="#section-in-unnumbered" accesskey="1">section in unnumbered</a></li>
 </ul>
-<hr>
-<span id="section-in-unnumbered"></span><div class="header">
+</div><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>
-<span id="section-in-unnumbered-1"></span><h3 class="section">section in unnumbered</h3>
+<div class="node" id="section-in-unnumbered-1">
+<h3 class="section">section in unnumbered</h3>
 
-<hr>
-<span id="chapter-2"></span><div class="header">
+</div><hr>
+</div>
+</div>
+<div class="chapter" id="chapter-2">
+<div class="header">
 <p>
 Next: <a href="#chapter-3" accesskey="n" rel="next">chapter 3</a>, Previous: <a href="#unnumbered" accesskey="p" rel="prev">unnumbered</a>, Up: <a href="#Top" accesskey="u" rel="up">Test section in unnumbered</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-<span id="chapter-2-1"></span><h2 class="chapter">2 chapter 2</h2>
+<div class="node" id="chapter-2-1">
+<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>
-<hr>
-<span id="unnumberedsec-2"></span><div class="header">
+</div><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>
-<span id="unnumbered-section-2"></span><h3 class="unnumberedsec">unnumbered section 2</h3>
+<div class="node" id="unnumbered-section-2">
+<h3 class="unnumberedsec">unnumbered section 2</h3>
 
 
 <ul class="section-toc">
@@ -8397,59 +8415,81 @@ 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>
-<hr>
-<span id="unnumbered-sub-2"></span><div class="header">
+</div><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>
-<span id="unnumbered-subsection-2"></span><h4 class="unnumberedsubsec">unnumbered subsection 2</h4>
+<div class="node" id="unnumbered-subsection-2">
+<h4 class="unnumberedsubsec">unnumbered subsection 2</h4>
 
-<hr>
-<span id="numbered-sub-2"></span><div class="header">
+</div><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>
-<span id="numbered-subsection-2"></span><h4 class="subsection">numbered subsection 2</h4>
+<div class="node" id="numbered-subsection-2">
+<h4 class="subsection">numbered subsection 2</h4>
 
-<hr>
-<span id="unnumbered-sub2-2"></span><div class="header">
+</div><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>
-<span id="unnumbered-subsection2-2"></span><h4 class="unnumberedsubsec">unnumbered subsection2 2</h4>
+<div class="node" id="unnumbered-subsection2-2">
+<h4 class="unnumberedsubsec">unnumbered subsection2 2</h4>
 
-<hr>
-<span id="numbered-sub2-2"></span><div class="header">
+</div><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>
-<span id="numbered-subsection2-2"></span><h4 class="subsection">numbered subsection2 2</h4>
+<div class="node" id="numbered-subsection2-2">
+<h4 class="subsection">numbered subsection2 2</h4>
 
-<hr>
-<span id="unnumberedsec-2_002d1"></span><div class="header">
+</div><hr>
+</div>
+</div>
+<div class="unnumberedsec" id="unnumberedsec-2_002d1">
+<div class="header">
 <p>
 Previous: <a href="#unnumberedsec-2" accesskey="p" rel="prev">unnumbered section 2</a>, Up: <a href="#chapter-2" accesskey="u" rel="up">chapter 2</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-<span id="unnumberedsec-2_002d1-1"></span><h3 class="unnumberedsec">unnumberedsec 2-1</h3>
+<div class="node" id="unnumberedsec-2_002d1-1">
+<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>
-<hr>
-<span id="numbered-sub-2_002d1"></span><div class="header">
+</div><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>
-<span id="numbered-subsection-2_002d1"></span><h4 class="subsection">numbered subsection 2-1</h4>
+<div class="node" id="numbered-subsection-2_002d1">
+<h4 class="subsection">numbered subsection 2-1</h4>
 
 
-<hr>
-<span id="chapter-3"></span><div class="header">
+</div><hr>
+</div>
+</div>
+</div>
+<div class="chapter" id="chapter-3">
+<div class="header">
 <p>
 Next: <a href="#unnumbered-4" accesskey="n" rel="next">unnumbered  4</a>, Previous: <a href="#chapter-2" accesskey="p" rel="prev">chapter 2</a>, Up: <a href="#Top" accesskey="u" rel="up">Test section in unnumbered</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-<span id="chapter-3-1"></span><h2 class="chapter">3 chapter 3</h2>
+<div class="node" id="chapter-3-1">
+<h2 class="chapter">3 chapter 3</h2>
 
 
 <ul class="section-toc">
@@ -8459,12 +8499,14 @@ 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>
-<hr>
-<span id="unnumberedsec-3"></span><div class="header">
+</div><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>
-<span id="unnumbered-section-3"></span><h3 class="unnumberedsec">unnumbered section 3</h3>
+<div class="node" id="unnumbered-section-3">
+<h3 class="unnumberedsec">unnumbered section 3</h3>
 
 
 <ul class="section-toc">
@@ -8473,112 +8515,151 @@ 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>
-<hr>
-<span id="unnumbered-sub-3"></span><div class="header">
+</div><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>
-<span id="unnumbered-subsection-3"></span><h4 class="unnumberedsubsec">unnumbered subsection 3</h4>
+<div class="node" id="unnumbered-subsection-3">
+<h4 class="unnumberedsubsec">unnumbered subsection 3</h4>
 
-<hr>
-<span id="numbered-sub-3"></span><div class="header">
+</div><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>
-<span id="numbered-subsection-3"></span><h4 class="subsection">numbered subsection 3</h4>
+<div class="node" id="numbered-subsection-3">
+<h4 class="subsection">numbered subsection 3</h4>
 
-<hr>
-<span id="unnumbered-sub2-3"></span><div class="header">
+</div><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>
-<span id="unnumbered-subsection2-3"></span><h4 class="unnumberedsubsec">unnumbered subsection2 3</h4>
+<div class="node" id="unnumbered-subsection2-3">
+<h4 class="unnumberedsubsec">unnumbered subsection2 3</h4>
 
-<hr>
-<span id="numbered-sub2-3"></span><div class="header">
+</div><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>
-<span id="numbered-subsection2-3"></span><h4 class="subsection">numbered subsection2 3</h4>
+<div class="node" id="numbered-subsection2-3">
+<h4 class="subsection">numbered subsection2 3</h4>
 
-<hr>
-<span id="section-3_002d1"></span><div class="header">
+</div><hr>
+</div>
+</div>
+<div class="section" id="section-3_002d1">
+<div class="header">
 <p>
 Next: <a href="#unnumberedsec-3_002d2" accesskey="n" rel="next">unnumberedsec 3-2</a>, Previous: <a href="#unnumberedsec-3" accesskey="p" rel="prev">unnumbered section 3</a>, Up: <a href="#chapter-3" accesskey="u" rel="up">chapter 3</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-<span id="section-3_002d1-1"></span><h3 class="section">3.1 section 3-1</h3>
+<div class="node" id="section-3_002d1-1">
+<h3 class="section">3.1 section 3-1</h3>
 
-<hr>
-<span id="unnumberedsec-3_002d2"></span><div class="header">
+</div><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>
-<span id="unnumberedsec-3_002d2-1"></span><h3 class="unnumberedsec">unnumberedsec 3-2</h3>
+<div class="node" id="unnumberedsec-3_002d2-1">
+<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>
-<hr>
-<span id="numbered-sub-3_002d2"></span><div class="header">
+</div><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>
-<span id="numbered-subsection-3_002d2"></span><h4 class="subsection">numbered subsection 3-2</h4>
+<div class="node" id="numbered-subsection-3_002d2">
+<h4 class="subsection">numbered subsection 3-2</h4>
 
-<hr>
-<span id="section-3_002d3"></span><div class="header">
+</div><hr>
+</div>
+</div>
+<div class="section" id="section-3_002d3">
+<div class="header">
 <p>
 Next: <a href="#unnumberedsec-3_002d4" accesskey="n" rel="next">unnumberedsec 3-4</a>, Previous: <a href="#unnumberedsec-3_002d2" accesskey="p" rel="prev">unnumberedsec 3-2</a>, Up: <a href="#chapter-3" accesskey="u" rel="up">chapter 3</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-<span id="section-3_002d3-1"></span><h3 class="section">3.2 section 3-3</h3>
+<div class="node" id="section-3_002d3-1">
+<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>
-<hr>
-<span id="subsection-3_002d3"></span><div class="header">
+</div><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>
-<span id="subsection-3_002d3-1"></span><h4 class="subsection">3.2.1 subsection 3-3</h4>
+<div class="node" id="subsection-3_002d3-1">
+<h4 class="subsection">3.2.1 subsection 3-3</h4>
 
-<hr>
-<span id="unnumberedsec-3_002d4"></span><div class="header">
+</div><hr>
+</div>
+</div>
+<div class="unnumberedsec" id="unnumberedsec-3_002d4">
+<div class="header">
 <p>
 Previous: <a href="#section-3_002d3" accesskey="p" rel="prev">section 3-3</a>, Up: <a href="#chapter-3" accesskey="u" rel="up">chapter 3</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-<span id="unnumberedsec-3_002d4-1"></span><h3 class="unnumberedsec">unnumberedsec 3-4</h3>
+<div class="node" id="unnumberedsec-3_002d4-1">
+<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>
-<hr>
-<span id="numbered-sub-3_002d4"></span><div class="header">
+</div><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>
-<span id="numbered-subsection-3_002d4"></span><h4 class="subsection">numbered subsection 3-4</h4>
+<div class="node" id="numbered-subsection-3_002d4">
+<h4 class="subsection">numbered subsection 3-4</h4>
 
-<hr>
-<span id="unnumbered-4"></span><div class="header">
+</div><hr>
+</div>
+</div>
+</div>
+<div class="unnumbered" id="unnumbered-4">
+<div class="header">
 <p>
 Previous: <a href="#chapter-3" accesskey="p" rel="prev">chapter 3</a>, Up: <a href="#Top" accesskey="u" rel="up">Test section in unnumbered</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-<span id="unnumbered-4-1"></span><h2 class="unnumbered">unnumbered  4</h2>
+<div class="node" id="unnumbered-4-1">
+<h2 class="unnumbered">unnumbered  4</h2>
 
 
 <ul class="section-toc">
 <li><a href="#unnumberedsec-4" accesskey="1">unnumbered section 4</a></li>
 </ul>
-<hr>
-<span id="unnumberedsec-4"></span><div class="header">
+</div><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>
-<span id="unnumbered-section-4"></span><h3 class="unnumberedsec">unnumbered section 4</h3>
+<div class="node" id="unnumbered-section-4">
+<h3 class="unnumberedsec">unnumbered section 4</h3>
 
 
 <ul class="section-toc">
@@ -8587,34 +8668,49 @@ 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>
-<hr>
-<span id="unnumbered-sub-4"></span><div class="header">
+</div><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>
-<span id="unnumbered-subsection-4"></span><h4 class="unnumberedsubsec">unnumbered subsection 4</h4>
+<div class="node" id="unnumbered-subsection-4">
+<h4 class="unnumberedsubsec">unnumbered subsection 4</h4>
 
-<hr>
-<span id="numbered-sub-4"></span><div class="header">
+</div><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>
-<span id="numbered-subsection-4"></span><h4 class="subsection">numbered subsection 4</h4>
+<div class="node" id="numbered-subsection-4">
+<h4 class="subsection">numbered subsection 4</h4>
 
-<hr>
-<span id="unnumbered-sub2-4"></span><div class="header">
+</div><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>
-<span id="unnumbered-subsection2-4"></span><h4 class="unnumberedsubsec">unnumbered subsection2 4</h4>
+<div class="node" id="unnumbered-subsection2-4">
+<h4 class="unnumberedsubsec">unnumbered subsection2 4</h4>
 
-<hr>
-<span id="numbered-sub2-4"></span><div class="header">
+</div><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>
-<span id="numbered-subsection2-4"></span><h4 class="subsection">numbered subsection2 4</h4>
-<hr>
+<div class="node" id="numbered-subsection2-4">
+<h4 class="subsection">numbered subsection2 4</h4>
+</div><hr>
+</div>
+</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 97830ad37c..40dc00a2b4 100644
--- a/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
+++ b/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
@@ -8083,11 +8083,13 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-<span id="Test-section-in-unnumbered"></span><h1 class="top">Test section in unnumbered</h1>
+<div class="node" id="Test-section-in-unnumbered">
+<h1 class="top">Test section in unnumbered</h1>
 
 
 <p>Menu:
@@ -8157,60 +8159,76 @@ Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; [<a href="#
 </ul>
 </div>
 
-<hr>
-<span id="chapter"></span><div class="header">
+</div><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>
-<span id="chapter-1"></span><h2 class="chapter">1 chapter</h2>
+<div class="node" id="chapter-1">
+<h2 class="chapter">1 chapter</h2>
 
 
 <ul class="section-toc">
 <li><a href="#section-in-chapter" accesskey="1">section in chapter</a></li>
 </ul>
-<hr>
-<span id="section-in-chapter"></span><div class="header">
+</div><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>
-<span id="section-in-chapter-1"></span><h3 class="section">1.1 section in chapter</h3>
+<div class="node" id="section-in-chapter-1">
+<h3 class="section">1.1 section in chapter</h3>
 
-<hr>
-<span id="unnumbered"></span><div class="header">
+</div><hr>
+</div>
+</div>
+<div class="unnumbered" id="unnumbered">
+<div class="header">
 <p>
 Next: <a href="#chapter-2" accesskey="n" rel="next">chapter 2</a>, Previous: <a href="#chapter" accesskey="p" rel="prev">chapter</a>, Up: <a href="#Top" accesskey="u" rel="up">Test section in unnumbered</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-<span id="unnumbered-1"></span><h2 class="unnumbered">unnumbered</h2>
+<div class="node" id="unnumbered-1">
+<h2 class="unnumbered">unnumbered</h2>
 
 
 <ul class="section-toc">
 <li><a href="#section-in-unnumbered" accesskey="1">section in unnumbered</a></li>
 </ul>
-<hr>
-<span id="section-in-unnumbered"></span><div class="header">
+</div><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>
-<span id="section-in-unnumbered-1"></span><h3 class="section">section in unnumbered</h3>
+<div class="node" id="section-in-unnumbered-1">
+<h3 class="section">section in unnumbered</h3>
 
-<hr>
-<span id="chapter-2"></span><div class="header">
+</div><hr>
+</div>
+</div>
+<div class="chapter" id="chapter-2">
+<div class="header">
 <p>
 Next: <a href="#chapter-3" accesskey="n" rel="next">chapter 3</a>, Previous: <a href="#unnumbered" accesskey="p" rel="prev">unnumbered</a>, Up: <a href="#Top" accesskey="u" rel="up">Test section in unnumbered</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-<span id="chapter-2-1"></span><h2 class="chapter">2 chapter 2</h2>
+<div class="node" id="chapter-2-1">
+<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>
-<hr>
-<span id="unnumberedsec-2"></span><div class="header">
+</div><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>
-<span id="unnumbered-section-2"></span><h3 class="unnumberedsec">unnumbered section 2</h3>
+<div class="node" id="unnumbered-section-2">
+<h3 class="unnumberedsec">unnumbered section 2</h3>
 
 
 <ul class="section-toc">
@@ -8219,59 +8237,81 @@ 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>
-<hr>
-<span id="unnumbered-sub-2"></span><div class="header">
+</div><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>
-<span id="unnumbered-subsection-2"></span><h4 class="unnumberedsubsec">unnumbered subsection 2</h4>
+<div class="node" id="unnumbered-subsection-2">
+<h4 class="unnumberedsubsec">unnumbered subsection 2</h4>
 
-<hr>
-<span id="numbered-sub-2"></span><div class="header">
+</div><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>
-<span id="numbered-subsection-2"></span><h4 class="subsection">numbered subsection 2</h4>
+<div class="node" id="numbered-subsection-2">
+<h4 class="subsection">numbered subsection 2</h4>
 
-<hr>
-<span id="unnumbered-sub2-2"></span><div class="header">
+</div><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>
-<span id="unnumbered-subsection2-2"></span><h4 class="unnumberedsubsec">unnumbered subsection2 2</h4>
+<div class="node" id="unnumbered-subsection2-2">
+<h4 class="unnumberedsubsec">unnumbered subsection2 2</h4>
 
-<hr>
-<span id="numbered-sub2-2"></span><div class="header">
+</div><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>
-<span id="numbered-subsection2-2"></span><h4 class="subsection">numbered subsection2 2</h4>
+<div class="node" id="numbered-subsection2-2">
+<h4 class="subsection">numbered subsection2 2</h4>
 
-<hr>
-<span id="unnumberedsec-2_002d1"></span><div class="header">
+</div><hr>
+</div>
+</div>
+<div class="unnumberedsec" id="unnumberedsec-2_002d1">
+<div class="header">
 <p>
 Previous: <a href="#unnumberedsec-2" accesskey="p" rel="prev">unnumbered section 2</a>, Up: <a href="#chapter-2" accesskey="u" rel="up">chapter 2</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-<span id="unnumberedsec-2_002d1-1"></span><h3 class="unnumberedsec">unnumberedsec 2-1</h3>
+<div class="node" id="unnumberedsec-2_002d1-1">
+<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>
-<hr>
-<span id="numbered-sub-2_002d1"></span><div class="header">
+</div><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>
-<span id="numbered-subsection-2_002d1"></span><h4 class="subsection">numbered subsection 2-1</h4>
+<div class="node" id="numbered-subsection-2_002d1">
+<h4 class="subsection">numbered subsection 2-1</h4>
 
 
-<hr>
-<span id="chapter-3"></span><div class="header">
+</div><hr>
+</div>
+</div>
+</div>
+<div class="chapter" id="chapter-3">
+<div class="header">
 <p>
 Next: <a href="#unnumbered-4" accesskey="n" rel="next">unnumbered  4</a>, Previous: <a href="#chapter-2" accesskey="p" rel="prev">chapter 2</a>, Up: <a href="#Top" accesskey="u" rel="up">Test section in unnumbered</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-<span id="chapter-3-1"></span><h2 class="chapter">3 chapter 3</h2>
+<div class="node" id="chapter-3-1">
+<h2 class="chapter">3 chapter 3</h2>
 
 
 <ul class="section-toc">
@@ -8281,12 +8321,14 @@ 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>
-<hr>
-<span id="unnumberedsec-3"></span><div class="header">
+</div><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>
-<span id="unnumbered-section-3"></span><h3 class="unnumberedsec">unnumbered section 3</h3>
+<div class="node" id="unnumbered-section-3">
+<h3 class="unnumberedsec">unnumbered section 3</h3>
 
 
 <ul class="section-toc">
@@ -8295,112 +8337,151 @@ 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>
-<hr>
-<span id="unnumbered-sub-3"></span><div class="header">
+</div><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>
-<span id="unnumbered-subsection-3"></span><h4 class="unnumberedsubsec">unnumbered subsection 3</h4>
+<div class="node" id="unnumbered-subsection-3">
+<h4 class="unnumberedsubsec">unnumbered subsection 3</h4>
 
-<hr>
-<span id="numbered-sub-3"></span><div class="header">
+</div><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>
-<span id="numbered-subsection-3"></span><h4 class="subsection">numbered subsection 3</h4>
+<div class="node" id="numbered-subsection-3">
+<h4 class="subsection">numbered subsection 3</h4>
 
-<hr>
-<span id="unnumbered-sub2-3"></span><div class="header">
+</div><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>
-<span id="unnumbered-subsection2-3"></span><h4 class="unnumberedsubsec">unnumbered subsection2 3</h4>
+<div class="node" id="unnumbered-subsection2-3">
+<h4 class="unnumberedsubsec">unnumbered subsection2 3</h4>
 
-<hr>
-<span id="numbered-sub2-3"></span><div class="header">
+</div><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>
-<span id="numbered-subsection2-3"></span><h4 class="subsection">numbered subsection2 3</h4>
+<div class="node" id="numbered-subsection2-3">
+<h4 class="subsection">numbered subsection2 3</h4>
 
-<hr>
-<span id="section-3_002d1"></span><div class="header">
+</div><hr>
+</div>
+</div>
+<div class="section" id="section-3_002d1">
+<div class="header">
 <p>
 Next: <a href="#unnumberedsec-3_002d2" accesskey="n" rel="next">unnumberedsec 3-2</a>, Previous: <a href="#unnumberedsec-3" accesskey="p" rel="prev">unnumbered section 3</a>, Up: <a href="#chapter-3" accesskey="u" rel="up">chapter 3</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-<span id="section-3_002d1-1"></span><h3 class="section">3.1 section 3-1</h3>
+<div class="node" id="section-3_002d1-1">
+<h3 class="section">3.1 section 3-1</h3>
 
-<hr>
-<span id="unnumberedsec-3_002d2"></span><div class="header">
+</div><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>
-<span id="unnumberedsec-3_002d2-1"></span><h3 class="unnumberedsec">unnumberedsec 3-2</h3>
+<div class="node" id="unnumberedsec-3_002d2-1">
+<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>
-<hr>
-<span id="numbered-sub-3_002d2"></span><div class="header">
+</div><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>
-<span id="numbered-subsection-3_002d2"></span><h4 class="subsection">numbered subsection 3-2</h4>
+<div class="node" id="numbered-subsection-3_002d2">
+<h4 class="subsection">numbered subsection 3-2</h4>
 
-<hr>
-<span id="section-3_002d3"></span><div class="header">
+</div><hr>
+</div>
+</div>
+<div class="section" id="section-3_002d3">
+<div class="header">
 <p>
 Next: <a href="#unnumberedsec-3_002d4" accesskey="n" rel="next">unnumberedsec 3-4</a>, Previous: <a href="#unnumberedsec-3_002d2" accesskey="p" rel="prev">unnumberedsec 3-2</a>, Up: <a href="#chapter-3" accesskey="u" rel="up">chapter 3</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-<span id="section-3_002d3-1"></span><h3 class="section">3.2 section 3-3</h3>
+<div class="node" id="section-3_002d3-1">
+<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>
-<hr>
-<span id="subsection-3_002d3"></span><div class="header">
+</div><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>
-<span id="subsection-3_002d3-1"></span><h4 class="subsection">3.2.1 subsection 3-3</h4>
+<div class="node" id="subsection-3_002d3-1">
+<h4 class="subsection">3.2.1 subsection 3-3</h4>
 
-<hr>
-<span id="unnumberedsec-3_002d4"></span><div class="header">
+</div><hr>
+</div>
+</div>
+<div class="unnumberedsec" id="unnumberedsec-3_002d4">
+<div class="header">
 <p>
 Previous: <a href="#section-3_002d3" accesskey="p" rel="prev">section 3-3</a>, Up: <a href="#chapter-3" accesskey="u" rel="up">chapter 3</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-<span id="unnumberedsec-3_002d4-1"></span><h3 class="unnumberedsec">unnumberedsec 3-4</h3>
+<div class="node" id="unnumberedsec-3_002d4-1">
+<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>
-<hr>
-<span id="numbered-sub-3_002d4"></span><div class="header">
+</div><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>
-<span id="numbered-subsection-3_002d4"></span><h4 class="subsection">numbered subsection 3-4</h4>
+<div class="node" id="numbered-subsection-3_002d4">
+<h4 class="subsection">numbered subsection 3-4</h4>
 
-<hr>
-<span id="unnumbered-4"></span><div class="header">
+</div><hr>
+</div>
+</div>
+</div>
+<div class="unnumbered" id="unnumbered-4">
+<div class="header">
 <p>
 Previous: <a href="#chapter-3" accesskey="p" rel="prev">chapter 3</a>, Up: <a href="#Top" accesskey="u" rel="up">Test section in unnumbered</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-<span id="unnumbered-4-1"></span><h2 class="unnumbered">unnumbered  4</h2>
+<div class="node" id="unnumbered-4-1">
+<h2 class="unnumbered">unnumbered  4</h2>
 
 
 <ul class="section-toc">
 <li><a href="#unnumberedsec-4" accesskey="1">unnumbered section 4</a></li>
 </ul>
-<hr>
-<span id="unnumberedsec-4"></span><div class="header">
+</div><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>
-<span id="unnumbered-section-4"></span><h3 class="unnumberedsec">unnumbered section 4</h3>
+<div class="node" id="unnumbered-section-4">
+<h3 class="unnumberedsec">unnumbered section 4</h3>
 
 
 <ul class="section-toc">
@@ -8409,34 +8490,49 @@ 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>
-<hr>
-<span id="unnumbered-sub-4"></span><div class="header">
+</div><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>
-<span id="unnumbered-subsection-4"></span><h4 class="unnumberedsubsec">unnumbered subsection 4</h4>
+<div class="node" id="unnumbered-subsection-4">
+<h4 class="unnumberedsubsec">unnumbered subsection 4</h4>
 
-<hr>
-<span id="numbered-sub-4"></span><div class="header">
+</div><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>
-<span id="numbered-subsection-4"></span><h4 class="subsection">numbered subsection 4</h4>
+<div class="node" id="numbered-subsection-4">
+<h4 class="subsection">numbered subsection 4</h4>
 
-<hr>
-<span id="unnumbered-sub2-4"></span><div class="header">
+</div><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>
-<span id="unnumbered-subsection2-4"></span><h4 class="unnumberedsubsec">unnumbered subsection2 4</h4>
+<div class="node" id="unnumbered-subsection2-4">
+<h4 class="unnumberedsubsec">unnumbered subsection2 4</h4>
 
-<hr>
-<span id="numbered-sub2-4"></span><div class="header">
+</div><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>
-<span id="numbered-subsection2-4"></span><h4 class="subsection">numbered subsection2 4</h4>
-<hr>
+<div class="node" id="numbered-subsection2-4">
+<h4 class="subsection">numbered subsection2 4</h4>
+</div><hr>
+</div>
+</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 40eb513d02..4d305b8657 100644
--- a/tp/t/results/sectioning/section_node_before_part.pl
+++ b/tp/t/results/sectioning/section_node_before_part.pl
@@ -303,11 +303,15 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><span id="section"></span><h3 class="section">1 section</h3>
+<div class="section" id="Top">
+<div class="node" id="section">
+<h3 class="section">1 section</h3>
 
-<span id="part"></span><h1 class="part">part</h1>
-<hr>
+</div><div class="part" id="part">
+<h1 class="part">part</h1>
 <hr>
+</div><hr></div>
+</div>
 
 
 
diff --git a/tp/t/results/sectioning/sections_test.pl b/tp/t/results/sectioning/sections_test.pl
index 3cc35bc5d6..48a94a709f 100644
--- a/tp/t/results/sectioning/sections_test.pl
+++ b/tp/t/results/sectioning/sections_test.pl
@@ -760,29 +760,35 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="top"></span><h1 class="top">top</h1>
+<div class="top" id="top">
+<h1 class="top">top</h1>
 
 <ul class="section-toc">
 <li><a href="#chapter" accesskey="1">chapter</a></li>
 </ul>
-<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
+</div><div class="chapter" id="chapter">
+<h2 class="chapter">1 chapter</h2>
 
 <ul class="section-toc">
 <li><a href="#section" accesskey="1">section</a></li>
 </ul>
-<span id="section"></span><h3 class="section">1.1 section</h3>
+</div><div class="section" id="section">
+<h3 class="section">1.1 section</h3>
 
 <ul class="section-toc">
 <li><a href="#subsection" accesskey="1">subsection</a></li>
 </ul>
-<span id="subsection"></span><h4 class="subsection">1.1.1 subsection</h4>
+</div><div class="subsection" id="subsection">
+<h4 class="subsection">1.1.1 subsection</h4>
 
 <ul class="section-toc">
 <li><a href="#subsubsection" accesskey="1">subsubsection</a></li>
 </ul>
-<span id="subsubsection"></span><h4 class="subsubsection">1.1.1.1 subsubsection</h4>
+</div><div class="subsubsection" id="subsubsection">
+<h4 class="subsubsection">1.1.1.1 subsubsection</h4>
 
-<span id="part"></span><h1 class="part">part</h1>
+</div><div class="part" id="part">
+<h1 class="part">part</h1>
 <hr>
 
 <ul class="section-toc">
@@ -790,19 +796,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>
-<span id="chapter-in-part"></span><h2 class="chapter">2 chapter in part</h2>
+</div><div class="chapter" id="chapter-in-part">
+<h2 class="chapter">2 chapter in part</h2>
 
-<span id="second-chapter-in-part"></span><h2 class="chapter">3 second chapter in part</h2>
+</div><div class="chapter" id="second-chapter-in-part">
+<h2 class="chapter">3 second chapter in part</h2>
 
-<span id="unnumbered"></span><h2 class="unnumbered">unnumbered</h2>
+</div><div class="unnumbered" id="unnumbered">
+<h2 class="unnumbered">unnumbered</h2>
 
-<span id="appendix"></span><h2 class="appendix">Appendix A appendix</h2>
+</div><div class="appendix" id="appendix">
+<h2 class="appendix">Appendix A appendix</h2>
 
 <ul class="section-toc">
 <li><a href="#appendixsec" accesskey="1">appendixsec</a></li>
 </ul>
-<span id="appendixsec"></span><h3 class="appendixsec">A.1 appendixsec</h3>
-<hr>
+</div><div class="appendixsec" id="appendixsec">
+<h3 class="appendixsec">A.1 appendixsec</h3>
+</div><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 d77ce34701..2d5a7b0b7d 100644
--- a/tp/t/results/sectioning/sections_test_no_use_nodes.pl
+++ b/tp/t/results/sectioning/sections_test_no_use_nodes.pl
@@ -761,7 +761,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="top"></span><div class="header">
+<div class="top" id="top">
+<div class="header">
 <p>
 Next: <a href="#chapter-in-part" accesskey="n" rel="next">chapter in part</a> &nbsp; </p>
 </div>
@@ -770,8 +771,9 @@ 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>
-<hr>
-<span id="chapter"></span><div class="header">
+</div><hr>
+<div class="chapter" id="chapter">
+<div class="header">
 <p>
  Up : <a href="#top" accesskey="u" rel="up">top</a> &nbsp; </p>
 </div>
@@ -780,8 +782,9 @@ 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>
-<hr>
-<span id="section"></span><div class="header">
+</div><hr>
+<div class="section" id="section">
+<div class="header">
 <p>
  Up : <a href="#chapter" accesskey="u" rel="up">chapter</a> &nbsp; </p>
 </div>
@@ -790,8 +793,9 @@ 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>
-<hr>
-<span id="subsection"></span><div class="header">
+</div><hr>
+<div class="subsection" id="subsection">
+<div class="header">
 <p>
  Up : <a href="#section" accesskey="u" rel="up">section</a> &nbsp; </p>
 </div>
@@ -800,15 +804,17 @@ 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>
-<hr>
-<span id="subsubsection"></span><div class="header">
+</div><hr>
+<div class="subsubsection" id="subsubsection">
+<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>
 
-<hr>
-<span id="part"></span><div class="header">
+</div><hr>
+<div class="part" id="part">
+<div class="header">
 <p>
 Next: <a href="#second-chapter-in-part" accesskey="n" rel="next">second chapter in part</a> &nbsp; </p>
 </div>
@@ -820,24 +826,28 @@ 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>
-<span id="chapter-in-part"></span><h2 class="chapter">2 chapter in part</h2>
+</div><div class="chapter" id="chapter-in-part">
+<h2 class="chapter">2 chapter in part</h2>
 
-<hr>
-<span id="second-chapter-in-part"></span><div class="header">
+</div><hr>
+<div class="chapter" id="second-chapter-in-part">
+<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>
 
-<hr>
-<span id="unnumbered"></span><div class="header">
+</div><hr>
+<div class="unnumbered" id="unnumbered">
+<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>
 
-<hr>
-<span id="appendix"></span><div class="header">
+</div><hr>
+<div class="appendix" id="appendix">
+<div class="header">
 <p>
 Prev: <a href="#chapter-in-part" accesskey="p" rel="prev">chapter in part</a> &nbsp; </p>
 </div>
@@ -846,13 +856,14 @@ 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>
-<hr>
-<span id="appendixsec"></span><div class="header">
+</div><hr>
+<div class="appendixsec" id="appendixsec">
+<div class="header">
 <p>
  Up : <a href="#appendix" accesskey="u" rel="up">appendix</a> &nbsp; </p>
 </div>
 <h3 class="appendixsec">A.1 appendixsec</h3>
-<hr>
+</div><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 5750f0786a..7bf7f11265 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,7 +761,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="top"></span><div class="header">
+<div class="top" id="top">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
@@ -770,8 +771,9 @@ ul.no-bullet {list-style: none}
 <ul class="section-toc">
 <li><a href="#chapter" accesskey="1">chapter</a></li>
 </ul>
-<hr>
-<span id="chapter"></span><div class="header">
+</div><hr>
+<div class="chapter" id="chapter">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
@@ -780,8 +782,9 @@ ul.no-bullet {list-style: none}
 <ul class="section-toc">
 <li><a href="#section" accesskey="1">section</a></li>
 </ul>
-<hr>
-<span id="section"></span><div class="header">
+</div><hr>
+<div class="section" id="section">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
@@ -790,8 +793,9 @@ ul.no-bullet {list-style: none}
 <ul class="section-toc">
 <li><a href="#subsection" accesskey="1">subsection</a></li>
 </ul>
-<hr>
-<span id="subsection"></span><div class="header">
+</div><hr>
+<div class="subsection" id="subsection">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
@@ -800,15 +804,17 @@ ul.no-bullet {list-style: none}
 <ul class="section-toc">
 <li><a href="#subsubsection" accesskey="1">subsubsection</a></li>
 </ul>
-<hr>
-<span id="subsubsection"></span><div class="header">
+</div><hr>
+<div class="subsubsection" id="subsubsection">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
 <h4 class="subsubsection">1.1.1.1 subsubsection</h4>
 
-<hr>
-<span id="part"></span><div class="header">
+</div><hr>
+<div class="part" id="part">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
@@ -820,24 +826,28 @@ 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>
-<span id="chapter-in-part"></span><h2 class="chapter">2 chapter in part</h2>
+</div><div class="chapter" id="chapter-in-part">
+<h2 class="chapter">2 chapter in part</h2>
 
-<hr>
-<span id="second-chapter-in-part"></span><div class="header">
+</div><hr>
+<div class="chapter" id="second-chapter-in-part">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
 <h2 class="chapter">3 second chapter in part</h2>
 
-<hr>
-<span id="unnumbered"></span><div class="header">
+</div><hr>
+<div class="unnumbered" id="unnumbered">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
 <h2 class="unnumbered">unnumbered</h2>
 
-<hr>
-<span id="appendix"></span><div class="header">
+</div><hr>
+<div class="appendix" id="appendix">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
@@ -846,13 +856,14 @@ ul.no-bullet {list-style: none}
 <ul class="section-toc">
 <li><a href="#appendixsec" accesskey="1">appendixsec</a></li>
 </ul>
-<hr>
-<span id="appendixsec"></span><div class="header">
+</div><hr>
+<div class="appendixsec" id="appendixsec">
+<div class="header">
 <p>
  &nbsp; </p>
 </div>
 <h3 class="appendixsec">A.1 appendixsec</h3>
-<hr>
+</div><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 92948713c3..5a63f7d677 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
@@ -316,9 +316,12 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><span id="In-top-"></span><h1 class="top">In top </h1>
+<div class="top" id="Top">
+<div class="node" id="In-top-">
+<h1 class="top">In top </h1>
 
-<hr>
+</div><hr></div>
+</div>
 
 
 
diff --git a/tp/t/results/sectioning/shortcontents.pl b/tp/t/results/sectioning/shortcontents.pl
index 3a7934976b..f019f88419 100644
--- a/tp/t/results/sectioning/shortcontents.pl
+++ b/tp/t/results/sectioning/shortcontents.pl
@@ -797,7 +797,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="top"></span><h1 class="top">top</h1>
+<div class="top" id="top">
+<h1 class="top">top</h1>
 
 <span id="SEC_Overview"></span>
 <h2 class="shortcontents-heading">Short Table of Contents</h2>
@@ -817,24 +818,29 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 
-<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
+</div><div class="chapter" id="chapter">
+<h2 class="chapter">1 chapter</h2>
 
 <ul class="section-toc">
 <li><a href="#section" accesskey="1">section</a></li>
 </ul>
-<span id="section"></span><h3 class="section">1.1 section</h3>
+</div><div class="section" id="section">
+<h3 class="section">1.1 section</h3>
 
 <ul class="section-toc">
 <li><a href="#subsection" accesskey="1">subsection</a></li>
 </ul>
-<span id="subsection"></span><h4 class="subsection">1.1.1 subsection</h4>
+</div><div class="subsection" id="subsection">
+<h4 class="subsection">1.1.1 subsection</h4>
 
 <ul class="section-toc">
 <li><a href="#subsubsection" accesskey="1">subsubsection</a></li>
 </ul>
-<span id="subsubsection"></span><h4 class="subsubsection">1.1.1.1 subsubsection</h4>
+</div><div class="subsubsection" id="subsubsection">
+<h4 class="subsubsection">1.1.1.1 subsubsection</h4>
 
-<span id="part"></span><h1 class="part">part</h1>
+</div><div class="part" id="part">
+<h1 class="part">part</h1>
 <hr>
 
 <ul class="section-toc">
@@ -842,20 +848,25 @@ 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>
-<span id="chapter-in-part"></span><h2 class="chapter">2 chapter in part</h2>
+</div><div class="chapter" id="chapter-in-part">
+<h2 class="chapter">2 chapter in part</h2>
 
-<span id="second-chapter-in-part"></span><h2 class="chapter">3 second chapter in part</h2>
+</div><div class="chapter" id="second-chapter-in-part">
+<h2 class="chapter">3 second chapter in part</h2>
 
-<span id="unnumbered"></span><h2 class="unnumbered">unnumbered</h2>
+</div><div class="unnumbered" id="unnumbered">
+<h2 class="unnumbered">unnumbered</h2>
 
-<span id="appendix"></span><h2 class="appendix">Appendix A appendix</h2>
+</div><div class="appendix" id="appendix">
+<h2 class="appendix">Appendix A appendix</h2>
 
 <ul class="section-toc">
 <li><a href="#appendixsec" accesskey="1">appendixsec</a></li>
 </ul>
-<span id="appendixsec"></span><h3 class="appendixsec">A.1 appendixsec</h3>
+</div><div class="appendixsec" id="appendixsec">
+<h3 class="appendixsec">A.1 appendixsec</h3>
 
-<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 fd0f8cf3af..67461e7337 100644
--- a/tp/t/results/sectioning/space_in_node.pl
+++ b/tp/t/results/sectioning/space_in_node.pl
@@ -745,34 +745,38 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><div class="header">
+<div class="node" id="Top">
+<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>
 
 
-<hr>
-<span id="Chap-first-here"></span><div class="header">
+</div><hr>
+<div class="node" id="Chap-first-here">
+<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>
 
-<hr>
-<span id="Test-title"></span><div class="header">
+</div><hr>
+<div class="node" id="Test-title">
+<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>
 
-<hr>
-<span id="Last-with-spaces"></span><div class="header">
+</div><hr>
+<div class="node" id="Last-with-spaces">
+<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>
-<hr>
+</div><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 302af96ec9..0928c354ef 100644
--- a/tp/t/results/sectioning/top_no_argument_and_content.pl
+++ b/tp/t/results/sectioning/top_no_argument_and_content.pl
@@ -132,9 +132,10 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Top"></span>
+<div class="top" id="SEC_Top">
+
 <p>A.
-</p><hr>
+</p></div><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 ec12a4292e..6dfbb8e10d 100644
--- a/tp/t/results/sectioning/top_no_argument_and_node.pl
+++ b/tp/t/results/sectioning/top_no_argument_and_node.pl
@@ -209,7 +209,10 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="start"></span><span id="SEC_Top"></span><hr>
+<div class="top" id="start">
+<div class="node" id="SEC_Top">
+</div><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 3bec466532..614ba8098c 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
@@ -199,7 +199,10 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><span id="SEC_Top"></span><hr>
+<div class="top" id="Top">
+<div class="node" id="SEC_Top">
+</div><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 8f653edecf..4b3a57308d 100644
--- a/tp/t/results/sectioning/top_node_no_menu_direction.pl
+++ b/tp/t/results/sectioning/top_node_no_menu_direction.pl
@@ -546,20 +546,22 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="node" id="Top">
+<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>
 
 
-<hr>
-<span id="second-node"></span><div class="header">
+</div><hr>
+<div class="node" id="second-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>
 <h4 class="node-heading">second node</h4>
-<hr>
+</div><hr>
 
 
 
diff --git a/tp/t/results/sectioning/top_node_part_top.pl b/tp/t/results/sectioning/top_node_part_top.pl
index cab83a0b97..86128c58a9 100644
--- a/tp/t/results/sectioning/top_node_part_top.pl
+++ b/tp/t/results/sectioning/top_node_part_top.pl
@@ -365,13 +365,17 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span>
-<span id="part"></span><h1 class="part">part</h1>
-<hr>
+<div class="top" id="Top">
 
-<span id="top"></span><h1 class="top">top</h1>
+<div class="part" id="part">
+<h1 class="part">part</h1>
 <hr>
 
+</div><div class="node" id="top">
+<h1 class="top">top</h1>
+</div><hr></div>
+</div>
+
 
 
 </body>
diff --git a/tp/t/results/sectioning/top_node_up_url.pl b/tp/t/results/sectioning/top_node_up_url.pl
index 589ebb7f5a..1b7a70094d 100644
--- a/tp/t/results/sectioning/top_node_up_url.pl
+++ b/tp/t/results/sectioning/top_node_up_url.pl
@@ -569,20 +569,24 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#first" accesskey="n" rel="next">first</a>, Up: <a href="http://www.gnu.org/manual/" accesskey="u" rel="up">@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals</a> &nbsp; </p>
 </div>
-<span id="internal-top-node-up"></span><h1 class="top">internal top node up</h1>
+<div class="node" id="internal-top-node-up">
+<h1 class="top">internal top node up</h1>
 
 
-<hr>
-<span id="first"></span><div class="header">
+</div><hr>
+<div class="node" id="first">
+<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>
-<hr>
+</div><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 3bafe76f3c..f9b8bcd23c 100644
--- a/tp/t/results/sectioning/top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/top_without_node_nodes.pl
@@ -442,16 +442,20 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="top-section"></span><h1 class="top">top section</h1>
+<div class="top" id="top-section">
+<h1 class="top">top section</h1>
 <p>Top section
 </p>
 <ul class="section-toc">
 <li><a href="#second" accesskey="1">Chapter</a></li>
 </ul>
-<span id="second"></span><span id="Chapter"></span><h2 class="chapter">1 Chapter</h2>
+</div><div class="chapter" id="second">
+<div class="node" id="Chapter">
+<h2 class="chapter">1 Chapter</h2>
 
 <p>Text of chapter
-</p><hr>
+</p></div><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 bd0aa72cb5..d491bfc52a 100644
--- a/tp/t/results/sectioning/top_without_node_sections.pl
+++ b/tp/t/results/sectioning/top_without_node_sections.pl
@@ -490,16 +490,20 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="top-section"></span><h1 class="top">top section</h1>
+<div class="top" id="top-section">
+<h1 class="top">top section</h1>
 <p>Top section
 </p>
 <ul class="section-toc">
 <li><a href="#second" accesskey="1">Chapter</a></li>
 </ul>
-<span id="second"></span><span id="Chapter"></span><h2 class="chapter">1 Chapter</h2>
+</div><div class="chapter" id="second">
+<div class="node" id="Chapter">
+<h2 class="chapter">1 Chapter</h2>
 
 <p>Text of chapter
-</p><hr>
+</p></div><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 38fcd09e25..d9fa7d2a0a 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,19 +37,21 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="g_t_00e3"></span><div class="header">
+<div class="node" id="g_t_00e3">
+<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>
 
-<span id="g_t_00e2"></span><div class="header">
+</div><div class="node" id="g_t_00e2">
+<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 21cc50bf63..7d824456ae 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,7 +35,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="node" id="Top">
+<div class="header">
 <p>
 Next: <a href="a.html#g_t_00e3" accesskey="n" rel="next">&atilde;</a> &nbsp; </p>
 </div>
@@ -43,7 +44,7 @@ Next: <a href="a.html#g_t_00e3" accesskey="n" rel="next">&atilde;</a> &nbsp; </p
 <h1 class="node-heading">Top</h1>
 
 
-<hr>
+</div><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 4b27ce7bab..c513723063 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,14 +37,15 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="n"></span><div class="header">
+<div class="node" id="n">
+<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 5624e0bde3..422b7e24a1 100644
--- a/tp/t/results/sectioning/two_nodes_at_the_end.pl
+++ b/tp/t/results/sectioning/two_nodes_at_the_end.pl
@@ -1031,37 +1031,45 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#chapter-1" accesskey="n" rel="next">chapter c1</a> &nbsp; </p>
 </div>
-<span id="top"></span><h1 class="top">top</h1>
+<div class="node" id="top">
+<h1 class="top">top</h1>
 
 
 <ul class="section-toc">
 <li><a href="#chapter-1" accesskey="1">chapter c1</a></li>
 </ul>
-<hr>
-<span id="chapter-1"></span><div class="header">
+</div><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>
-<span id="chapter-c1"></span><h2 class="chapter">1 chapter c1</h2>
+<div class="node" id="chapter-c1">
+<h2 class="chapter">1 chapter c1</h2>
 
-<hr>
-<span id="node-after-chapter-1"></span><div class="header">
+</div><hr>
+<div class="node" id="node-after-chapter-1">
+<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>
 
-<hr>
-<span id="node-after-chapter-2"></span><div class="header">
+</div><hr>
+<div class="node" id="node-after-chapter-2">
+<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>
-<hr>
+</div><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 1f8605e63c..6b455b7812 100644
--- a/tp/t/results/sectioning/two_nodes_between_chapters.pl
+++ b/tp/t/results/sectioning/two_nodes_between_chapters.pl
@@ -1189,38 +1189,48 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<div class="header">
 <p>
 Next: <a href="#chapter-1" accesskey="n" rel="next">chapter c1</a> &nbsp; </p>
 </div>
-<span id="top"></span><h1 class="top">top</h1>
+<div class="node" id="top">
+<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>
-<hr>
-<span id="chapter-1"></span><div class="header">
+</div><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>
-<span id="chapter-c1"></span><h2 class="chapter">1 chapter c1</h2>
+<div class="node" id="chapter-c1">
+<h2 class="chapter">1 chapter c1</h2>
 
-<hr>
-<span id="node-between-chapters"></span><div class="header">
+</div><hr>
+<div class="node" id="node-between-chapters">
+<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>
 
-<hr>
-<span id="chapter-2"></span><div class="header">
+</div><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>
-<span id="chapter-c2"></span><h2 class="chapter">2 chapter c2</h2>
-<hr>
+<div class="node" id="chapter-c2">
+<h2 class="chapter">2 chapter c2</h2>
+</div><hr>
+</div>
+</div>
 
 
 
diff --git a/tp/t/results/sectioning/two_unnumbered_no_argument.pl b/tp/t/results/sectioning/two_unnumbered_no_argument.pl
index 98ff674dd7..1eb157d8a8 100644
--- a/tp/t/results/sectioning/two_unnumbered_no_argument.pl
+++ b/tp/t/results/sectioning/two_unnumbered_no_argument.pl
@@ -170,7 +170,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<hr>
+<hr></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 cb078c194e..97d8331ae4 100644
--- a/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
+++ b/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
@@ -425,13 +425,17 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="before-nodes"></span><h2 class="unnumbered">before nodes</h2>
+<div class="unnumbered" id="before-nodes">
+<h2 class="unnumbered">before nodes</h2>
 
 <p>in unnumbered
 </p>
-<span id="Top"></span><span id="top-section"></span><h2 class="unnumbered">top section</h2>
+</div><div class="top" id="Top">
+<div class="node" id="top-section">
+<h2 class="unnumbered">top section</h2>
 <p>Top node
-</p><hr>
+</p></div><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 b2d835bbbe..2b8c2b3b75 100644
--- a/tp/t/results/sectioning/unnumbered_before_top_node.pl
+++ b/tp/t/results/sectioning/unnumbered_before_top_node.pl
@@ -308,13 +308,15 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="before-nodes"></span><h2 class="unnumbered">before nodes</h2>
+<div class="unnumbered" id="before-nodes">
+<h2 class="unnumbered">before nodes</h2>
 
-<span id="Top"></span><h1 class="node-heading">Top</h1>
+</div><div class="node" id="Top">
+<h1 class="node-heading">Top</h1>
 <p>Top node
 </p>
 <h1 class="titlefont">Title titlefont</h1>
-<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 e7cae5c9bc..4f245e25c1 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
@@ -716,26 +716,33 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="a-node"></span><div class="header">
+<div class="unnumbered" id="a-node">
+<div class="header">
 <p>
 Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
 </div>
-<span id="unnumbered"></span><h2 class="unnumbered">unnumbered</h2>
+<div class="node" id="unnumbered">
+<h2 class="unnumbered">unnumbered</h2>
 
 <p>in unnumbered
 </p>
-<span id="top-section"></span><h2 class="unnumbered">top section</h2>
+</div><div class="top" id="top-section">
+<h2 class="unnumbered">top section</h2>
 <p>Top section
 </p>
-<hr>
-<span id="second"></span><div class="header">
+</div><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>
-<span id="Chapter"></span><h2 class="chapter">1 Chapter</h2>
+<div class="node" id="Chapter">
+<h2 class="chapter">1 Chapter</h2>
 
 <p>Text of chapter
-</p><hr>
+</p></div><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 dffd8c410c..8b2d9c689b 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
@@ -770,26 +770,33 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="a-node"></span><div class="header">
+<div class="unnumbered" id="a-node">
+<div class="header">
 <p>
 Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
 </div>
-<span id="unnumbered"></span><h2 class="unnumbered">unnumbered</h2>
+<div class="node" id="unnumbered">
+<h2 class="unnumbered">unnumbered</h2>
 
 <p>in unnumbered
 </p>
-<span id="top-section"></span><h2 class="unnumbered">top section</h2>
+</div><div class="top" id="top-section">
+<h2 class="unnumbered">top section</h2>
 <p>Top section
 </p>
-<hr>
-<span id="second"></span><div class="header">
+</div><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>
-<span id="Chapter"></span><h2 class="chapter">1 Chapter</h2>
+<div class="node" id="Chapter">
+<h2 class="chapter">1 Chapter</h2>
 
 <p>Text of chapter
-</p><hr>
+</p></div><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 81e96e035b..9fad0ed7f6 100644
--- a/tp/t/results/xtable/block_commands_in_table.pl
+++ b/tp/t/results/xtable/block_commands_in_table.pl
@@ -1724,7 +1724,9 @@ _second item_
 ';
 
 
-$result_converted{'html_text'}->{'block_commands_in_table'} = '<span id="Top"></span><span id="Element"></span><h1 class="top">Element</h1>
+$result_converted{'html_text'}->{'block_commands_in_table'} = '<div class="top" id="Top">
+<div class="node" id="Element">
+<h1 class="top">Element</h1>
 
 <dl compact="compact">
 <dt><span><em>first item</em></span></dt>
@@ -1786,7 +1788,7 @@ end example.
 </p></dd>
 </dl>
 <p>After table.
-</p><hr>
+</p></div><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 11c83acc06..3630ad9eb5 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
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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-1-node" title="Next section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -43,7 +44,8 @@ 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>
-<span id="top"></span><h1 class="top">top</h1>
+<div class="node" id="top">
+<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">
@@ -54,8 +56,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="part-1_003a-part-1"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr size="6">
+<div class="part" id="part-1_003a-part-1">
+<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>
@@ -73,10 +76,14 @@ ul.no-bullet {list-style: none}
 <h1 class="part">part 1: part 1</h1>
 <hr>
 
-<span id="chapter-1-node"></span><span id="chapter-1"></span><h1 class="chapter">1 chapter 1</h1>
+</div><div class="chapter" id="chapter-1-node">
+<div class="node" id="chapter-1">
+<h1 class="chapter">1 chapter 1</h1>
 
-<hr>
-<span id="chapter-2-node"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+</div>
+<div class="chapter" id="chapter-2-node">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#chapter-1-node" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter-1-node" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter-1-node" title="Up section"> Up </a>]</td>
@@ -91,10 +98,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>
-<span id="chapter-2"></span><h1 class="chapter">2 chapter 2</h1>
+<div class="node" id="chapter-2">
+<h1 class="chapter">2 chapter 2</h1>
 
-<hr>
-<span id="part2_003a-part2"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+<div class="part" id="part2_003a-part2">
+<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>
@@ -112,11 +121,16 @@ ul.no-bullet {list-style: none}
 <h1 class="part">part2: part2</h1>
 <hr>
 
-<span id="chapter-3-node"></span><span id="chapter-3"></span><h1 class="chapter">3 chapter 3</h1>
+</div></div>
+<div class="chapter" id="chapter-3-node">
+<div class="node" id="chapter-3">
+<h1 class="chapter">3 chapter 3</h1>
 
 
-<hr size="6">
-<span id="SEC_Contents"></span>
+</div><hr size="6">
+</div>
+</div>
+<div class="Contents_element" id="SEC_Contents">
 <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>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -139,8 +153,8 @@ ul.no-bullet {list-style: none}
 
 </ul>
 </div>
-<hr>
-<span id="SEC_Overview"></span>
+</div><hr>
+<div class="Overview_element" id="SEC_Overview">
 <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>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -161,8 +175,8 @@ ul.no-bullet {list-style: none}
 
 </ul>
 </div>
-<hr>
-<span id="SEC_About"></span>
+</div><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>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -271,7 +285,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/contents/res_parser/contents_at_begin/contents_at_begin.html b/tp/tests/contents/res_parser/contents_at_begin/contents_at_begin.html
index 36380ac935..d659748e24 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
@@ -36,7 +36,8 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -44,7 +45,8 @@ 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>
-<span id="Contents-at-beginning"></span><h1 class="top">Contents at beginning</h1>
+<div class="node" id="Contents-at-beginning">
+<h1 class="top">Contents at beginning</h1>
 
 <p>Content at the beginning.
 </p>
@@ -53,8 +55,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -69,12 +72,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>
-<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
+<div class="node" id="Chapter-1">
+<h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
-<hr size="6">
-<span id="SEC_Contents"></span>
+</div><hr size="6">
+</div>
+</div>
+<div class="Contents_element" id="SEC_Contents">
 <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>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -89,8 +95,8 @@ ul.no-bullet {list-style: none}
   <li><a id="toc-Chapter-1" href="#chapter">1 Chapter 1</a></li>
 </ul>
 </div>
-<hr>
-<span id="SEC_About"></span>
+</div><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>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -199,7 +205,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/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 cf9b425cd2..59c969c5d6 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
@@ -46,7 +46,8 @@ ul.no-bullet {list-style: none}
 </div>
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -54,7 +55,8 @@ 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>
-<span id="Contents-at-beginning"></span><h1 class="top">Contents at beginning</h1>
+<div class="node" id="Contents-at-beginning">
+<h1 class="top">Contents at beginning</h1>
 
 <p>Content at the beginning.
 </p>
@@ -63,8 +65,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -79,12 +82,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>
-<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
+<div class="node" id="Chapter-1">
+<h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
-<hr size="6">
-<span id="SEC_About"></span>
+</div><hr size="6">
+</div>
+</div>
+<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>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -193,7 +199,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/contents/res_parser/contents_at_end/contents_at_end.html b/tp/tests/contents/res_parser/contents_at_end/contents_at_end.html
index d14aef99cb..3775c81e16 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
@@ -36,7 +36,8 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -44,7 +45,8 @@ 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>
-<span id="Contents-at-end"></span><h1 class="top">Contents at end</h1>
+<div class="node" id="Contents-at-end">
+<h1 class="top">Contents at end</h1>
 
 <p>Content at end.
 </p>
@@ -53,8 +55,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -69,12 +72,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>
-<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
+<div class="node" id="Chapter-1">
+<h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
-<hr size="6">
-<span id="SEC_Contents"></span>
+</div><hr size="6">
+</div>
+</div>
+<div class="Contents_element" id="SEC_Contents">
 <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>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -89,8 +95,8 @@ ul.no-bullet {list-style: none}
   <li><a id="toc-Chapter-1" href="#chapter">1 Chapter 1</a></li>
 </ul>
 </div>
-<hr>
-<span id="SEC_About"></span>
+</div><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>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -199,7 +205,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/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 e40874bf41..25d1276f1b 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
@@ -36,7 +36,8 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -44,7 +45,8 @@ 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>
-<span id="Contents-at-end"></span><h1 class="top">Contents at end</h1>
+<div class="node" id="Contents-at-end">
+<h1 class="top">Contents at end</h1>
 
 <p>Content at end.
 </p>
@@ -53,8 +55,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -69,7 +72,8 @@ 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>
-<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
+<div class="node" id="Chapter-1">
+<h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
@@ -83,8 +87,10 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 
-<hr size="6">
-<span id="SEC_About"></span>
+</div><hr size="6">
+</div>
+</div>
+<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>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -193,7 +199,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/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 638f48c15c..45b26525d4 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
@@ -36,7 +36,8 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -44,7 +45,8 @@ 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>
-<span id="Contents-in-chapter"></span><h1 class="top">Contents in chapter</h1>
+<div class="node" id="Contents-in-chapter">
+<h1 class="top">Contents in chapter</h1>
 
 <p>Content in chapter.
 </p>
@@ -53,8 +55,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -69,7 +72,8 @@ 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>
-<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
+<div class="node" id="Chapter-1">
+<h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter with contents
 </p>
@@ -78,8 +82,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
-<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Up section"> Up </a>]</td>
@@ -94,12 +99,16 @@ 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>
-<span id="section-1"></span><h2 class="section">1.1 section</h2>
+<div class="node" id="section-1">
+<h2 class="section">1.1 section</h2>
 
 <p>Section.
 </p>
-<hr size="6">
-<span id="SEC_Contents"></span>
+</div><hr size="6">
+</div>
+</div>
+</div>
+<div class="Contents_element" id="SEC_Contents">
 <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>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -117,8 +126,8 @@ ul.no-bullet {list-style: none}
   </ul></li>
 </ul>
 </div>
-<hr>
-<span id="SEC_About"></span>
+</div><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>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -227,7 +236,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/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 9273fc100a..199306d72d 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
@@ -36,7 +36,8 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -44,7 +45,8 @@ 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>
-<span id="Contents-in-chapter"></span><h1 class="top">Contents in chapter</h1>
+<div class="node" id="Contents-in-chapter">
+<h1 class="top">Contents in chapter</h1>
 
 <p>Content in chapter.
 </p>
@@ -53,8 +55,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -69,7 +72,8 @@ 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>
-<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
+<div class="node" id="Chapter-1">
+<h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter with contents
 </p><span id="SEC_Contents"></span>
@@ -91,8 +95,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
-<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Up section"> Up </a>]</td>
@@ -107,12 +112,16 @@ 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>
-<span id="section-1"></span><h2 class="section">1.1 section</h2>
+<div class="node" id="section-1">
+<h2 class="section">1.1 section</h2>
 
 <p>Section.
 </p>
-<hr size="6">
-<span id="SEC_About"></span>
+</div><hr size="6">
+</div>
+</div>
+</div>
+<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>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -221,7 +230,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/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 be0d6976b4..ee2a7271e8 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
@@ -36,7 +36,8 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -44,7 +45,8 @@ 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>
-<span id="Contents-in-section"></span><h1 class="top">Contents in section</h1>
+<div class="node" id="Contents-in-section">
+<h1 class="top">Contents in section</h1>
 
 <p>Content in section.
 </p>
@@ -53,8 +55,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -69,7 +72,8 @@ 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>
-<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
+<div class="node" id="Chapter-1">
+<h1 class="chapter">1 Chapter 1</h1>
 
 
 <table class="menu" border="0" cellspacing="0">
@@ -79,8 +83,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
-<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Up section"> Up </a>]</td>
@@ -95,12 +100,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>
-<span id="section-1"></span><h2 class="section">1.1 section</h2>
+<div class="node" id="section-1">
+<h2 class="section">1.1 section</h2>
 
 <p>The section with contents
 </p>
-<hr>
-<span id="section1"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+</div>
+<div class="section" id="section1">
+<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="#section" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Up section"> Up </a>]</td>
@@ -115,12 +123,16 @@ 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>
-<span id="section-1-1"></span><h2 class="section">1.2 section 1</h2>
+<div class="node" id="section-1-1">
+<h2 class="section">1.2 section 1</h2>
 
 <p>Section 1.
 </p>
-<hr size="6">
-<span id="SEC_Contents"></span>
+</div><hr size="6">
+</div>
+</div>
+</div>
+<div class="Contents_element" id="SEC_Contents">
 <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>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -139,8 +151,8 @@ ul.no-bullet {list-style: none}
   </ul></li>
 </ul>
 </div>
-<hr>
-<span id="SEC_About"></span>
+</div><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>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -249,7 +261,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/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 a74bc217d8..31f894a861 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
@@ -36,7 +36,8 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -44,7 +45,8 @@ 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>
-<span id="Contents-in-section"></span><h1 class="top">Contents in section</h1>
+<div class="node" id="Contents-in-section">
+<h1 class="top">Contents in section</h1>
 
 <p>Content in section.
 </p>
@@ -53,8 +55,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -69,7 +72,8 @@ 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>
-<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
+<div class="node" id="Chapter-1">
+<h1 class="chapter">1 Chapter 1</h1>
 
 
 <table class="menu" border="0" cellspacing="0">
@@ -79,8 +83,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
-<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Up section"> Up </a>]</td>
@@ -95,7 +100,8 @@ 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>
-<span id="section-1"></span><h2 class="section">1.1 section</h2>
+<div class="node" id="section-1">
+<h2 class="section">1.1 section</h2>
 
 <p>The section with contents
 </p><span id="SEC_Contents"></span>
@@ -113,8 +119,10 @@ ul.no-bullet {list-style: none}
 </div>
 
 
-<hr>
-<span id="section1"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+</div>
+<div class="section" id="section1">
+<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="#section" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Up section"> Up </a>]</td>
@@ -129,12 +137,16 @@ 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>
-<span id="section-1-1"></span><h2 class="section">1.2 section 1</h2>
+<div class="node" id="section-1-1">
+<h2 class="section">1.2 section 1</h2>
 
 <p>Section 1.
 </p>
-<hr size="6">
-<span id="SEC_About"></span>
+</div><hr size="6">
+</div>
+</div>
+</div>
+<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>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -243,7 +255,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/contents/res_parser/double_contents/double_contents.html b/tp/tests/contents/res_parser/double_contents/double_contents.html
index eb837089b1..d9bde76d6a 100644
--- a/tp/tests/contents/res_parser/double_contents/double_contents.html
+++ b/tp/tests/contents/res_parser/double_contents/double_contents.html
@@ -36,7 +36,8 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -44,7 +45,8 @@ 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>
-<span id="Double-contents"></span><h1 class="top">Double contents</h1>
+<div class="node" id="Double-contents">
+<h1 class="top">Double contents</h1>
 
 <p>Double contents.
 </p>
@@ -53,8 +55,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -69,7 +72,8 @@ 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>
-<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
+<div class="node" id="Chapter-1">
+<h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
@@ -78,8 +82,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
-<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Up section"> Up </a>]</td>
@@ -94,10 +99,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>
-<span id="section-with-contents"></span><h2 class="section">1.1 section with contents</h2>
+<div class="node" id="section-with-contents">
+<h2 class="section">1.1 section with contents</h2>
 
-<hr size="6">
-<span id="SEC_Contents"></span>
+</div><hr size="6">
+</div>
+</div>
+</div>
+<div class="Contents_element" id="SEC_Contents">
 <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>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -115,8 +124,8 @@ ul.no-bullet {list-style: none}
   </ul></li>
 </ul>
 </div>
-<hr>
-<span id="SEC_About"></span>
+</div><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>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -225,7 +234,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/contents/res_parser/double_contents_after_title/double_contents.html b/tp/tests/contents/res_parser/double_contents_after_title/double_contents.html
index ab2767e845..32cf98d3bb 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
@@ -50,7 +50,8 @@ ul.no-bullet {list-style: none}
 <hr>
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -58,7 +59,8 @@ 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>
-<span id="Double-contents"></span><h1 class="top">Double contents</h1>
+<div class="node" id="Double-contents">
+<h1 class="top">Double contents</h1>
 
 <p>Double contents.
 </p>
@@ -67,8 +69,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -83,7 +86,8 @@ 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>
-<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
+<div class="node" id="Chapter-1">
+<h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
@@ -92,8 +96,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
-<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Up section"> Up </a>]</td>
@@ -108,10 +113,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>
-<span id="section-with-contents"></span><h2 class="section">1.1 section with contents</h2>
+<div class="node" id="section-with-contents">
+<h2 class="section">1.1 section with contents</h2>
 
-<hr size="6">
-<span id="SEC_About"></span>
+</div><hr size="6">
+</div>
+</div>
+</div>
+<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>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -220,7 +229,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/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 ab2767e845..32cf98d3bb 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
@@ -50,7 +50,8 @@ ul.no-bullet {list-style: none}
 <hr>
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -58,7 +59,8 @@ 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>
-<span id="Double-contents"></span><h1 class="top">Double contents</h1>
+<div class="node" id="Double-contents">
+<h1 class="top">Double contents</h1>
 
 <p>Double contents.
 </p>
@@ -67,8 +69,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -83,7 +86,8 @@ 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>
-<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
+<div class="node" id="Chapter-1">
+<h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
@@ -92,8 +96,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
-<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Up section"> Up </a>]</td>
@@ -108,10 +113,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>
-<span id="section-with-contents"></span><h2 class="section">1.1 section with contents</h2>
+<div class="node" id="section-with-contents">
+<h2 class="section">1.1 section with contents</h2>
 
-<hr size="6">
-<span id="SEC_About"></span>
+</div><hr size="6">
+</div>
+</div>
+</div>
+<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>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -220,7 +229,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/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 0714b3ebf7..1e1c5308fc 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="chapter">
+<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>
@@ -49,7 +50,8 @@ 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>
-<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
+<div class="node" id="Chapter-1">
+<h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
@@ -58,8 +60,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
-<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Up section"> Up </a>]</td>
@@ -74,9 +77,10 @@ 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>
-<span id="section-with-contents"></span><h2 class="section">1.1 section with contents</h2>
+<div class="node" id="section-with-contents">
+<h2 class="section">1.1 section with contents</h2>
 
-<hr>
+</div><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>
@@ -90,6 +94,8 @@ 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>
+</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/contents/res_parser/double_contents_after_title_book_chapter/double_contents_abt.html b/tp/tests/contents/res_parser/double_contents_after_title_book_chapter/double_contents_abt.html
index 5de87a65a4..884d6232b0 100644
--- a/tp/tests/contents/res_parser/double_contents_after_title_book_chapter/double_contents_abt.html
+++ b/tp/tests/contents/res_parser/double_contents_after_title_book_chapter/double_contents_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -143,7 +143,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/tests/contents/res_parser/double_contents_after_title_book_chapter/index.html b/tp/tests/contents/res_parser/double_contents_after_title_book_chapter/index.html
index a67c1d149f..196e934ccd 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
@@ -50,7 +50,8 @@ ul.no-bullet {list-style: none}
 <hr>
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -58,7 +59,8 @@ 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>
-<span id="Double-contents"></span><h1 class="top">Double contents</h1>
+<div class="node" id="Double-contents">
+<h1 class="top">Double contents</h1>
 
 <p>Double contents.
 </p>
@@ -67,7 +69,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
+</div><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>
@@ -76,6 +78,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>
 <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/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 c4d2542088..449a61fd26 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
@@ -38,12 +38,14 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="chapter"></span><div class="header">
+<div class="chapter" id="chapter">
+<div class="header">
 <p>
 Previous: <a href="index.html" accesskey="p" rel="prev">Double contents</a>, Up: <a href="index.html" accesskey="u" rel="up">Double contents</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
 <hr>
-<span id="Chapter-1"></span><h2 class="chapter">1 Chapter 1</h2>
+<div class="node" id="Chapter-1">
+<h2 class="chapter">1 Chapter 1</h2>
 
 <p>The chapter
 </p>
@@ -51,6 +53,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>
 
 
 
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 1c7ab2247a..77e5ae2933 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
@@ -53,12 +53,14 @@ ul.no-bullet {list-style: none}
 <hr>
 
 
-<span id="Top"></span><div class="header">
+<div class="top" id="Top">
+<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>
 </div>
 <hr>
-<span id="Double-contents"></span><h1 class="top">Double contents</h1>
+<div class="node" id="Double-contents">
+<h1 class="top">Double contents</h1>
 
 <p>Double contents.
 </p>
@@ -66,11 +68,12 @@ 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>
-<hr>
+</div><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>
 </div>
+</div>
 
 
 
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 ff1739eeaa..5c2734ab89 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
@@ -37,13 +37,16 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="section"></span><div class="header">
+<div class="section" id="section">
+<div class="header">
 <p>
 Up: <a href="chapter.html" accesskey="u" rel="up">Chapter 1</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
 <hr>
-<span id="section-with-contents"></span><h3 class="section">1.1 section with contents</h3>
+<div class="node" id="section-with-contents">
+<h3 class="section">1.1 section with contents</h3>
 
+</div></div>
 
 
 
diff --git a/tp/tests/contents/res_parser/double_contents_book/double_contents.html b/tp/tests/contents/res_parser/double_contents_book/double_contents.html
index 0bd0d9eb6f..6149c3081b 100644
--- a/tp/tests/contents/res_parser/double_contents_book/double_contents.html
+++ b/tp/tests/contents/res_parser/double_contents_book/double_contents.html
@@ -123,7 +123,7 @@ ul.no-bullet {list-style: none}
 
 
 <hr>
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
 <td valign="middle" align="left">[Index]</td>
@@ -207,7 +207,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/contents/res_parser/double_contents_chapter/chapter.html b/tp/tests/contents/res_parser/double_contents_chapter/chapter.html
index 063023e776..89d1d8b6e4 100644
--- a/tp/tests/contents/res_parser/double_contents_chapter/chapter.html
+++ b/tp/tests/contents/res_parser/double_contents_chapter/chapter.html
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="chapter">
+<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>
@@ -49,7 +50,8 @@ 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>
-<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
+<div class="node" id="Chapter-1">
+<h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
@@ -58,8 +60,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
-<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Up section"> Up </a>]</td>
@@ -74,9 +77,10 @@ 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>
-<span id="section-with-contents"></span><h2 class="section">1.1 section with contents</h2>
+<div class="node" id="section-with-contents">
+<h2 class="section">1.1 section with contents</h2>
 
-<hr>
+</div><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>
@@ -90,6 +94,8 @@ 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>
+</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/contents/res_parser/double_contents_chapter/double_contents_abt.html b/tp/tests/contents/res_parser/double_contents_chapter/double_contents_abt.html
index 1f5bc2f5b9..302513fe44 100644
--- a/tp/tests/contents/res_parser/double_contents_chapter/double_contents_abt.html
+++ b/tp/tests/contents/res_parser/double_contents_chapter/double_contents_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="double_contents_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -143,7 +143,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="double_contents_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/tests/contents/res_parser/double_contents_chapter/double_contents_toc.html b/tp/tests/contents/res_parser/double_contents_chapter/double_contents_toc.html
index 5f5f9ebf2f..be5a22a872 100644
--- a/tp/tests/contents/res_parser/double_contents_chapter/double_contents_toc.html
+++ b/tp/tests/contents/res_parser/double_contents_chapter/double_contents_toc.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -52,7 +52,7 @@ ul.no-bullet {list-style: none}
   </ul></li>
 </ul>
 </div>
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/tests/contents/res_parser/double_contents_chapter/index.html b/tp/tests/contents/res_parser/double_contents_chapter/index.html
index 4d0f066bd5..2be7f20d19 100644
--- a/tp/tests/contents/res_parser/double_contents_chapter/index.html
+++ b/tp/tests/contents/res_parser/double_contents_chapter/index.html
@@ -36,7 +36,8 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -44,7 +45,8 @@ 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>
-<span id="Double-contents"></span><h1 class="top">Double contents</h1>
+<div class="node" id="Double-contents">
+<h1 class="top">Double contents</h1>
 
 <p>Double contents.
 </p>
@@ -53,7 +55,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
+</div><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>
@@ -62,6 +64,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>
 <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/contents/res_parser/double_contents_inline/double_contents.html b/tp/tests/contents/res_parser/double_contents_inline/double_contents.html
index fddd153e31..7917ed5b91 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
@@ -49,7 +49,8 @@ ul.no-bullet {list-style: none}
 </div>
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -57,7 +58,8 @@ 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>
-<span id="Double-contents"></span><h1 class="top">Double contents</h1>
+<div class="node" id="Double-contents">
+<h1 class="top">Double contents</h1>
 
 <p>Double contents.
 </p>
@@ -66,8 +68,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -82,7 +85,8 @@ 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>
-<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
+<div class="node" id="Chapter-1">
+<h1 class="chapter">1 Chapter 1</h1>
 
 <span id="SEC_Contents"></span>
 <h1 class="contents-heading">Table of Contents</h1>
@@ -104,8 +108,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
-<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Up section"> Up </a>]</td>
@@ -120,7 +125,8 @@ 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>
-<span id="section-with-contents"></span><h2 class="section">1.1 section with contents</h2>
+<div class="node" id="section-with-contents">
+<h2 class="section">1.1 section with contents</h2>
 <span id="SEC_Contents"></span>
 <h1 class="contents-heading">Table of Contents</h1>
 
@@ -135,8 +141,11 @@ ul.no-bullet {list-style: none}
 </div>
 
 
-<hr size="6">
-<span id="SEC_About"></span>
+</div><hr size="6">
+</div>
+</div>
+</div>
+<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>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -245,7 +254,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/contents/res_parser/double_contents_inline_chapter/chapter.html b/tp/tests/contents/res_parser/double_contents_inline_chapter/chapter.html
index 980fe337ad..47dae13c6b 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="chapter">
+<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>
@@ -49,7 +50,8 @@ 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>
-<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
+<div class="node" id="Chapter-1">
+<h1 class="chapter">1 Chapter 1</h1>
 
 <span id="SEC_Contents"></span>
 <h1 class="contents-heading">Table of Contents</h1>
@@ -71,8 +73,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
-<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#chapter" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter" title="Up section"> Up </a>]</td>
@@ -87,7 +90,8 @@ 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>
-<span id="section-with-contents"></span><h2 class="section">1.1 section with contents</h2>
+<div class="node" id="section-with-contents">
+<h2 class="section">1.1 section with contents</h2>
 <span id="SEC_Contents"></span>
 <h1 class="contents-heading">Table of Contents</h1>
 
@@ -102,7 +106,7 @@ ul.no-bullet {list-style: none}
 </div>
 
 
-<hr>
+</div><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>
@@ -116,6 +120,8 @@ 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>
+</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/contents/res_parser/double_contents_inline_chapter/double_contents_abt.html b/tp/tests/contents/res_parser/double_contents_inline_chapter/double_contents_abt.html
index 5de87a65a4..884d6232b0 100644
--- a/tp/tests/contents/res_parser/double_contents_inline_chapter/double_contents_abt.html
+++ b/tp/tests/contents/res_parser/double_contents_inline_chapter/double_contents_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -143,7 +143,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/tests/contents/res_parser/double_contents_inline_chapter/index.html b/tp/tests/contents/res_parser/double_contents_inline_chapter/index.html
index a1b863cec8..44b59851e9 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
@@ -49,7 +49,8 @@ ul.no-bullet {list-style: none}
 </div>
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -57,7 +58,8 @@ 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>
-<span id="Double-contents"></span><h1 class="top">Double contents</h1>
+<div class="node" id="Double-contents">
+<h1 class="top">Double contents</h1>
 
 <p>Double contents.
 </p>
@@ -66,7 +68,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
+</div><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>
@@ -75,6 +77,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>
 <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/contents/res_parser/double_contents_inline_nodes/chapter.html b/tp/tests/contents/res_parser/double_contents_inline_nodes/chapter.html
index d8a4c3d261..9ef22d7063 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="chapter">
+<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>
@@ -50,7 +51,8 @@ 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>
-<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
+<div class="node" id="Chapter-1">
+<h1 class="chapter">1 Chapter 1</h1>
 
 <span id="SEC_Contents"></span>
 <h1 class="contents-heading">Table of Contents</h1>
@@ -72,7 +74,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<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/contents/res_parser/double_contents_inline_nodes/double_contents_abt.html b/tp/tests/contents/res_parser/double_contents_inline_nodes/double_contents_abt.html
index 78530d1a6a..135011220c 100644
--- a/tp/tests/contents/res_parser/double_contents_inline_nodes/double_contents_abt.html
+++ b/tp/tests/contents/res_parser/double_contents_inline_nodes/double_contents_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -144,7 +144,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/tests/contents/res_parser/double_contents_inline_nodes/index.html b/tp/tests/contents/res_parser/double_contents_inline_nodes/index.html
index 594db8a546..8ccbbfd157 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
@@ -49,7 +49,8 @@ ul.no-bullet {list-style: none}
 </div>
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -58,7 +59,8 @@ 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>
-<span id="Double-contents"></span><h1 class="top">Double contents</h1>
+<div class="node" id="Double-contents">
+<h1 class="top">Double contents</h1>
 
 <p>Double contents.
 </p>
@@ -67,7 +69,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
+</div><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>
@@ -76,6 +78,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>
 <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/contents/res_parser/double_contents_inline_nodes/section.html b/tp/tests/contents/res_parser/double_contents_inline_nodes/section.html
index f4041f30a9..b28bdead3c 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<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>
 <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>
@@ -50,7 +51,8 @@ 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>
-<span id="section-with-contents"></span><h2 class="section">1.1 section with contents</h2>
+<div class="node" id="section-with-contents">
+<h2 class="section">1.1 section with contents</h2>
 <span id="SEC_Contents"></span>
 <h1 class="contents-heading">Table of Contents</h1>
 
@@ -65,7 +67,8 @@ ul.no-bullet {list-style: none}
 </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/contents/res_parser/double_contents_inline_section/chapter.html b/tp/tests/contents/res_parser/double_contents_inline_section/chapter.html
index de994dbb41..f5babee67b 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="chapter">
+<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>
@@ -49,7 +50,8 @@ 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>
-<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
+<div class="node" id="Chapter-1">
+<h1 class="chapter">1 Chapter 1</h1>
 
 <span id="SEC_Contents"></span>
 <h1 class="contents-heading">Table of Contents</h1>
@@ -71,7 +73,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
+</div><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>
@@ -79,6 +81,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="section.html" title="Next section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
 </tr></table>
+</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/contents/res_parser/double_contents_inline_section/double_contents_abt.html b/tp/tests/contents/res_parser/double_contents_inline_section/double_contents_abt.html
index 5de87a65a4..884d6232b0 100644
--- a/tp/tests/contents/res_parser/double_contents_inline_section/double_contents_abt.html
+++ b/tp/tests/contents/res_parser/double_contents_inline_section/double_contents_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -143,7 +143,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index.html#SEC_Contents" title="Table of contents">Contents</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 5ea632c68a..c535eae84e 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
@@ -49,7 +49,8 @@ ul.no-bullet {list-style: none}
 </div>
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -57,7 +58,8 @@ 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>
-<span id="Double-contents"></span><h1 class="top">Double contents</h1>
+<div class="node" id="Double-contents">
+<h1 class="top">Double contents</h1>
 
 <p>Double contents.
 </p>
@@ -66,7 +68,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
+</div><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>
@@ -75,6 +77,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>
 <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/contents/res_parser/double_contents_inline_section/section.html b/tp/tests/contents/res_parser/double_contents_inline_section/section.html
index 83a0853928..8530d3897a 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<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>
 <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>
@@ -49,7 +50,8 @@ 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>
-<span id="section-with-contents"></span><h2 class="section">1.1 section with contents</h2>
+<div class="node" id="section-with-contents">
+<h2 class="section">1.1 section with contents</h2>
 <span id="SEC_Contents"></span>
 <h1 class="contents-heading">Table of Contents</h1>
 
@@ -64,7 +66,7 @@ ul.no-bullet {list-style: none}
 </div>
 
 
-<hr>
+</div><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>
@@ -72,6 +74,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[ &gt; ]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
 </tr></table>
+</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/contents/res_parser/double_contents_nodes/chapter.html b/tp/tests/contents/res_parser/double_contents_nodes/chapter.html
index 38d6bcffbf..3bc498febb 100644
--- a/tp/tests/contents/res_parser/double_contents_nodes/chapter.html
+++ b/tp/tests/contents/res_parser/double_contents_nodes/chapter.html
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="chapter">
+<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>
@@ -50,7 +51,8 @@ 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>
-<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
+<div class="node" id="Chapter-1">
+<h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
@@ -59,7 +61,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<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/contents/res_parser/double_contents_nodes/double_contents_abt.html b/tp/tests/contents/res_parser/double_contents_nodes/double_contents_abt.html
index b7247a8e55..628482350f 100644
--- a/tp/tests/contents/res_parser/double_contents_nodes/double_contents_abt.html
+++ b/tp/tests/contents/res_parser/double_contents_nodes/double_contents_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="double_contents_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -144,7 +144,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="double_contents_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/tests/contents/res_parser/double_contents_nodes/double_contents_toc.html b/tp/tests/contents/res_parser/double_contents_nodes/double_contents_toc.html
index 172d051435..cdd9498bbe 100644
--- a/tp/tests/contents/res_parser/double_contents_nodes/double_contents_toc.html
+++ b/tp/tests/contents/res_parser/double_contents_nodes/double_contents_toc.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -53,7 +53,7 @@ ul.no-bullet {list-style: none}
   </ul></li>
 </ul>
 </div>
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/tests/contents/res_parser/double_contents_nodes/index.html b/tp/tests/contents/res_parser/double_contents_nodes/index.html
index 264b7fc7af..e62b3a027d 100644
--- a/tp/tests/contents/res_parser/double_contents_nodes/index.html
+++ b/tp/tests/contents/res_parser/double_contents_nodes/index.html
@@ -36,7 +36,8 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -45,7 +46,8 @@ 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>
-<span id="Double-contents"></span><h1 class="top">Double contents</h1>
+<div class="node" id="Double-contents">
+<h1 class="top">Double contents</h1>
 
 <p>Double contents.
 </p>
@@ -54,7 +56,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
+</div><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>
@@ -63,6 +65,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>
 <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/contents/res_parser/double_contents_nodes/section.html b/tp/tests/contents/res_parser/double_contents_nodes/section.html
index 66500659e0..873b9f8d86 100644
--- a/tp/tests/contents/res_parser/double_contents_nodes/section.html
+++ b/tp/tests/contents/res_parser/double_contents_nodes/section.html
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<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>
 <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>
@@ -50,9 +51,11 @@ 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>
-<span id="section-with-contents"></span><h2 class="section">1.1 section with contents</h2>
+<div class="node" id="section-with-contents">
+<h2 class="section">1.1 section with contents</h2>
 
-<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/contents/res_parser/double_contents_section/chapter.html b/tp/tests/contents/res_parser/double_contents_section/chapter.html
index d57f729eb1..e84d60863f 100644
--- a/tp/tests/contents/res_parser/double_contents_section/chapter.html
+++ b/tp/tests/contents/res_parser/double_contents_section/chapter.html
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="chapter">
+<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>
@@ -49,7 +50,8 @@ 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>
-<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
+<div class="node" id="Chapter-1">
+<h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
@@ -58,7 +60,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
+</div><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>
@@ -66,6 +68,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="section.html" title="Next section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
 </tr></table>
+</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/contents/res_parser/double_contents_section/double_contents_abt.html b/tp/tests/contents/res_parser/double_contents_section/double_contents_abt.html
index 1f5bc2f5b9..302513fe44 100644
--- a/tp/tests/contents/res_parser/double_contents_section/double_contents_abt.html
+++ b/tp/tests/contents/res_parser/double_contents_section/double_contents_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="double_contents_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -143,7 +143,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="double_contents_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/tests/contents/res_parser/double_contents_section/double_contents_toc.html b/tp/tests/contents/res_parser/double_contents_section/double_contents_toc.html
index de6566c584..041d5e31da 100644
--- a/tp/tests/contents/res_parser/double_contents_section/double_contents_toc.html
+++ b/tp/tests/contents/res_parser/double_contents_section/double_contents_toc.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -52,7 +52,7 @@ ul.no-bullet {list-style: none}
   </ul></li>
 </ul>
 </div>
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</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 a33d1aa2c5..fde9ddfcf3 100644
--- a/tp/tests/contents/res_parser/double_contents_section/index.html
+++ b/tp/tests/contents/res_parser/double_contents_section/index.html
@@ -36,7 +36,8 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -44,7 +45,8 @@ 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>
-<span id="Double-contents"></span><h1 class="top">Double contents</h1>
+<div class="node" id="Double-contents">
+<h1 class="top">Double contents</h1>
 
 <p>Double contents.
 </p>
@@ -53,7 +55,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
+</div><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>
@@ -62,6 +64,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>
 <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/contents/res_parser/double_contents_section/section.html b/tp/tests/contents/res_parser/double_contents_section/section.html
index c4f0dc1b0d..74070c12e8 100644
--- a/tp/tests/contents/res_parser/double_contents_section/section.html
+++ b/tp/tests/contents/res_parser/double_contents_section/section.html
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<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>
 <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>
@@ -49,9 +50,10 @@ 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>
-<span id="section-with-contents"></span><h2 class="section">1.1 section with contents</h2>
+<div class="node" id="section-with-contents">
+<h2 class="section">1.1 section with contents</h2>
 
-<hr>
+</div><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>
@@ -59,6 +61,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[ &gt; ]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
 </tr></table>
+</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/contents/res_parser/no_content/no_content.html b/tp/tests/contents/res_parser/no_content/no_content.html
index 885585fc98..6ffa4efd60 100644
--- a/tp/tests/contents/res_parser/no_content/no_content.html
+++ b/tp/tests/contents/res_parser/no_content/no_content.html
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -43,7 +44,8 @@ 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>
-<span id="No-ccontent"></span><h1 class="top">No ccontent</h1>
+<div class="node" id="No-ccontent">
+<h1 class="top">No ccontent</h1>
 
 <p>No content.
 </p>
@@ -52,8 +54,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -68,12 +71,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>
-<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
+<div class="node" id="Chapter-1">
+<h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
-<hr size="6">
-<span id="SEC_About"></span>
+</div><hr size="6">
+</div>
+</div>
+<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>
 <td valign="middle" align="left">[Contents]</td>
@@ -182,7 +188,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/contents/res_parser/no_content_do_contents/no_content.html b/tp/tests/contents/res_parser/no_content_do_contents/no_content.html
index bc978c38bb..b4f22e0e6e 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
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -43,7 +44,8 @@ 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>
-<span id="No-ccontent"></span><h1 class="top">No ccontent</h1>
+<div class="node" id="No-ccontent">
+<h1 class="top">No ccontent</h1>
 
 <p>No content.
 </p>
@@ -52,8 +54,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -68,12 +71,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>
-<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
+<div class="node" id="Chapter-1">
+<h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
-<hr size="6">
-<span id="SEC_Contents"></span>
+</div><hr size="6">
+</div>
+</div>
+<div class="Contents_element" id="SEC_Contents">
 <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>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -88,8 +94,8 @@ ul.no-bullet {list-style: none}
   <li><a id="toc-Chapter-1" href="#chapter">1 Chapter 1</a></li>
 </ul>
 </div>
-<hr>
-<span id="SEC_About"></span>
+</div><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>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -198,7 +204,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/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 885585fc98..6ffa4efd60 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
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -43,7 +44,8 @@ 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>
-<span id="No-ccontent"></span><h1 class="top">No ccontent</h1>
+<div class="node" id="No-ccontent">
+<h1 class="top">No ccontent</h1>
 
 <p>No content.
 </p>
@@ -52,8 +54,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -68,12 +71,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>
-<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
+<div class="node" id="Chapter-1">
+<h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
-<hr size="6">
-<span id="SEC_About"></span>
+</div><hr size="6">
+</div>
+</div>
+<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>
 <td valign="middle" align="left">[Contents]</td>
@@ -182,7 +188,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/contents/res_parser/no_content_inline/no_content.html b/tp/tests/contents/res_parser/no_content_inline/no_content.html
index 885585fc98..6ffa4efd60 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
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -43,7 +44,8 @@ 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>
-<span id="No-ccontent"></span><h1 class="top">No ccontent</h1>
+<div class="node" id="No-ccontent">
+<h1 class="top">No ccontent</h1>
 
 <p>No content.
 </p>
@@ -52,8 +54,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -68,12 +71,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>
-<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
+<div class="node" id="Chapter-1">
+<h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
-<hr size="6">
-<span id="SEC_About"></span>
+</div><hr size="6">
+</div>
+</div>
+<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>
 <td valign="middle" align="left">[Contents]</td>
@@ -182,7 +188,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/contents/res_parser/no_content_setcatpage/no_content_setcatpage.html b/tp/tests/contents/res_parser/no_content_setcatpage/no_content_setcatpage.html
index 885585fc98..6ffa4efd60 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
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -43,7 +44,8 @@ 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>
-<span id="No-ccontent"></span><h1 class="top">No ccontent</h1>
+<div class="node" id="No-ccontent">
+<h1 class="top">No ccontent</h1>
 
 <p>No content.
 </p>
@@ -52,8 +54,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -68,12 +71,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>
-<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
+<div class="node" id="Chapter-1">
+<h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
-<hr size="6">
-<span id="SEC_About"></span>
+</div><hr size="6">
+</div>
+</div>
+<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>
 <td valign="middle" align="left">[Contents]</td>
@@ -182,7 +188,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/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 bc978c38bb..b4f22e0e6e 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
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -43,7 +44,8 @@ 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>
-<span id="No-ccontent"></span><h1 class="top">No ccontent</h1>
+<div class="node" id="No-ccontent">
+<h1 class="top">No ccontent</h1>
 
 <p>No content.
 </p>
@@ -52,8 +54,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -68,12 +71,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>
-<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
+<div class="node" id="Chapter-1">
+<h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
-<hr size="6">
-<span id="SEC_Contents"></span>
+</div><hr size="6">
+</div>
+</div>
+<div class="Contents_element" id="SEC_Contents">
 <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>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -88,8 +94,8 @@ ul.no-bullet {list-style: none}
   <li><a id="toc-Chapter-1" href="#chapter">1 Chapter 1</a></li>
 </ul>
 </div>
-<hr>
-<span id="SEC_About"></span>
+</div><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>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -198,7 +204,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/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 885585fc98..6ffa4efd60 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
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -43,7 +44,8 @@ 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>
-<span id="No-ccontent"></span><h1 class="top">No ccontent</h1>
+<div class="node" id="No-ccontent">
+<h1 class="top">No ccontent</h1>
 
 <p>No content.
 </p>
@@ -52,8 +54,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -68,12 +71,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>
-<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
+<div class="node" id="Chapter-1">
+<h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
-<hr size="6">
-<span id="SEC_About"></span>
+</div><hr size="6">
+</div>
+</div>
+<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>
 <td valign="middle" align="left">[Contents]</td>
@@ -182,7 +188,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/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 885585fc98..6ffa4efd60 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
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -43,7 +44,8 @@ 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>
-<span id="No-ccontent"></span><h1 class="top">No ccontent</h1>
+<div class="node" id="No-ccontent">
+<h1 class="top">No ccontent</h1>
 
 <p>No content.
 </p>
@@ -52,8 +54,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -68,12 +71,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>
-<span id="Chapter-1"></span><h1 class="chapter">1 Chapter 1</h1>
+<div class="node" id="Chapter-1">
+<h1 class="chapter">1 Chapter 1</h1>
 
 <p>The chapter
 </p>
-<hr size="6">
-<span id="SEC_About"></span>
+</div><hr size="6">
+</div>
+</div>
+<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>
 <td valign="middle" align="left">[Contents]</td>
@@ -182,7 +188,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/formatting/res_parser/simplest_test_css/simplest.html b/tp/tests/formatting/res_parser/simplest_test_css/simplest.html
index 3897439738..ddb3d84979 100644
--- a/tp/tests/formatting/res_parser/simplest_test_css/simplest.html
+++ b/tp/tests/formatting/res_parser/simplest_test_css/simplest.html
@@ -47,10 +47,11 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span>
+<div class="node" id="Top">
+
 <p>This is a very simple texi manual &nbsp; &lt;&gt;.
 </p>
-<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 8157f9c338..7e1a63f747 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
@@ -35,13 +35,16 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><span id="Test-need"></span><h1 class="top">Test need</h1>
+<div class="top" id="Top">
+<div class="node" id="Test-need">
+<h1 class="top">Test need</h1>
 
 <p>@need <!-- need: 0.1 on line following -->
 @need <!-- need: 0.1 -->
 </p>
 
-<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>.
 </font></p>
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 ce83b63363..4f581f30c0 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
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#index-node" title="Next section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -43,7 +44,8 @@ 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>
-<span id="Test-index-entry-with-node-name-clash"></span><h1 class="top">Test index entry with node name clash</h1>
+<div class="node" id="Test-index-entry-with-node-name-clash">
+<h1 class="top">Test index entry with node name clash</h1>
 
 <p>Text.
 </p>
@@ -54,8 +56,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="index-node"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -70,7 +73,8 @@ 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>
-<span id="index-node-1"></span><h1 class="chapter">1 index node</h1>
+<div class="node" id="index-node-1">
+<h1 class="chapter">1 index node</h1>
 
 <p>in index node node, with the same (croo_ref) name than index entry.
 </p>
@@ -88,8 +92,10 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<hr size="6">
-<span id="SEC_About"></span>
+</div><hr size="6">
+</div>
+</div>
+<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>
 <td valign="middle" align="left">[Contents]</td>
@@ -198,7 +204,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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_entry_in_footnote/index_entry_in_footnote.html b/tp/tests/indices/res_parser/index_entry_in_footnote/index_entry_in_footnote.html
index 2e2ded63d7..d41a3ecd25 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
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[ &lt; ]</td>
 <td valign="middle" align="left">[<a href="#Index" title="Next section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -43,7 +44,8 @@ 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>
-<span id="index_005fentry_005fin_005ffootnote"></span><h1 class="top">index_entry_in_footnote</h1>
+<div class="node" id="index_005fentry_005fin_005ffootnote">
+<h1 class="top">index_entry_in_footnote</h1>
 
 <p>Top node<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
 </p>
@@ -52,8 +54,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr size="6">
-<span id="Index"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <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>
@@ -68,7 +71,8 @@ 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>
-<span id="index"></span><h1 class="appendix">Appendix A index</h1>
+<div class="node" id="index">
+<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; 
@@ -84,8 +88,10 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<hr size="6">
-<span id="SEC_Foot"></span>
+</div><hr size="6">
+</div>
+</div>
+<div class="Footnotes_element" id="SEC_Foot">
 <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>
 <td valign="middle" align="left">[Contents]</td>
@@ -100,8 +106,8 @@ ul.no-bullet {list-style: none}
 <p>Another para in footnote.
 <span id="index-index-entry-in-footnote"></span>
 </p>
-<hr>
-<span id="SEC_About"></span>
+</div><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>
 <td valign="middle" align="left">[Contents]</td>
@@ -210,7 +216,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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_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 c424903f65..c6434c94a1 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,7 +83,8 @@ ul.no-bullet {list-style: none}
 </td></tr></table>
 
 
-<span id="unnumbered"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="unnumbered" id="unnumbered">
+<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>
@@ -149,8 +150,9 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<hr>
-<span id="top-_0028chapter_0029-section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+<div class="unnumbered" id="top-_0028chapter_0029-section">
+<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>
@@ -223,8 +225,9 @@ ul.no-bullet {list-style: none}
 <span id="index-top-section1"></span>
 
 
-<hr>
-<span id="second"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+<div class="section" id="second">
+<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>
@@ -333,8 +336,9 @@ ul.no-bullet {list-style: none}
 <a class="summary-letter" href="#second_cp_letter-U"><b>U</b></a>
  &nbsp; 
 </td></tr></table>
-<hr>
-<span id="Chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+<div class="chapter" id="Chapter">
+<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>
@@ -399,8 +403,9 @@ ul.no-bullet {list-style: none}
 <p>Text of chapter
 <span id="index-Chapter2"></span>
 </p>
-<hr>
-<span id="Chapter-2"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+<div class="chapter" id="Chapter-2">
+<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>
@@ -419,8 +424,8 @@ ul.no-bullet {list-style: none}
 
 <p>In chapter 2
 </p>
-<hr size="6">
-<span id="SEC_About"></span>
+</div><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>
 <td valign="middle" align="left">[Contents]</td>
@@ -529,7 +534,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><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/index_nodes.html b/tp/tests/indices/res_parser/index_nodes/index_nodes.html
index c37a4423b4..96f9bc224a 100644
--- a/tp/tests/indices/res_parser/index_nodes/index_nodes.html
+++ b/tp/tests/indices/res_parser/index_nodes/index_nodes.html
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><span id="index-entry-a"></span>
+<div class="node" id="Top">
+<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; 
@@ -154,7 +155,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<span id="first"></span><p>Text and then index entries
+</div><div class="node" id="first">
+<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>
@@ -206,7 +208,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<span id="second"></span><table class="menu" border="0" cellspacing="0">
+</div><div class="node" id="second">
+<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">
@@ -241,12 +244,14 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<span id="another"></span>
+</div><div class="node" id="another">
+
 <span id="index-something"></span>
 <span id="index-somewhere"></span>
 <span id="index-another"></span>
 
-<span id="a-node"></span><span id="index-entry-after-printindex"></span>
+</div><div class="node" id="a-node">
+<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; 
@@ -333,7 +338,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<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 09e1bfa7f6..14652d4205 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,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="a-node"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="a-node">
+<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>
@@ -138,7 +139,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<hr>
+</div><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 7dcd582940..84ce2623b6 100644
--- a/tp/tests/indices/res_parser/index_nodes_nodes/another.html
+++ b/tp/tests/indices/res_parser/index_nodes_nodes/another.html
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="another"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="another">
+<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>
@@ -56,7 +57,7 @@ ul.no-bullet {list-style: none}
 <span id="index-somewhere"></span>
 <span id="index-another"></span>
 
-<hr>
+</div><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 85884fff6c..4f9c290dd7 100644
--- a/tp/tests/indices/res_parser/index_nodes_nodes/first.html
+++ b/tp/tests/indices/res_parser/index_nodes_nodes/first.html
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="first"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="first">
+<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>
@@ -103,7 +104,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
+</div><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 bce02c6a70..e01f58707f 100644
--- a/tp/tests/indices/res_parser/index_nodes_nodes/index.html
+++ b/tp/tests/indices/res_parser/index_nodes_nodes/index.html
@@ -35,7 +35,8 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="Top">
+<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>
@@ -164,7 +165,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
+</div><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/index_nodes_abt.html b/tp/tests/indices/res_parser/index_nodes_nodes/index_nodes_abt.html
index 9e8cd2120f..7c1dee32b2 100644
--- a/tp/tests/indices/res_parser/index_nodes_nodes/index_nodes_abt.html
+++ b/tp/tests/indices/res_parser/index_nodes_nodes/index_nodes_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</td>
@@ -144,7 +144,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</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 ddad38267e..e190a7c37e 100644
--- a/tp/tests/indices/res_parser/index_nodes_nodes/second.html
+++ b/tp/tests/indices/res_parser/index_nodes_nodes/second.html
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="second"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="second">
+<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>
@@ -86,7 +87,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<hr>
+</div><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 91cef1b110..1c9442857a 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,7 +38,8 @@ ul.no-bullet {list-style: none}
 <p>Garbage
 <span id="index-before-nodes"></span>
 </p>
-<span id="one-node"></span><p>Top node
+<div class="node" id="one-node">
+<p>Top node
 <span id="index-Top-node"></span>
 </p>
 <p>anchor ref <span id="ref"></span>.
@@ -74,7 +75,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<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 863aed84a8..ef70352a32 100644
--- a/tp/tests/indices/res_parser/index_special_region/Chapter.html
+++ b/tp/tests/indices/res_parser/index_special_region/Chapter.html
@@ -40,7 +40,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="Chapter">
+<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>
@@ -114,7 +115,7 @@ and titlepage, and various wrong index entries.
 </td></tr>
 </table>
 
-<hr>
+</div><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 1a9d43dbde..ab2c375765 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
@@ -40,7 +40,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Copying-and-indices"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="appendix" id="Copying-and-indices">
+<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="index.html" title="Up section"> Up </a>]</td>
@@ -55,7 +56,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>
-<span id="Copying-and-indices-1"></span><h1 class="appendix">Appendix A Copying and indices</h1>
+<div class="node" id="Copying-and-indices-1">
+<h1 class="appendix">Appendix A Copying and indices</h1>
 
 <p>In the appendix, we print the indices and references.
 </p>
@@ -157,7 +159,7 @@ domain<a id="DOCF1_2" href="index_special_region_fot.html#FOOT1_2"><sup>2</sup><
  &nbsp; 
 </td></tr></table>
 
-<hr>
+</div><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>
@@ -171,6 +173,7 @@ domain<a id="DOCF1_2" href="index_special_region_fot.html#FOOT1_2"><sup>2</sup><
 <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>
 <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/index.html b/tp/tests/indices/res_parser/index_special_region/index.html
index 8f4ce23b47..f368d39f29 100644
--- a/tp/tests/indices/res_parser/index_special_region/index.html
+++ b/tp/tests/indices/res_parser/index_special_region/index.html
@@ -43,7 +43,8 @@ ul.no-bullet {list-style: none}
 
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -51,8 +52,9 @@ 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>
-<span id="Top-1"></span><h1 class="top">Top</h1>
-<hr>
+<div class="node" id="Top-1">
+<h1 class="top">Top</h1>
+</div><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>
@@ -61,6 +63,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>
 <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/index_special_region_abt.html b/tp/tests/indices/res_parser/index_special_region/index_special_region_abt.html
index 645c26e24b..7dd5f17621 100644
--- a/tp/tests/indices/res_parser/index_special_region/index_special_region_abt.html
+++ b/tp/tests/indices/res_parser/index_special_region/index_special_region_abt.html
@@ -40,7 +40,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index_special_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -149,7 +149,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index_special_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/tests/indices/res_parser/index_special_region/index_special_region_fot.html b/tp/tests/indices/res_parser/index_special_region/index_special_region_fot.html
index 1d6282dbcc..463ac6a0e0 100644
--- a/tp/tests/indices/res_parser/index_special_region/index_special_region_fot.html
+++ b/tp/tests/indices/res_parser/index_special_region/index_special_region_fot.html
@@ -40,7 +40,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Foot"></span>
+<div class="Footnotes_element" id="SEC_Foot">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index_special_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -59,7 +59,7 @@ domain is something you should allready know
 domain is something you should allready know
 </p>
 <span id="index-copying-Public-domain"></span>
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index_special_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/tests/indices/res_parser/index_special_region/index_special_region_toc.html b/tp/tests/indices/res_parser/index_special_region/index_special_region_toc.html
index 5f6337a622..dcb85ef896 100644
--- a/tp/tests/indices/res_parser/index_special_region/index_special_region_toc.html
+++ b/tp/tests/indices/res_parser/index_special_region/index_special_region_toc.html
@@ -40,7 +40,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -56,7 +56,7 @@ ul.no-bullet {list-style: none}
   <li><a id="toc-Copying-and-indices-1" href="Copying-and-indices.html" rel="index">Appendix A Copying and indices</a></li>
 </ul>
 </div>
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</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 3a3e2abc39..ae1a581e63 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,7 +40,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="Chapter">
+<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>
@@ -114,7 +115,7 @@ and titlepage, and various wrong index entries.
 </td></tr>
 </table>
 
-<hr>
+</div><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 d489d0ebe2..33d35ec691 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
@@ -40,7 +40,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Copying-and-indices"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="appendix" id="Copying-and-indices">
+<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="index.html" title="Up section"> Up </a>]</td>
@@ -55,7 +56,8 @@ 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>
-<span id="Copying-and-indices-1"></span><h1 class="appendix">Appendix A Copying and indices</h1>
+<div class="node" id="Copying-and-indices-1">
+<h1 class="appendix">Appendix A Copying and indices</h1>
 
 <p>In the appendix, we print the indices and references.
 </p>
@@ -157,7 +159,7 @@ domain<a id="DOCF1_4" href="index_special_region_fot.html#FOOT1_4"><sup>4</sup><
  &nbsp; 
 </td></tr></table>
 
-<hr>
+</div><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>
@@ -171,6 +173,7 @@ domain<a id="DOCF1_4" href="index_special_region_fot.html#FOOT1_4"><sup>4</sup><
 <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>
 <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_html/index.html b/tp/tests/indices/res_parser/index_special_region_html/index.html
index 52ece100b9..a5d56aba3f 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
@@ -85,7 +85,8 @@ domain<a id="DOCF1" href="index_special_region_fot.html#FOOT1"><sup>2</sup></a>.
 
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -93,8 +94,9 @@ 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>
-<span id="Top-1"></span><h1 class="top">Top</h1>
-<hr>
+<div class="node" id="Top-1">
+<h1 class="top">Top</h1>
+</div><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>
@@ -103,6 +105,7 @@ 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>
 <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_html/index_special_region_abt.html b/tp/tests/indices/res_parser/index_special_region_html/index_special_region_abt.html
index 020c8768c2..0c1bb476ea 100644
--- a/tp/tests/indices/res_parser/index_special_region_html/index_special_region_abt.html
+++ b/tp/tests/indices/res_parser/index_special_region_html/index_special_region_abt.html
@@ -40,7 +40,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index_special_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -149,7 +149,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index_special_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/tests/indices/res_parser/index_special_region_html/index_special_region_fot.html b/tp/tests/indices/res_parser/index_special_region_html/index_special_region_fot.html
index 6b26d6cdd5..ab647171e3 100644
--- a/tp/tests/indices/res_parser/index_special_region_html/index_special_region_fot.html
+++ b/tp/tests/indices/res_parser/index_special_region_html/index_special_region_fot.html
@@ -40,7 +40,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Foot"></span>
+<div class="Footnotes_element" id="SEC_Foot">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index_special_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -68,7 +68,7 @@ domain is something you should allready know
 domain is something you should allready know
 </p>
 <span id="index-copying-Public-domain"></span>
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index_special_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/tests/indices/res_parser/index_special_region_html/index_special_region_toc.html b/tp/tests/indices/res_parser/index_special_region_html/index_special_region_toc.html
index 3087289f98..ee03345615 100644
--- a/tp/tests/indices/res_parser/index_special_region_html/index_special_region_toc.html
+++ b/tp/tests/indices/res_parser/index_special_region_html/index_special_region_toc.html
@@ -40,7 +40,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -56,7 +56,7 @@ ul.no-bullet {list-style: none}
   <li><a id="toc-Copying-and-indices-1" href="Copying-and-indices.html" rel="index">Appendix A Copying and indices</a></li>
 </ul>
 </div>
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</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 d65830fd7f..d849aba210 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,7 +40,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="Chapter">
+<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>
@@ -78,7 +79,7 @@ and titlepage, and various wrong index entries.
 </td></tr>
 </table>
 
-<hr>
+</div><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 5f6da2a444..083771c3e4 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
@@ -40,7 +40,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Copying-and-indices"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="appendix" id="Copying-and-indices">
+<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="index.html" title="Up section"> Up </a>]</td>
@@ -55,7 +56,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>
-<span id="Copying-and-indices-1"></span><h1 class="appendix">Appendix A Copying and indices</h1>
+<div class="node" id="Copying-and-indices-1">
+<h1 class="appendix">Appendix A Copying and indices</h1>
 
 <p>In the appendix, we print the indices and references.
 </p>
@@ -121,7 +123,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<hr>
+</div><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>
@@ -135,6 +137,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>
 <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_no_insertcopying/index.html b/tp/tests/indices/res_parser/index_special_region_no_insertcopying/index.html
index b7c4185416..beeeca88cd 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
@@ -43,7 +43,8 @@ ul.no-bullet {list-style: none}
 
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -51,8 +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_insertcopying_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
 </tr></table>
-<span id="Top-1"></span><h1 class="top">Top</h1>
-<hr>
+<div class="node" id="Top-1">
+<h1 class="top">Top</h1>
+</div><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>
@@ -61,6 +63,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>
 <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_no_insertcopying/index_special_region_no_insertcopying_abt.html b/tp/tests/indices/res_parser/index_special_region_no_insertcopying/index_special_region_no_insertcopying_abt.html
index 3b2d2dd6d0..f89d4a7c3b 100644
--- a/tp/tests/indices/res_parser/index_special_region_no_insertcopying/index_special_region_no_insertcopying_abt.html
+++ b/tp/tests/indices/res_parser/index_special_region_no_insertcopying/index_special_region_no_insertcopying_abt.html
@@ -40,7 +40,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -149,7 +149,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/tests/indices/res_parser/index_special_region_no_insertcopying/index_special_region_no_insertcopying_toc.html b/tp/tests/indices/res_parser/index_special_region_no_insertcopying/index_special_region_no_insertcopying_toc.html
index d591d6612b..eeacee9cdb 100644
--- a/tp/tests/indices/res_parser/index_special_region_no_insertcopying/index_special_region_no_insertcopying_toc.html
+++ b/tp/tests/indices/res_parser/index_special_region_no_insertcopying/index_special_region_no_insertcopying_toc.html
@@ -40,7 +40,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -56,7 +56,7 @@ ul.no-bullet {list-style: none}
   <li><a id="toc-Copying-and-indices-1" href="Copying-and-indices.html" rel="index">Appendix A Copying and indices</a></li>
 </ul>
 </div>
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</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 a58f21ee32..59b3842074 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,7 +40,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="Chapter">
+<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>
@@ -78,7 +79,7 @@ and titlepage, and various wrong index entries.
 </td></tr>
 </table>
 
-<hr>
+</div><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 f9206b62be..039a8b13eb 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
@@ -40,7 +40,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Copying-and-indices"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="appendix" id="Copying-and-indices">
+<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="index.html" title="Up section"> Up </a>]</td>
@@ -55,7 +56,8 @@ 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>
-<span id="Copying-and-indices-1"></span><h1 class="appendix">Appendix A Copying and indices</h1>
+<div class="node" id="Copying-and-indices-1">
+<h1 class="appendix">Appendix A Copying and indices</h1>
 
 <p>In the appendix, we print the indices and references.
 </p>
@@ -121,7 +123,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<hr>
+</div><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>
@@ -135,6 +137,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>
 <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_no_insertcopying_html/index.html b/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index.html
index 188719264b..a391926dce 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
@@ -85,7 +85,8 @@ domain<a id="DOCF1" href="index_special_region_no_insertcopying_fot.html#FOOT1">
 
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -93,8 +94,9 @@ 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>
-<span id="Top-1"></span><h1 class="top">Top</h1>
-<hr>
+<div class="node" id="Top-1">
+<h1 class="top">Top</h1>
+</div><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>
@@ -103,6 +105,7 @@ 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>
 <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_no_insertcopying_html/index_special_region_no_insertcopying_abt.html b/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_abt.html
index 73da8461e7..0fd00e70d5 100644
--- a/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_abt.html
+++ b/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_abt.html
@@ -40,7 +40,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -149,7 +149,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_fot.html b/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_fot.html
index bff8590f29..28f3b6e1e1 100644
--- a/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_fot.html
+++ b/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_fot.html
@@ -40,7 +40,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Foot"></span>
+<div class="Footnotes_element" id="SEC_Foot">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -58,7 +58,7 @@ ul.no-bullet {list-style: none}
 domain is something you should allready know
 </p>
 <span id="index-copying-Public-domain"></span>
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_toc.html b/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_toc.html
index d696c96ef5..f675eebe68 100644
--- a/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_toc.html
+++ b/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_toc.html
@@ -40,7 +40,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -56,7 +56,7 @@ ul.no-bullet {list-style: none}
   <li><a id="toc-Copying-and-indices-1" href="Copying-and-indices.html" rel="index">Appendix A Copying and indices</a></li>
 </ul>
 </div>
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</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 b76be75007..984cf9fb80 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,7 +40,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="Chapter">
+<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>
@@ -78,7 +79,7 @@ and titlepage, and various wrong index entries.
 </td></tr>
 </table>
 
-<hr>
+</div><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 a174b7881a..188efe70a5 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
@@ -40,7 +40,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Copying-and-indices"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="appendix" id="Copying-and-indices">
+<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="index.html" title="Up section"> Up </a>]</td>
@@ -55,7 +56,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_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
 </tr></table>
-<span id="Copying-and-indices-1"></span><h1 class="appendix">Appendix A Copying and indices</h1>
+<div class="node" id="Copying-and-indices-1">
+<h1 class="appendix">Appendix A Copying and indices</h1>
 
 <p>In the appendix, we print the indices and references.
 </p>
@@ -121,7 +123,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<hr>
+</div><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>
@@ -135,6 +137,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>
 <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_no_region/index.html b/tp/tests/indices/res_parser/index_special_region_no_region/index.html
index 3492a50bf5..0df83b76e7 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
@@ -43,7 +43,8 @@ ul.no-bullet {list-style: none}
 
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -51,9 +52,10 @@ 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>
-<span id="Top-1"></span><h1 class="top">Top</h1>
+<div class="node" id="Top-1">
+<h1 class="top">Top</h1>
 
-<hr>
+</div><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>
@@ -62,6 +64,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>
 <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_no_region/index_special_region_no_region_abt.html b/tp/tests/indices/res_parser/index_special_region_no_region/index_special_region_no_region_abt.html
index 54f3b2658e..50759b8833 100644
--- a/tp/tests/indices/res_parser/index_special_region_no_region/index_special_region_no_region_abt.html
+++ b/tp/tests/indices/res_parser/index_special_region_no_region/index_special_region_no_region_abt.html
@@ -40,7 +40,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index_special_region_no_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -149,7 +149,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index_special_region_no_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/tests/indices/res_parser/index_special_region_no_region/index_special_region_no_region_toc.html b/tp/tests/indices/res_parser/index_special_region_no_region/index_special_region_no_region_toc.html
index 3116ac7c1a..ec6bf3a2e3 100644
--- a/tp/tests/indices/res_parser/index_special_region_no_region/index_special_region_no_region_toc.html
+++ b/tp/tests/indices/res_parser/index_special_region_no_region/index_special_region_no_region_toc.html
@@ -40,7 +40,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -56,7 +56,7 @@ ul.no-bullet {list-style: none}
   <li><a id="toc-Copying-and-indices-1" href="Copying-and-indices.html" rel="index">Appendix A Copying and indices</a></li>
 </ul>
 </div>
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</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 ea3e1f4dba..aa7bd7250b 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,7 +40,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="Chapter">
+<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>
@@ -78,7 +79,7 @@ and titlepage, and various wrong index entries.
 </td></tr>
 </table>
 
-<hr>
+</div><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 516658ab18..ed750fdfad 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
@@ -40,7 +40,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Copying-and-indices"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="appendix" id="Copying-and-indices">
+<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="index.html" title="Up section"> Up </a>]</td>
@@ -55,7 +56,8 @@ 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>
-<span id="Copying-and-indices-1"></span><h1 class="appendix">Appendix A Copying and indices</h1>
+<div class="node" id="Copying-and-indices-1">
+<h1 class="appendix">Appendix A Copying and indices</h1>
 
 <p>In the appendix, we print the indices and references.
 </p>
@@ -121,7 +123,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<hr>
+</div><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>
@@ -135,6 +137,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>
 <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_no_region_html/index.html b/tp/tests/indices/res_parser/index_special_region_no_region_html/index.html
index 09388ad116..ffe2afa910 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
@@ -85,7 +85,8 @@ domain<a id="DOCF1" href="index_special_region_no_region_fot.html#FOOT1"><sup>2<
 
 
 
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
@@ -93,9 +94,10 @@ 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>
-<span id="Top-1"></span><h1 class="top">Top</h1>
+<div class="node" id="Top-1">
+<h1 class="top">Top</h1>
 
-<hr>
+</div><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>
@@ -104,6 +106,7 @@ 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>
 <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_no_region_html/index_special_region_no_region_abt.html b/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_abt.html
index 119f095b73..66ca755b19 100644
--- a/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_abt.html
+++ b/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_abt.html
@@ -40,7 +40,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index_special_region_no_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -149,7 +149,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index_special_region_no_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_fot.html b/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_fot.html
index e6f7dd3722..87e6c17425 100644
--- a/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_fot.html
+++ b/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_fot.html
@@ -40,7 +40,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Foot"></span>
+<div class="Footnotes_element" id="SEC_Foot">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index_special_region_no_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -58,7 +58,7 @@ ul.no-bullet {list-style: none}
 domain is something you should allready know
 </p>
 <span id="index-copying-Public-domain"></span>
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index_special_region_no_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_toc.html b/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_toc.html
index 5a4aaca3f2..b6d26d99af 100644
--- a/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_toc.html
+++ b/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_toc.html
@@ -40,7 +40,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -56,7 +56,7 @@ ul.no-bullet {list-style: none}
   <li><a id="toc-Copying-and-indices-1" href="Copying-and-indices.html" rel="index">Appendix A Copying and indices</a></li>
 </ul>
 </div>
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</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 18c089e116..ec9b407283 100644
--- a/tp/tests/indices/res_parser/index_table/index.html
+++ b/tp/tests/indices/res_parser/index_table/index.html
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -42,7 +43,8 @@ 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>
-<span id="Test-for-indices"></span><h1 class="top">Test for indices</h1>
+<div class="node" id="Test-for-indices">
+<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>
@@ -52,7 +54,7 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
+</div><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>
@@ -61,6 +63,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>
 <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_table/index_table_abt.html b/tp/tests/indices/res_parser/index_table/index_table_abt.html
index 876210e0e4..a5ba2a222d 100644
--- a/tp/tests/indices/res_parser/index_table/index_table_abt.html
+++ b/tp/tests/indices/res_parser/index_table/index_table_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index_table_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -143,7 +143,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="index_table_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/tp/tests/indices/res_parser/index_table/index_table_toc.html b/tp/tests/indices/res_parser/index_table/index_table_toc.html
index 5984cafa2a..ffc11a04b4 100644
--- a/tp/tests/indices/res_parser/index_table/index_table_toc.html
+++ b/tp/tests/indices/res_parser/index_table/index_table_toc.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -54,7 +54,7 @@ ul.no-bullet {list-style: none}
   </ul></li>
 </ul>
 </div>
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</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 b0f5c2a69b..936f6dc20f 100644
--- a/tp/tests/indices/res_parser/index_table/indices-refs.html
+++ b/tp/tests/indices/res_parser/index_table/indices-refs.html
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="indices-refs"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="indices-refs">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="node-with-printindex.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="node-with-printindex.html" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
@@ -49,7 +50,8 @@ 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>
-<span id="Indices-refs"></span><h1 class="chapter">3 Indices refs</h1>
+<div class="node" id="Indices-refs">
+<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>
@@ -507,8 +509,9 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<hr>
-<span id="node"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><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>
 <td valign="middle" align="left">[<a href="#indices-refs" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#indices-refs" title="Up section"> Up </a>]</td>
@@ -523,11 +526,12 @@ 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>
-<span id="node-1"></span><h2 class="section">3.1 node</h2>
+<div class="node" id="node-1">
+<h2 class="section">3.1 node</h2>
 
 <p>A section following the indices.
 </p>
-<hr>
+</div><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>
@@ -541,6 +545,8 @@ 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>
+</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_table/node-with-ftable-and-vtable.html b/tp/tests/indices/res_parser/index_table/node-with-ftable-and-vtable.html
index a45a850d97..46e50c1287 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="node-with-ftable-and-vtable"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="node-with-ftable-and-vtable">
+<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>
@@ -49,7 +50,8 @@ 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>
-<span id="first-node-chapter_002c-with-ftable-and-vtable"></span><h1 class="chapter">1 first node chapter, with ftable and vtable</h1>
+<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="index-index-entry-in-node"></span>
 
@@ -76,7 +78,7 @@ ul.no-bullet {list-style: none}
 </p></dd>
 </dl>
 
-<hr>
+</div><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>
@@ -90,6 +92,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>
 <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_table/node-with-printindex.html b/tp/tests/indices/res_parser/index_table/node-with-printindex.html
index 4632127a70..ca8be842a4 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="node-with-printindex"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="node-with-printindex">
+<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="node-with-ftable-and-vtable.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>
@@ -49,7 +50,8 @@ 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>
-<span id="node-with-printindex-1"></span><h1 class="chapter">2 node with printindex</h1>
+<div class="node" id="node-with-printindex-1">
+<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; 
@@ -411,7 +413,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<hr>
+</div><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>
@@ -425,6 +427,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>
 <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/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 73ea7f0825..b7b4049abc 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="chapter">
+<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>
@@ -49,7 +50,8 @@ 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>
-<span id="A-chapter"></span><h1 class="chapter">1 A chapter</h1>
+<div class="node" id="A-chapter">
+<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; 
@@ -120,10 +122,11 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<span id="node-in-chapter"></span>
+</div><div class="node" id="node-in-chapter">
+
 <span id="index-node-in-chapter"></span>
 
-<hr>
+</div><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>
@@ -137,6 +140,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>
 <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/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 5a36d3c22c..5af3a6ecf3 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,7 +36,8 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="first-before-top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="first-before-top">
+<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>
@@ -190,7 +191,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<span id="node-in-menu-before-top"></span>
+</div><div class="node" id="node-in-menu-before-top">
+
 <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>
@@ -266,7 +268,8 @@ ul.no-bullet {list-style: none}
 <span id="index-printindex-node-in-menu-before-top"></span>
 
 
-<span id="Top"></span><span id="index-entry-a"></span>
+</div><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>
  &nbsp; 
@@ -436,7 +439,8 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<span id="top-section"></span><h1 class="top">top section</h1>
+<div class="node" id="top-section">
+<h1 class="top">top section</h1>
 <span id="index-top-section"></span>
 
 <p>in top section
@@ -450,7 +454,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<span id="first"></span><p>Text and then index entries
+</div><div class="node" id="first">
+<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>
@@ -529,7 +534,8 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<span id="second"></span><table class="menu" border="0" cellspacing="0">
+</div><div class="node" id="second">
+<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">
@@ -564,12 +570,14 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<span id="another"></span>
+</div><div class="node" id="another">
+
 <span id="index-something"></span>
 <span id="index-somewhere"></span>
 <span id="index-another"></span>
 
-<span id="a-node"></span><span id="index-entry-after-printindex"></span>
+</div><div class="node" id="a-node">
+<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; 
@@ -712,7 +720,7 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<hr>
+</div><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>
@@ -721,6 +729,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="nodes_before_top_and_sections_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
 </tr></table>
+</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/nodes_before_top_and_sections_html_chapter/nodes_before_top_and_sections_abt.html b/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/nodes_before_top_and_sections_abt.html
index a11790434f..dccb6dd238 100644
--- a/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/nodes_before_top_and_sections_abt.html
+++ b/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/nodes_before_top_and_sections_abt.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="SEC_About"></span>
+<div class="About_element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</td>
@@ -143,7 +143,7 @@ ul.no-bullet {list-style: none}
   </li>
 </ul>
 
-<hr>
+</div><hr>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
 <td valign="middle" align="left">[Contents]</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 74cdad203d..66c30a854b 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="chapter" id="chapter">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html#a-node" title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
@@ -49,7 +50,8 @@ 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>
-<span id="A-chapter"></span><h1 class="chapter">1 A chapter</h1>
+<div class="node" id="A-chapter">
+<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; 
@@ -120,8 +122,9 @@ ul.no-bullet {list-style: none}
  &nbsp; 
 </td></tr></table>
 
-<hr>
-<span id="node-in-chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+<div class="node" id="node-in-chapter">
+<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>
@@ -140,7 +143,7 @@ ul.no-bullet {list-style: none}
 
 <span id="index-node-in-chapter"></span>
 
-<hr>
+</div><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>
@@ -154,6 +157,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>
 <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/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 91a69c1ca0..67fa19b0fd 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,7 +36,8 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 
 
-<span id="first-before-top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="node" id="first-before-top">
+<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>
@@ -198,8 +199,9 @@ ul.no-bullet {list-style: none}
 </td></tr>
 </table>
 
-<hr>
-<span id="node-in-menu-before-top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+</div><hr>
+<div class="node" id="node-in-menu-before-top">
+<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>
@@ -291,7 +293,7 @@ ul.no-bullet {list-style: none}
 <span id="index-printindex-node-in-menu-before-top"></span>
 
 
-<hr>
+</div><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 b90dc5048a..e6362f2b7e 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
@@ -34,7 +34,8 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
+<div class="top" id="Top">
+<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 orde