texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: * tp/Texinfo/Convert/HTML.pm (%defaults): more co


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/Convert/HTML.pm (%defaults): more consistent 'misc_elements_targets'.
Date: Wed, 05 Jan 2022 18:27:59 -0500

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

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new daa19eaa41 * tp/Texinfo/Convert/HTML.pm (%defaults): more consistent 
'misc_elements_targets'.
daa19eaa41 is described below

commit daa19eaa41f0816667e30039468a71dfac33512d
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Jan 6 00:27:47 2022 +0100

    * tp/Texinfo/Convert/HTML.pm (%defaults): more consistent
    'misc_elements_targets'.
    
    * tp/Texinfo/Convert/HTML.pm (_contents_inline_element)
    (_convert_special_element_type): more consistent class names, always
    use SPECIAL_ELEMENTS_CLASS for class names.
---
 ChangeLog                                                |  9 +++++++++
 tp/Texinfo/Convert/HTML.pm                               | 15 ++++++++-------
 tp/t/results/converters_tests/ref_in_sectioning.pl       |  2 +-
 .../coverage_braces/two_footnotes_in_nodes_separate.pl   |  4 ++--
 .../formats_encodings/sample_utf8/res_html/index.html    |  2 +-
 .../float_copying/res_html/float_copying_abt.html        |  2 +-
 .../float_copying/res_html/float_copying_fot.html        |  2 +-
 tp/t/results/formatting/texi_bib_example.pl              |  2 +-
 tp/t/results/formatting/texi_glossary.pl                 |  2 +-
 .../html_tests/character_number_leading_toc_stoc.pl      |  4 ++--
 .../res_html/footnotestyle_separate_late_fot.html        |  2 +-
 tp/t/results/html_tests/shortcontents_no_top.pl          |  2 +-
 .../text_before_top_and_contents_after_title.pl          |  2 +-
 .../text_before_top_and_summarycontents_after_title.pl   |  2 +-
 tp/t/results/htmlxref/htmlxref/res_html/test_refs.html   |  2 +-
 .../htmlxref/htmlxref_nodes/res_html/test_refs_abt.html  |  2 +-
 .../htmlxref/htmlxref_only_mono/res_html/test_refs.html  |  2 +-
 .../htmlxref_only_mono_nodes/res_html/test_refs_abt.html |  2 +-
 .../htmlxref/htmlxref_only_split/res_html/test_refs.html |  2 +-
 .../res_html/test_refs_abt.html                          |  2 +-
 tp/t/results/indices/index_entry_in_footnote_separate.pl |  2 +-
 tp/t/results/languages/appendix_translated.pl            |  2 +-
 .../res_html/multiple_lang_chapters.html                 |  2 +-
 tp/t/results/layout/navigation/res_html/navigation.html  |  4 ++--
 .../navigation_chapter/res_html/navigation_abt.html      |  2 +-
 .../navigation_chapter/res_html/navigation_toc.html      |  2 +-
 .../res_html/navigation_abt.html                         |  2 +-
 .../res_html/navigation_toc.html                         |  2 +-
 .../res_html/navigation_abt.html                         |  2 +-
 .../res_html/navigation_toc.html                         |  2 +-
 .../res_html/navigation_abt.html                         |  2 +-
 .../res_html/navigation_toc.html                         |  2 +-
 .../layout/navigation_no_header/res_html/navigation.html |  2 +-
 .../res_html/navigation.html                             |  2 +-
 .../layout/navigation_node/res_html/navigation_abt.html  |  2 +-
 .../layout/navigation_node/res_html/navigation_toc.html  |  2 +-
 .../res_html/navigation_abt.html                         |  2 +-
 .../res_html/navigation_toc.html                         |  2 +-
 .../res_html/navigation_abt.html                         |  2 +-
 .../res_html/navigation_toc.html                         |  2 +-
 .../res_html/navigation_abt.html                         |  2 +-
 .../res_html/navigation_toc.html                         |  2 +-
 .../navigation_section/res_html/navigation_abt.html      |  2 +-
 .../navigation_section/res_html/navigation_toc.html      |  2 +-
 .../res_html/navigation_abt.html                         |  2 +-
 .../res_html/navigation_toc.html                         |  2 +-
 .../res_html/navigation_abt.html                         |  2 +-
 .../res_html/navigation_toc.html                         |  2 +-
 .../res_html/navigation_abt.html                         |  2 +-
 .../res_html/navigation_toc.html                         |  2 +-
 .../layout/navigation_vertical/res_html/navigation.html  |  4 ++--
 .../layout/no_monolithic/res_html/no_monolithic_abt.html |  2 +-
 .../layout/no_monolithic/res_html/no_monolithic_fot.html |  2 +-
 .../layout/no_monolithic/res_html/no_monolithic_ovr.html |  2 +-
 .../layout/no_monolithic/res_html/no_monolithic_toc.html |  2 +-
 tp/t/results/morecoverage/formatting_fr.pl               | 16 ++++++++--------
 tp/t/results/morecoverage/texi_formatting.pl             |  8 ++++----
 .../index_no_node/res_html/index_no_node_abt.html        |  2 +-
 .../index_split/res_html/index_split_abt.html            |  2 +-
 .../index_split_nodes/res_html/index_split_abt.html      |  2 +-
 .../nodes_before_top/res_html/nodes_before_top_abt.html  |  2 +-
 .../res_html/nodes_before_top_and_sections.html          |  2 +-
 .../res_html/nodes_before_top_abt.html                   |  2 +-
 .../res_html/split_chapter_index_abt.html                |  2 +-
 .../equivalent_nodes/res_html/equivalent_nodes.html      |  2 +-
 .../res_html/more_sections_than_nodes.html               |  2 +-
 .../res_html/node_footnote_abt.html                      |  2 +-
 .../res_html/nodes_after_top_before_chapter_abt.html     |  2 +-
 .../res_html/nodes_after_top_before_section.html         |  2 +-
 .../res_html/nodes_after_top_before_section_abt.html     |  2 +-
 .../sectioning_frames/res_html/sectioning_abt.html       |  2 +-
 .../sectioning_frames/res_html/sectioning_ovr.html       |  2 +-
 .../sectioning_frames/res_html/sectioning_toc.html       |  2 +-
 .../res_html/top_node_up_explicit.html                   |  2 +-
 .../res_html/top_node_up_implicit.html                   |  2 +-
 .../res_html/two_footnotes_in_nodes.html                 |  4 ++--
 .../res_html/two_footnotes_in_nodes.html                 |  4 ++--
 tp/t/results/sectioning/anchor_in_footnote_separate.pl   |  2 +-
 tp/t/results/sectioning/chapter_before_and_after_part.pl |  2 +-
 tp/t/results/sectioning/chapter_between_nodes.pl         |  2 +-
 .../sectioning/chapter_node_before_and_after_part.pl     |  2 +-
 tp/t/results/sectioning/contents.pl                      |  2 +-
 tp/t/results/sectioning/contents_and_shortcontents.pl    |  4 ++--
 tp/t/results/sectioning/contents_in_html_text.pl         |  4 ++--
 tp/t/results/sectioning/no_argument_and_contents.pl      |  2 +-
 .../sectioning/node_part_chapter_after_chapter.pl        |  2 +-
 tp/t/results/sectioning/section_before_part.pl           |  2 +-
 tp/t/results/sectioning/section_below_unnumbered.pl      |  2 +-
 tp/t/results/sectioning/section_in_unnumbered_info.pl    |  2 +-
 .../sectioning/section_in_unnumbered_plaintext.pl        |  2 +-
 tp/t/results/sectioning/shortcontents.pl                 |  2 +-
 .../contents_and_parts/contents_and_parts.html           |  6 +++---
 .../res_parser/contents_at_begin/contents_at_begin.html  |  4 ++--
 .../contents_at_begin_inline/contents_at_begin.html      |  4 ++--
 .../res_parser/contents_at_end/contents_at_end.html      |  4 ++--
 .../contents_at_end_inline/contents_at_end.html          |  4 ++--
 .../contents_in_middle_chapter.html                      |  4 ++--
 .../contents_in_middle_chapter.html                      |  4 ++--
 .../contents_in_middle_section.html                      |  4 ++--
 .../contents_in_middle_section.html                      |  4 ++--
 .../res_parser/double_contents/double_contents.html      |  4 ++--
 .../double_contents_after_title/double_contents.html     |  4 ++--
 .../double_contents.html                                 |  4 ++--
 .../double_contents_abt.html                             |  2 +-
 .../double_contents_after_title_book_chapter/index.html  |  2 +-
 .../double_contents_after_title_no_texi2html/index.html  |  2 +-
 .../res_parser/double_contents_book/double_contents.html |  8 ++++----
 .../double_contents_chapter/double_contents_abt.html     |  2 +-
 .../double_contents_chapter/double_contents_toc.html     |  2 +-
 .../double_contents_inline/double_contents.html          |  8 ++++----
 .../double_contents_inline_chapter/chapter.html          |  4 ++--
 .../double_contents_abt.html                             |  2 +-
 .../res_parser/double_contents_inline_chapter/index.html |  2 +-
 .../res_parser/double_contents_inline_nodes/chapter.html |  2 +-
 .../double_contents_abt.html                             |  2 +-
 .../res_parser/double_contents_inline_nodes/index.html   |  2 +-
 .../res_parser/double_contents_inline_nodes/section.html |  2 +-
 .../double_contents_inline_section/chapter.html          |  2 +-
 .../double_contents_abt.html                             |  2 +-
 .../res_parser/double_contents_inline_section/index.html |  2 +-
 .../double_contents_inline_section/section.html          |  2 +-
 .../double_contents_nodes/double_contents_abt.html       |  2 +-
 .../double_contents_nodes/double_contents_toc.html       |  2 +-
 .../double_contents_section/double_contents_abt.html     |  2 +-
 .../double_contents_section/double_contents_toc.html     |  2 +-
 tp/tests/contents/res_parser/no_content/no_content.html  |  2 +-
 .../res_parser/no_content_do_contents/no_content.html    |  4 ++--
 .../no_content_do_contents_inline/no_content.html        |  2 +-
 .../res_parser/no_content_inline/no_content.html         |  2 +-
 .../no_content_setcatpage/no_content_setcatpage.html     |  2 +-
 .../no_content_setcatpage.html                           |  4 ++--
 .../no_content_setcatpage.html                           |  2 +-
 .../no_content_setcatpage.html                           |  2 +-
 .../documentlanguage_cmdline/documentlanguage.html       |  2 +-
 .../res_parser/simplest_test_css/simplest.html           |  2 +-
 .../index_and_node_same_name.html                        |  2 +-
 .../index_entry_in_footnote/index_entry_in_footnote.html |  4 ++--
 .../index_no_node_no_top/index_no_node_no_top.html       |  2 +-
 .../res_parser/index_nodes_nodes/index_nodes_abt.html    |  2 +-
 .../index_special_region/index_special_region_abt.html   |  2 +-
 .../index_special_region/index_special_region_fot.html   |  2 +-
 .../index_special_region/index_special_region_toc.html   |  2 +-
 .../index_special_region_abt.html                        |  2 +-
 .../index_special_region_fot.html                        |  2 +-
 .../index_special_region_toc.html                        |  2 +-
 .../index_special_region_no_insertcopying_abt.html       |  2 +-
 .../index_special_region_no_insertcopying_toc.html       |  2 +-
 .../index_special_region_no_insertcopying_abt.html       |  2 +-
 .../index_special_region_no_insertcopying_fot.html       |  2 +-
 .../index_special_region_no_insertcopying_toc.html       |  2 +-
 .../index_special_region_no_region_abt.html              |  2 +-
 .../index_special_region_no_region_toc.html              |  2 +-
 .../index_special_region_no_region_abt.html              |  2 +-
 .../index_special_region_no_region_fot.html              |  2 +-
 .../index_special_region_no_region_toc.html              |  2 +-
 .../indices/res_parser/index_table/index_table_abt.html  |  2 +-
 .../indices/res_parser/index_table/index_table_toc.html  |  2 +-
 .../indices_in_begin_tables_lists.html                   |  2 +-
 .../nodes_before_top_and_sections_abt.html               |  2 +-
 .../nodes_before_top_and_sections_abt.html               |  2 +-
 .../printindex_between_node_section.html                 |  2 +-
 .../printindex_between_part_chapter.html                 |  2 +-
 .../res_parser_info/index_special_region_html/index.html |  2 +-
 .../index.html                                           |  2 +-
 .../index_special_region_no_region_html/index.html       |  2 +-
 tp/tests/layout/res_parser/formatting/formatting.html    |  8 ++++----
 .../layout/res_parser/formatting_chm/formatting_abt.html |  2 +-
 .../layout/res_parser/formatting_chm/formatting_ovr.html |  2 +-
 .../layout/res_parser/formatting_chm/formatting_toc.html |  2 +-
 .../formatting_enable_encoding/formatting.html           |  8 ++++----
 .../formatting_epub_package/EPUB/xhtml/formatting.xhtml  |  6 +++---
 .../EPUB/xhtml/formatting_abt.xhtml                      |  2 +-
 .../EPUB/xhtml/formatting_fot.xhtml                      |  2 +-
 .../EPUB/xhtml/formatting_ovr.xhtml                      |  2 +-
 .../EPUB/xhtml/formatting_toc.xhtml                      |  2 +-
 .../res_parser/formatting_exotic/formatting_abt.html     |  2 +-
 .../res_parser/formatting_exotic/formatting_ovr.html     |  2 +-
 .../res_parser/formatting_exotic/formatting_toc.html     |  2 +-
 .../res_parser/formatting_fr_icons/formatting.html       |  8 ++++----
 .../layout/res_parser/formatting_html/formatting.html    |  8 ++++----
 .../layout/res_parser/formatting_html32/formatting.html  |  8 ++++----
 .../formatting_html_no_texi2html/formatting.html         |  4 ++--
 .../res_parser/formatting_html_nodes/formatting_abt.html |  2 +-
 .../res_parser/formatting_html_nodes/formatting_fot.html |  2 +-
 .../res_parser/formatting_html_nodes/formatting_ovr.html |  2 +-
 .../res_parser/formatting_html_nodes/formatting_toc.html |  2 +-
 .../res_parser/formatting_inline_css/formatting.html     |  8 ++++----
 .../layout/res_parser/formatting_mathjax/formatting.html |  8 ++++----
 .../res_parser/formatting_nodes/formatting_abt.html      |  2 +-
 .../res_parser/formatting_nodes/formatting_fot.html      |  2 +-
 .../res_parser/formatting_nodes/formatting_ovr.html      |  2 +-
 .../res_parser/formatting_nodes/formatting_toc.html      |  2 +-
 .../formatting_numerical_entities/formatting.html        |  8 ++++----
 .../formatting_regions/formatting_regions.html           |  8 ++++----
 .../res_parser/formatting_weird_quotes/formatting.html   |  8 ++++----
 .../layout/res_parser/formatting_xhtml/formatting.html   |  8 ++++----
 .../navigation_abt.html                                  |  2 +-
 .../navigation_toc.html                                  |  2 +-
 .../no_monolithic_only_toc_out/no_monolithic.html        |  8 ++++----
 .../res_parser/sectioning_directions/sectioning.html     |  4 ++--
 .../sectioning_abt.html                                  |  2 +-
 .../sectioning_toc.html                                  |  2 +-
 .../tex_html/res_parser/formatting_singular/sing_abt.htm |  2 +-
 .../tex_html/res_parser/formatting_singular/sing_fot.htm |  2 +-
 .../tex_html/res_parser/formatting_singular/sing_ovr.htm |  2 +-
 .../tex_html/res_parser/formatting_singular/sing_toc.htm |  2 +-
 .../tex_html/res_parser/simplest_httex/simplest.html     |  2 +-
 .../res_parser/tex_in_copying/tex_in_copying.html        |  2 +-
 208 files changed, 304 insertions(+), 294 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f099873df5..6e8b92870c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2022-01-06  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/HTML.pm (%defaults): more consistent
+       'misc_elements_targets'.
+
+       * tp/Texinfo/Convert/HTML.pm (_contents_inline_element)
+       (_convert_special_element_type): more consistent class names, always
+       use SPECIAL_ELEMENTS_CLASS for class names.
+
 2022-01-05  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/HTML.pm (special_element, global_element)
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 513f0c67bb..332af9aaea 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -1332,9 +1332,9 @@ my %defaults = (
                              [ 'Up', 
\&_default_panel_button_dynamic_direction_node_footer ],
                              ' ', 'Contents', 'Index'],
   'misc_elements_targets'   => {
-                             'shortcontents' => 'SEC_Overview',
+                             'shortcontents' => 'SEC_Shortcontents',
                              'contents' => 'SEC_Contents',
-                             'footnotes' => 'SEC_Foot',
+                             'footnotes' => 'SEC_Footnotes',
                              'about' => 'SEC_About',
                              'Top' => 'SEC_Top',
                             },
@@ -3399,7 +3399,7 @@ sub _convert_displaymath_command($$$$)
   }
 
   my $result = '';
-  $result .= $self->html_attribute_class('div', 'displaymath').'>';
+  $result .= $self->html_attribute_class('div', $cmdname).'>';
   if ($self->get_conf('HTML_MATH')
         and $self->get_conf('HTML_MATH') eq 'mathjax') {
     $self->{'element_math'} = 1;
@@ -4474,8 +4474,10 @@ sub _contents_inline_element($$$)
       = 
$self->get_conf('SPECIAL_ELEMENTS_DIRECTIONS')->{$special_element_type};
     my $special_element
       = $self->special_element($special_element_direction);
+    my $class = 
$self->get_conf('SPECIAL_ELEMENTS_CLASS')->{$special_element_type};
+    # FIXME is -element the best suffix?
+    my $result = $self->html_attribute_class('div', "${class}-element");
     my $heading;
-    my $result = $self->html_attribute_class('div', 
"${special_element_type}_element");
     if ($special_element) {
       my $id = $self->command_id($special_element);
       if ($id ne '') {
@@ -4490,7 +4492,6 @@ sub _contents_inline_element($$$)
                               "convert $cmdname special heading");
     }
     $result .= ">\n";
-    my $class = 
$self->get_conf('SPECIAL_ELEMENTS_CLASS')->{$special_element_type};
     $result .= &{$self->{'format_heading_text'}}($self, $class.'-heading',
                        $heading, $self->get_conf('CHAPTER_HEADER_LEVEL'))."\n";
     $result .= $content . "</div>\n";
@@ -5475,7 +5476,8 @@ sub _convert_special_element_type($$$$)
   my $special_element_type = $element->{'extra'}->{'special_element_type'};
   $result .= join('', $self->close_registered_sections_level(0));
   my $id = $self->command_id($element);
-  $result .= $self->html_attribute_class('div', 
"${special_element_type}_element");
+  my $class = 
$self->get_conf('SPECIAL_ELEMENTS_CLASS')->{$special_element_type};
+  $result .= $self->html_attribute_class('div', "${class}-element");
   if ($id ne '') {
     $result .= " id=\"$id\"";
   }
@@ -5487,7 +5489,6 @@ sub _convert_special_element_type($$$$)
                $self->get_conf('MISC_BUTTONS'), undef, $element);
   }
   my $heading = $self->command_text($element);
-  my $class = 
$self->get_conf('SPECIAL_ELEMENTS_CLASS')->{$special_element_type};
   my $level = $self->get_conf('CHAPTER_HEADER_LEVEL');
   if ($special_element_type eq 'footnotes') {
     $level = $self->get_conf('FOOTNOTE_SEPARATE_HEADER_LEVEL');
diff --git a/tp/t/results/converters_tests/ref_in_sectioning.pl 
b/tp/t/results/converters_tests/ref_in_sectioning.pl
index 09116cb412..1d600dfbff 100644
--- a/tp/t/results/converters_tests/ref_in_sectioning.pl
+++ b/tp/t/results/converters_tests/ref_in_sectioning.pl
@@ -2518,7 +2518,7 @@ $result_converted{'html_text'}->{'ref_in_sectioning'} = '
 <h1 class="top" id="for-example-node-_0028node_0029-_0028Top_0029">for example 
<a href="#node">See <a data-manual="file name" href="file 
name.html#node">title</a> in <cite>Manual</cite>.</a> (see <a href="#node">See 
<a data-manual="file name" href="file name.html#node">title</a> in 
<cite>Manual</cite>.</a>) (see <cite><a data-manual="file" 
href="file.html#Top">Manual</a></cite>)</h1>
 
 
-<div class="contents_element">
+<div class="contents-element">
 <h2 class="contents-heading">Table of Contents</h2>
 
 <div class="contents">
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 a28c55be60..4b297059d6 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
@@ -911,7 +911,7 @@ Previous: <a href="#Top" accesskey="p" rel="prev">2 
footnotes in 2 nodes</a>, Up
 </p>
 </div>
 </div>
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <div class="header">
 <p>
  &nbsp; </p>
@@ -1073,7 +1073,7 @@ 
$result_converted{'html_text'}->{'two_footnotes_in_nodes_separate'} = '<div clas
 </p>
 </div>
 </div>
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <div class="header">
 <p>
  &nbsp; </p>
diff --git a/tp/t/results/formats_encodings/sample_utf8/res_html/index.html 
b/tp/t/results/formats_encodings/sample_utf8/res_html/index.html
index ac42cd71b8..4a88c5731f 100644
--- a/tp/t/results/formats_encodings/sample_utf8/res_html/index.html
+++ b/tp/t/results/formats_encodings/sample_utf8/res_html/index.html
@@ -74,7 +74,7 @@ Texinfo中文示例
 </p>
 
 
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
 <div class="contents">
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 3705051816..dff1a1d361 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
@@ -54,7 +54,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 1a6a9aa3de..a157b322cc 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
@@ -54,7 +54,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <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/texi_bib_example.pl 
b/tp/t/results/formatting/texi_bib_example.pl
index 3fd478480a..a112a67fce 100644
--- a/tp/t/results/formatting/texi_bib_example.pl
+++ b/tp/t/results/formatting/texi_bib_example.pl
@@ -5769,7 +5769,7 @@ Massachusetts, 1994.
 </div>
 </div>
 <hr>
-<div class="about_element" id="SEC_About">
+<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>
diff --git a/tp/t/results/formatting/texi_glossary.pl 
b/tp/t/results/formatting/texi_glossary.pl
index 70459e66cb..c81e707332 100644
--- a/tp/t/results/formatting/texi_glossary.pl
+++ b/tp/t/results/formatting/texi_glossary.pl
@@ -1670,7 +1670,7 @@ ul.no-bullet {list-style: none}
 </div>
 </div>
 <hr>
-<div class="about_element" id="SEC_About">
+<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>
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 080f430bcb..ced35ca929 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
@@ -347,7 +347,7 @@ ul.no-bullet {list-style: none}
 <body lang="en">
 <div class="top" id="top">
 <h1 class="top">top</h1>
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
 <div class="contents">
@@ -361,7 +361,7 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 </div>
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <h2 class="shortcontents-heading">Short Table of Contents</h2>
 
 <div class="shortcontents">
diff --git 
a/tp/t/results/html_tests/footnotestyle_separate_late/res_html/footnotestyle_separate_late_fot.html
 
b/tp/t/results/html_tests/footnotestyle_separate_late/res_html/footnotestyle_separate_late_fot.html
index d2e96458f8..2fe4c57df8 100644
--- 
a/tp/t/results/html_tests/footnotestyle_separate_late/res_html/footnotestyle_separate_late_fot.html
+++ 
b/tp/t/results/html_tests/footnotestyle_separate_late/res_html/footnotestyle_separate_late_fot.html
@@ -47,7 +47,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <div class="header">
 <p>
  &nbsp; </p>
diff --git a/tp/t/results/html_tests/shortcontents_no_top.pl 
b/tp/t/results/html_tests/shortcontents_no_top.pl
index 1fb0bb0efa..ddbd100615 100644
--- a/tp/t/results/html_tests/shortcontents_no_top.pl
+++ b/tp/t/results/html_tests/shortcontents_no_top.pl
@@ -289,7 +289,7 @@ ul.no-bullet {list-style: none}
 <div class="section" id="sec">
 <h3 class="section">2.1 sec</h3>
 
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <h2 class="shortcontents-heading">Short Table of Contents</h2>
 
 <div class="shortcontents">
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 3e6db572a0..14d3590e30 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
@@ -362,7 +362,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
 <div class="contents">
diff --git 
a/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl 
b/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl
index 5d3bbecfed..5b8d0963be 100644
--- a/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl
+++ b/tp/t/results/html_tests/text_before_top_and_summarycontents_after_title.pl
@@ -361,7 +361,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <h2 class="shortcontents-heading">Short Table of Contents</h2>
 
 <div class="shortcontents">
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 1fcf4187a6..5cda19454b 100644
--- a/tp/t/results/htmlxref/htmlxref/res_html/test_refs.html
+++ b/tp/t/results/htmlxref/htmlxref/res_html/test_refs.html
@@ -172,7 +172,7 @@ split: ../doc/node.html#node
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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>
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 11d2e14d66..d5398a20c5 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 1fcf4187a6..5cda19454b 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
@@ -172,7 +172,7 @@ split: ../doc/node.html#node
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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>
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 11d2e14d66..d5398a20c5 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 f0de1b93aa..a345e94ef9 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
@@ -172,7 +172,7 @@ split: ../doc/node.html#node
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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>
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 11d2e14d66..d5398a20c5 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 34c17f9f00..8f6d83f9f9 100644
--- a/tp/t/results/indices/index_entry_in_footnote_separate.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_separate.pl
@@ -727,7 +727,7 @@ 
$result_converted{'html_text'}->{'index_entry_in_footnote_separate'} = '<a class
 <a class="summary-letter" href="#t_h_cp_letter-I"><b>I</b></a>
  &nbsp; 
 </td></tr></table>
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <div class="header">
 <p>
  &nbsp; [<a href="#First" title="Index" rel="index">Index</a>]</p>
diff --git a/tp/t/results/languages/appendix_translated.pl 
b/tp/t/results/languages/appendix_translated.pl
index ce52af9b94..7003ad5941 100644
--- a/tp/t/results/languages/appendix_translated.pl
+++ b/tp/t/results/languages/appendix_translated.pl
@@ -378,7 +378,7 @@ ul.no-bullet {list-style: none}
 <div class="top" id="Top">
 <h1 class="top" id="top">top</h1>
 
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h2 class="contents-heading">Table des mati&egrave;res</h2>
 
 <div class="contents">
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 f18461b1f9..eec6d381cf 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
@@ -190,7 +190,7 @@ ul.no-bullet {list-style: none}
 </p><hr style="height: 6px;">
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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>
diff --git a/tp/t/results/layout/navigation/res_html/navigation.html 
b/tp/t/results/layout/navigation/res_html/navigation.html
index 1e1077c8ae..dae95d3371 100644
--- a/tp/t/results/layout/navigation/res_html/navigation.html
+++ b/tp/t/results/layout/navigation/res_html/navigation.html
@@ -165,7 +165,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.
 </div>
 </div>
 </div>
-<div class="contents_element" id="SEC_Contents">
+<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>
@@ -187,7 +187,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>
 </div>
 </div><hr>
-<div class="about_element" id="SEC_About">
+<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>
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 92d1e2b394..8f51d69c13 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 fcc0dd6f8a..e52d262d6f 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<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>
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 92d1e2b394..8f51d69c13 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 fcc0dd6f8a..e52d262d6f 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<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>
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 62a27b390b..cfd3214f42 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<div class="about-element" id="SEC_About">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
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 07792562d5..cb25676808 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git 
a/tp/t/results/layout/navigation_chapter_vertical/res_html/navigation_abt.html 
b/tp/t/results/layout/navigation_chapter_vertical/res_html/navigation_abt.html
index 62a27b390b..cfd3214f42 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<div class="about-element" id="SEC_About">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git 
a/tp/t/results/layout/navigation_chapter_vertical/res_html/navigation_toc.html 
b/tp/t/results/layout/navigation_chapter_vertical/res_html/navigation_toc.html
index 07792562d5..cb25676808 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git a/tp/t/results/layout/navigation_no_header/res_html/navigation.html 
b/tp/t/results/layout/navigation_no_header/res_html/navigation.html
index ef84d23301..898d7aca3c 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
@@ -112,7 +112,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.
 </div>
 </div>
 </div>
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
 <div class="contents">
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 d6bcf45e26..384c6d564a 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
@@ -118,7 +118,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.
 </div>
 </div>
 </div>
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
 <div class="contents">
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 4636d57fbe..e7c27a95c0 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 7bba256b2a..a91f074f6a 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<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>
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 68a115f24b..d3585043f5 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 7511caa08f..bebe937f3b 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<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>
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 8ffc0ec9ee..d08accd23a 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<div class="about-element" id="SEC_About">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git 
a/tp/t/results/layout/navigation_node_no_header_vertical/res_html/navigation_toc.html
 
b/tp/t/results/layout/navigation_node_no_header_vertical/res_html/navigation_toc.html
index 2831fbd62f..2ae40a91c8 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git 
a/tp/t/results/layout/navigation_node_vertical/res_html/navigation_abt.html 
b/tp/t/results/layout/navigation_node_vertical/res_html/navigation_abt.html
index 62a27b390b..cfd3214f42 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<div class="about-element" id="SEC_About">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git 
a/tp/t/results/layout/navigation_node_vertical/res_html/navigation_toc.html 
b/tp/t/results/layout/navigation_node_vertical/res_html/navigation_toc.html
index b04e42f351..49b5c90d6c 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
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 92d1e2b394..8f51d69c13 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 a3379471f7..515c3a3b98 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<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>
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 92d1e2b394..8f51d69c13 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 a3379471f7..515c3a3b98 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<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>
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 62a27b390b..cfd3214f42 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<div class="about-element" id="SEC_About">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git 
a/tp/t/results/layout/navigation_section_no_header_vertical/res_html/navigation_toc.html
 
b/tp/t/results/layout/navigation_section_no_header_vertical/res_html/navigation_toc.html
index 3a39149b6e..11dd22eaab 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git 
a/tp/t/results/layout/navigation_section_vertical/res_html/navigation_abt.html 
b/tp/t/results/layout/navigation_section_vertical/res_html/navigation_abt.html
index 62a27b390b..cfd3214f42 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<div class="about-element" id="SEC_About">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git 
a/tp/t/results/layout/navigation_section_vertical/res_html/navigation_toc.html 
b/tp/t/results/layout/navigation_section_vertical/res_html/navigation_toc.html
index 3a39149b6e..11dd22eaab 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
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 c69faecfff..b2053d16aa 100644
--- a/tp/t/results/layout/navigation_vertical/res_html/navigation.html
+++ b/tp/t/results/layout/navigation_vertical/res_html/navigation.html
@@ -219,7 +219,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.
 </div>
 </div>
 </div>
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
@@ -257,7 +257,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.
 </tr>
 </table>
 <hr>
-<div class="about_element" id="SEC_About">
+<div class="about-element" id="SEC_About">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
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 ef659c9875..a338d6a9df 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 d173aa55c8..71193985cd 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <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 3b0f9b68b9..11a41b056b 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <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 d6d2322da2..d2771aa954 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<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>
diff --git a/tp/t/results/morecoverage/formatting_fr.pl 
b/tp/t/results/morecoverage/formatting_fr.pl
index 2dd8d95953..64a4055510 100644
--- a/tp/t/results/morecoverage/formatting_fr.pl
+++ b/tp/t/results/morecoverage/formatting_fr.pl
@@ -5313,7 +5313,7 @@ Menu comment
 </div>
 </div>
 <hr>
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Couverture (top) 
du document">Racine</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table des 
mati&egrave;res">Table des mati&egrave;res</a>]</td>
@@ -5325,7 +5325,7 @@ Menu comment
 <h5><a id="FOOT1" href="#DOCF1">(1)</a></h5>
 <p>in footnote</p>
 </div><hr>
-<div class="contents_element" id="SEC_Contents">
+<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="Couverture (top) 
du document">Racine</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table des 
mati&egrave;res">Table des mati&egrave;res</a>]</td>
@@ -5352,7 +5352,7 @@ Menu comment
 </ul>
 </div>
 </div><hr>
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Couverture (top) 
du document">Racine</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table des 
mati&egrave;res">Table des mati&egrave;res</a>]</td>
@@ -5368,7 +5368,7 @@ Menu comment
 </ul>
 </div>
 </div><hr>
-<div class="about_element" id="SEC_About">
+<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="Couverture (top) 
du document">Racine</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table des 
mati&egrave;res">Table des mati&egrave;res</a>]</td>
@@ -5870,7 +5870,7 @@ Menu comment
 </div>
 </div>
 <hr>
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Couverture (top) 
du document">Racine</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table des 
mati&egrave;res">Table des mati&egrave;res</a>]</td>
@@ -5882,7 +5882,7 @@ Menu comment
 <h5><a id="FOOT1" href="#DOCF1">(1)</a></h5>
 <p>in footnote</p>
 </div><hr>
-<div class="contents_element" id="SEC_Contents">
+<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="Couverture (top) 
du document">Racine</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table des 
mati&egrave;res">Table des mati&egrave;res</a>]</td>
@@ -5909,7 +5909,7 @@ Menu comment
 </ul>
 </div>
 </div><hr>
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="#Top" title="Couverture (top) 
du document">Racine</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table des 
mati&egrave;res">Table des mati&egrave;res</a>]</td>
@@ -5925,7 +5925,7 @@ Menu comment
 </ul>
 </div>
 </div><hr>
-<div class="about_element" id="SEC_About">
+<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="Couverture (top) 
du document">Racine</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_Contents" title="Table des 
mati&egrave;res">Table des mati&egrave;res</a>]</td>
diff --git a/tp/t/results/morecoverage/texi_formatting.pl 
b/tp/t/results/morecoverage/texi_formatting.pl
index 7ac927194a..49baa2dabc 100644
--- a/tp/t/results/morecoverage/texi_formatting.pl
+++ b/tp/t/results/morecoverage/texi_formatting.pl
@@ -5058,7 +5058,7 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">chapter</a> &nbsp; [<a href="#
 </p>
 
 
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
 <div class="contents">
@@ -5079,7 +5079,7 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">chapter</a> &nbsp; [<a href="#
 </ul>
 </div>
 </div>
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <h2 class="shortcontents-heading">Short Table of Contents</h2>
 
 <div class="shortcontents">
@@ -5375,7 +5375,7 @@ $result_converted{'html_text'}->{'texi_formatting'} = '
 </p>
 
 
-<div class="contents_element">
+<div class="contents-element">
 <h2 class="contents-heading">Table of Contents</h2>
 
 <div class="contents">
@@ -5396,7 +5396,7 @@ $result_converted{'html_text'}->{'texi_formatting'} = '
 </ul>
 </div>
 </div>
-<div class="shortcontents_element">
+<div class="shortcontents-element">
 <h2 class="shortcontents-heading">Short Table of Contents</h2>
 
 <div class="shortcontents">
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 eb3599a945..6f12176150 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 b96d81d46c..4b15d0d5cb 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 efa5e21c33..d36b906675 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 d8a0f1a59a..32fd240c57 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 738b1f029c..0be99e9b8e 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
@@ -821,7 +821,7 @@ ul.no-bullet {list-style: none}
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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>
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 216b613c60..c33bbf8df6 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 18a6ab8743..cae09ed771 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 b052d89a8d..16d729538a 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
@@ -114,7 +114,7 @@ ul.no-bullet {list-style: none}
 <p>Ref to @samp{node} <a href="#node">node</a>.
 </p>
 <hr style="height: 6px;">
-<div class="about_element" id="SEC_About">
+<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>
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 4bcf51beca..5eb4fe3478 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
@@ -316,7 +316,7 @@ ul.no-bullet {list-style: none}
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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>
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 45c9d58d91..60153b6753 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 3e47aaf440..6ea65a6fd6 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 692b8ef93a..336bbde54d 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
@@ -109,7 +109,7 @@ ul.no-bullet {list-style: none}
 
 <hr style="height: 6px;">
 </div>
-<div class="about_element" id="SEC_About">
+<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>
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 3e47aaf440..6ea65a6fd6 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 ed0609e775..31011a5fed 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 a1e928a94e..167e8d28ef 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <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 e470161745..4eb6575a9c 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<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>
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 293bc5dcb7..0840e82471 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
@@ -92,7 +92,7 @@ ul.no-bullet {list-style: none}
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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>
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 293bc5dcb7..0840e82471 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
@@ -92,7 +92,7 @@ ul.no-bullet {list-style: none}
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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>
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 43a4e22da4..cf653e138b 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
@@ -95,7 +95,7 @@ ul.no-bullet {list-style: none}
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <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>
@@ -121,7 +121,7 @@ ul.no-bullet {list-style: none}
 </p>
 <p>para2</p>
 </div><hr>
-<div class="about_element" id="SEC_About">
+<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>
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 43a4e22da4..cf653e138b 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
@@ -95,7 +95,7 @@ ul.no-bullet {list-style: none}
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <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>
@@ -121,7 +121,7 @@ ul.no-bullet {list-style: none}
 </p>
 <p>para2</p>
 </div><hr>
-<div class="about_element" id="SEC_About">
+<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>
diff --git a/tp/t/results/sectioning/anchor_in_footnote_separate.pl 
b/tp/t/results/sectioning/anchor_in_footnote_separate.pl
index b31a6c0951..a0f6723dcd 100644
--- a/tp/t/results/sectioning/anchor_in_footnote_separate.pl
+++ b/tp/t/results/sectioning/anchor_in_footnote_separate.pl
@@ -771,7 +771,7 @@ Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, 
Up: <a href="#Top" ac
 <p><a href="#Anchor-in-footnote">Anchor in footnote</a>.
 </p></div>
 </div>
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <div class="header">
 <p>
  &nbsp; </p>
diff --git a/tp/t/results/sectioning/chapter_before_and_after_part.pl 
b/tp/t/results/sectioning/chapter_before_and_after_part.pl
index 333e9e3c0f..255e23b652 100644
--- a/tp/t/results/sectioning/chapter_before_and_after_part.pl
+++ b/tp/t/results/sectioning/chapter_before_and_after_part.pl
@@ -446,7 +446,7 @@ ul.no-bullet {list-style: none}
 <div class="chapter" id="chapter-2">
 <h2 class="chapter">2 chapter 2</h2>
 
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
 <div class="contents">
diff --git a/tp/t/results/sectioning/chapter_between_nodes.pl 
b/tp/t/results/sectioning/chapter_between_nodes.pl
index 7a91572679..a239fb1cfd 100644
--- a/tp/t/results/sectioning/chapter_between_nodes.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes.pl
@@ -804,7 +804,7 @@ Previous: <a href="#Top" accesskey="p" rel="prev">top 
section</a>, Up: <a href="
 
 <p>section.
 </p>
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
 <div class="contents">
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 d969384f97..3dbf08591c 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
@@ -693,7 +693,7 @@ Previous: <a href="#Top" accesskey="p" 
rel="prev">chapter</a>, Up: <a href="#Top
 <div class="chapter" id="after">
 <h2 class="chapter" id="chapter-2">2 chapter 2</h2>
 
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
 <div class="contents">
diff --git a/tp/t/results/sectioning/contents.pl 
b/tp/t/results/sectioning/contents.pl
index e27c5f09c5..fa4bcef8f2 100644
--- a/tp/t/results/sectioning/contents.pl
+++ b/tp/t/results/sectioning/contents.pl
@@ -803,7 +803,7 @@ ul.no-bullet {list-style: none}
 <div class="top" id="top">
 <h1 class="top">top</h1>
 
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
 <div class="contents">
diff --git a/tp/t/results/sectioning/contents_and_shortcontents.pl 
b/tp/t/results/sectioning/contents_and_shortcontents.pl
index 918c13f81b..51bf19d044 100644
--- a/tp/t/results/sectioning/contents_and_shortcontents.pl
+++ b/tp/t/results/sectioning/contents_and_shortcontents.pl
@@ -839,7 +839,7 @@ ul.no-bullet {list-style: none}
 <div class="top" id="top">
 <h1 class="top">top</h1>
 
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
 <div class="contents">
@@ -871,7 +871,7 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 </div>
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <h2 class="shortcontents-heading">Short Table of Contents</h2>
 
 <div class="shortcontents">
diff --git a/tp/t/results/sectioning/contents_in_html_text.pl 
b/tp/t/results/sectioning/contents_in_html_text.pl
index 517ad97b61..ac9f285ca5 100644
--- a/tp/t/results/sectioning/contents_in_html_text.pl
+++ b/tp/t/results/sectioning/contents_in_html_text.pl
@@ -331,7 +331,7 @@ $result_converted{'html_text'}->{'contents_in_html_text'} = 
'<div class="top" id
 <div class="chapter" id="Chap2">
 <h2 class="chapter">2 Chap2</h2>
 
-<div class="shortcontents_element">
+<div class="shortcontents-element">
 <h2 class="shortcontents-heading">Short Table of Contents</h2>
 
 <div class="shortcontents">
@@ -341,7 +341,7 @@ $result_converted{'html_text'}->{'contents_in_html_text'} = 
'<div class="top" id
 </ul>
 </div>
 </div>
-<div class="contents_element">
+<div class="contents-element">
 <h2 class="contents-heading">Table of Contents</h2>
 
 <div class="contents">
diff --git a/tp/t/results/sectioning/no_argument_and_contents.pl 
b/tp/t/results/sectioning/no_argument_and_contents.pl
index f5977b10f7..dfa1f69245 100644
--- a/tp/t/results/sectioning/no_argument_and_contents.pl
+++ b/tp/t/results/sectioning/no_argument_and_contents.pl
@@ -260,7 +260,7 @@ ul.no-bullet {list-style: none}
 <div class="top" id="for-example">
 <h1 class="top">for example</h1>
 
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
 <div class="contents">
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 930b4c3fca..1953859af8 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
@@ -1403,7 +1403,7 @@ Next: <a href="#chapter-node" accesskey="n" 
rel="next">chapter node</a> &nbsp; [
 <h1 class="top" id="top">top</h1>
 
 
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
 <div class="contents">
diff --git a/tp/t/results/sectioning/section_before_part.pl 
b/tp/t/results/sectioning/section_before_part.pl
index 4797fa91fa..5b47d7b4e4 100644
--- a/tp/t/results/sectioning/section_before_part.pl
+++ b/tp/t/results/sectioning/section_before_part.pl
@@ -250,7 +250,7 @@ ul.no-bullet {list-style: none}
 <h1 class="part">part</h1>
 <hr>
 
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
 <div class="contents">
diff --git a/tp/t/results/sectioning/section_below_unnumbered.pl 
b/tp/t/results/sectioning/section_below_unnumbered.pl
index 5e7451bc74..343345df47 100644
--- a/tp/t/results/sectioning/section_below_unnumbered.pl
+++ b/tp/t/results/sectioning/section_below_unnumbered.pl
@@ -940,7 +940,7 @@ Next: <a href="#Unn" accesskey="n" rel="next">Unn</a> 
&nbsp; [<a href="#SEC_Cont
 </p>
 
 
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
 <div class="contents">
diff --git a/tp/t/results/sectioning/section_in_unnumbered_info.pl 
b/tp/t/results/sectioning/section_in_unnumbered_info.pl
index 80be600574..dd85c950a3 100644
--- a/tp/t/results/sectioning/section_in_unnumbered_info.pl
+++ b/tp/t/results/sectioning/section_in_unnumbered_info.pl
@@ -8170,7 +8170,7 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">chapter</a> &nbsp; [<a href="#
 <p>Menu:
 </p>
 
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
 <div class="contents">
diff --git a/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl 
b/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
index fdc0cf7453..2324e22c6f 100644
--- a/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
+++ b/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
@@ -7992,7 +7992,7 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">chapter</a> &nbsp; [<a href="#
 <p>Menu:
 </p>
 
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
 <div class="contents">
diff --git a/tp/t/results/sectioning/shortcontents.pl 
b/tp/t/results/sectioning/shortcontents.pl
index de3566763f..09c08a2e4f 100644
--- a/tp/t/results/sectioning/shortcontents.pl
+++ b/tp/t/results/sectioning/shortcontents.pl
@@ -798,7 +798,7 @@ ul.no-bullet {list-style: none}
 <div class="top" id="top">
 <h1 class="top">top</h1>
 
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <h2 class="shortcontents-heading">Short Table of Contents</h2>
 
 <div class="shortcontents">
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 243b15eaa3..567e4761d7 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
@@ -142,7 +142,7 @@ ul.no-bullet {list-style: none}
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="contents_element" id="SEC_Contents">
+<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>
@@ -166,7 +166,7 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 </div><hr>
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <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>
@@ -188,7 +188,7 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 </div><hr>
-<div class="about_element" id="SEC_About">
+<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>
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 8370c15fa2..92bad742ad 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
@@ -92,7 +92,7 @@ ul.no-bullet {list-style: none}
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="contents_element" id="SEC_Contents">
+<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>
@@ -108,7 +108,7 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 </div><hr>
-<div class="about_element" id="SEC_About">
+<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>
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 83309fea99..61281ef116 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
@@ -49,7 +49,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
 <div class="contents">
@@ -102,7 +102,7 @@ ul.no-bullet {list-style: none}
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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>
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 9c99b348a1..ab43ffbb22 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
@@ -92,7 +92,7 @@ ul.no-bullet {list-style: none}
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="contents_element" id="SEC_Contents">
+<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>
@@ -108,7 +108,7 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 </div><hr>
-<div class="about_element" id="SEC_About">
+<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>
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 c1abba3ca0..01b69df6af 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
@@ -89,7 +89,7 @@ ul.no-bullet {list-style: none}
 
 <p>The chapter
 </p>
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
 <div class="contents">
@@ -102,7 +102,7 @@ ul.no-bullet {list-style: none}
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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>
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 efc748683f..b094c396ba 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
@@ -119,7 +119,7 @@ ul.no-bullet {list-style: none}
 </div>
 </div>
 </div>
-<div class="contents_element" id="SEC_Contents">
+<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>
@@ -138,7 +138,7 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 </div><hr>
-<div class="about_element" id="SEC_About">
+<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>
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 ca57a7eaec..c0194c78b9 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
@@ -88,7 +88,7 @@ ul.no-bullet {list-style: none}
 <h1 class="chapter" id="Chapter-1">1 Chapter 1</h1>
 
 <p>The chapter with contents
-</p><div class="contents_element" id="SEC_Contents">
+</p><div class="contents-element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
 <div class="contents">
@@ -132,7 +132,7 @@ ul.no-bullet {list-style: none}
 </div>
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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>
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 b6cab7ed9d..3d6f05c8d5 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
@@ -142,7 +142,7 @@ ul.no-bullet {list-style: none}
 </div>
 </div>
 </div>
-<div class="contents_element" id="SEC_Contents">
+<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>
@@ -162,7 +162,7 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 </div><hr>
-<div class="about_element" id="SEC_About">
+<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>
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 ec7d34d365..9749b59ea5 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
@@ -115,7 +115,7 @@ ul.no-bullet {list-style: none}
 <h2 class="section" id="section-1">1.1 section</h2>
 
 <p>The section with contents
-</p><div class="contents_element" id="SEC_Contents">
+</p><div class="contents-element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
 <div class="contents">
@@ -156,7 +156,7 @@ ul.no-bullet {list-style: none}
 </div>
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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>
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 ba3b21f498..cd095d06ca 100644
--- a/tp/tests/contents/res_parser/double_contents/double_contents.html
+++ b/tp/tests/contents/res_parser/double_contents/double_contents.html
@@ -117,7 +117,7 @@ ul.no-bullet {list-style: none}
 </div>
 </div>
 </div>
-<div class="contents_element" id="SEC_Contents">
+<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>
@@ -136,7 +136,7 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 </div><hr>
-<div class="about_element" id="SEC_About">
+<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>
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 93338a2a12..781cba1e00 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
 <div class="contents">
@@ -131,7 +131,7 @@ ul.no-bullet {list-style: none}
 </div>
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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>
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 93338a2a12..781cba1e00 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
 <div class="contents">
@@ -131,7 +131,7 @@ ul.no-bullet {list-style: none}
 </div>
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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>
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 810a03fad9..efe44d937a 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 d7405655e3..615923d022 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
 <div class="contents">
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 b4eb9f73fd..6985db9146 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
@@ -50,7 +50,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
 <div class="contents">
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 239fbbc9db..ca2b0854e9 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
@@ -49,7 +49,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
 <div class="contents">
@@ -92,7 +92,7 @@ ul.no-bullet {list-style: none}
 <li> <a href="#section">1.1 section with contents</a> </li>
 </ul>
 
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
 <div class="contents">
@@ -119,7 +119,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
 <h2 class="section" id="section-with-contents">1.1 section with contents</h2>
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
 <div class="contents">
@@ -137,7 +137,7 @@ ul.no-bullet {list-style: none}
 </div>
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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>
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 489d0ae7d8..6943226f2b 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 304b0388fe..9c7e24e82a 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<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>
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 ad8517b55b..1bccbc69bf 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,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
 <div class="contents">
@@ -100,7 +100,7 @@ ul.no-bullet {list-style: none}
 </tr></table>
 <h1 class="chapter" id="Chapter-1">1 Chapter 1</h1>
 
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
 <div class="contents">
@@ -138,7 +138,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
 <h2 class="section" id="section-with-contents">1.1 section with contents</h2>
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
 <div class="contents">
@@ -156,7 +156,7 @@ ul.no-bullet {list-style: none}
 </div>
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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>
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 a220c3a1ca..0fa08ad634 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
@@ -66,7 +66,7 @@ ul.no-bullet {list-style: none}
 </tr></table>
 <h1 class="chapter" id="Chapter-1">1 Chapter 1</h1>
 
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
 <div class="contents">
@@ -104,7 +104,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <h2 class="section" id="section-with-contents">1.1 section with contents</h2>
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
 <div class="contents">
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 810a03fad9..efe44d937a 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 dcc1fcf4ae..860e4c3ff8 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,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
 <div class="contents">
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 14fcd5ca78..dbff828de2 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
@@ -67,7 +67,7 @@ ul.no-bullet {list-style: none}
 <hr>
 <h1 class="chapter" id="Chapter-1">1 Chapter 1</h1>
 
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
 <div class="contents">
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 5678018036..998b76d7ea 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 f8c42f1a05..1256edd162 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,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
 <div class="contents">
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 11291dbdcc..8b1428db02 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
@@ -66,7 +66,7 @@ ul.no-bullet {list-style: none}
 </tr></table>
 <hr>
 <h2 class="section" id="section-with-contents">1.1 section with contents</h2>
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
 <div class="contents">
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 8d98ed5a30..5a8fa52247 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
@@ -66,7 +66,7 @@ ul.no-bullet {list-style: none}
 </tr></table>
 <h1 class="chapter" id="Chapter-1">1 Chapter 1</h1>
 
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
 <div class="contents">
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 810a03fad9..efe44d937a 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 994bfccb7c..03b9e2a546 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,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en">
 
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
 <div class="contents">
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 3b091c9268..c6334c5b6e 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
@@ -65,7 +65,7 @@ ul.no-bullet {list-style: none}
 <td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <h2 class="section" id="section-with-contents">1.1 section with contents</h2>
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
 <div class="contents">
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 6f5a3f1cad..b4ce69cd08 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 ac40b51f0c..0a01a27a99 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<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>
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 489d0ae7d8..6943226f2b 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 2b8c10dd2d..16db37e606 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<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>
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 747dfc1dd5..19b8907bc2 100644
--- a/tp/tests/contents/res_parser/no_content/no_content.html
+++ b/tp/tests/contents/res_parser/no_content/no_content.html
@@ -91,7 +91,7 @@ ul.no-bullet {list-style: none}
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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>
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 1ad0333509..1ecaf8330d 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
@@ -91,7 +91,7 @@ ul.no-bullet {list-style: none}
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="contents_element" id="SEC_Contents">
+<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>
@@ -107,7 +107,7 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 </div><hr>
-<div class="about_element" id="SEC_About">
+<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>
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 747dfc1dd5..19b8907bc2 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
@@ -91,7 +91,7 @@ ul.no-bullet {list-style: none}
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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>
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 747dfc1dd5..19b8907bc2 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
@@ -91,7 +91,7 @@ ul.no-bullet {list-style: none}
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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>
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 747dfc1dd5..19b8907bc2 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
@@ -91,7 +91,7 @@ ul.no-bullet {list-style: none}
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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>
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 1ad0333509..1ecaf8330d 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
@@ -91,7 +91,7 @@ ul.no-bullet {list-style: none}
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="contents_element" id="SEC_Contents">
+<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>
@@ -107,7 +107,7 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 </div><hr>
-<div class="about_element" id="SEC_About">
+<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>
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 747dfc1dd5..19b8907bc2 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
@@ -91,7 +91,7 @@ ul.no-bullet {list-style: none}
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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>
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 747dfc1dd5..19b8907bc2 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
@@ -91,7 +91,7 @@ ul.no-bullet {list-style: none}
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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>
diff --git 
a/tp/tests/formatting/res_parser/documentlanguage_cmdline/documentlanguage.html 
b/tp/tests/formatting/res_parser/documentlanguage_cmdline/documentlanguage.html
index 9cb0efb6f2..2874d3f403 100644
--- 
a/tp/tests/formatting/res_parser/documentlanguage_cmdline/documentlanguage.html
+++ 
b/tp/tests/formatting/res_parser/documentlanguage_cmdline/documentlanguage.html
@@ -104,7 +104,7 @@ ul.no-bullet {list-style: none}
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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="Couverture (top) 
du document">Racine</a>]</td>
 <td valign="middle" align="left">[Table des mati&egrave;res]</td>
diff --git a/tp/tests/formatting/res_parser/simplest_test_css/simplest.html 
b/tp/tests/formatting/res_parser/simplest_test_css/simplest.html
index 148d492df6..245331d096 100644
--- a/tp/tests/formatting/res_parser/simplest_test_css/simplest.html
+++ b/tp/tests/formatting/res_parser/simplest_test_css/simplest.html
@@ -96,7 +96,7 @@ ul.no-bullet {list-style: none}
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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>
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 c4666e4af4..ab396c525c 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
@@ -107,7 +107,7 @@ ul.no-bullet {list-style: none}
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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>
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 c325a33475..0622d6d0da 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
@@ -103,7 +103,7 @@ ul.no-bullet {list-style: none}
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <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>
@@ -119,7 +119,7 @@ ul.no-bullet {list-style: none}
 <a class="index-entry-anchor" id="index-index-entry-in-footnote"></a>
 </p>
 </div><hr>
-<div class="about_element" id="SEC_About">
+<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>
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 946638f99d..d8837e15e5 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
@@ -444,7 +444,7 @@ ul.no-bullet {list-style: none}
 </p>
 <hr style="height: 6px;">
 </div>
-<div class="about_element" id="SEC_About">
+<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>
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 777ada468b..277b25e8f6 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 912d8edb8a..50b104e312 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
@@ -54,7 +54,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 0bbeb6765b..de8702b4eb 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
@@ -54,7 +54,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <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 4b544a9546..4f63234b41 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
@@ -54,7 +54,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<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>
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 78ac1b4282..7df371346b 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
@@ -54,7 +54,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 19ed4cb303..846cbce4af 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
@@ -54,7 +54,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <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 d31e65f3eb..3f15761e77 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
@@ -54,7 +54,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<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>
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 3fa3f98821..0b8561be5e 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
@@ -54,7 +54,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 cfa746edf0..ead91fa1a1 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
@@ -54,7 +54,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<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>
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 98d4316d70..dea292a216 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
@@ -54,7 +54,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 e4009801ed..b1f2719baf 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
@@ -54,7 +54,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <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 ab1c4b4748..320b64fbe4 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
@@ -54,7 +54,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<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>
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 9898cebbad..657bcbebbb 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
@@ -54,7 +54,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 b6c22d0377..33d2bb006f 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
@@ -54,7 +54,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<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>
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 86ac856d22..5663013cd2 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
@@ -54,7 +54,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 a7d9987666..36e5a03481 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
@@ -54,7 +54,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <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 511ec0b1ee..aff6e3ed8a 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
@@ -54,7 +54,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<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>
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 13dc554d26..235ea37af6 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
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 8b8940357b..abb8e5e55b 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<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>
diff --git 
a/tp/tests/indices/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.html
 
b/tp/tests/indices/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.html
index f890b78209..e16c4f2e2b 100644
--- 
a/tp/tests/indices/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.html
+++ 
b/tp/tests/indices/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.html
@@ -362,7 +362,7 @@ enum
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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>
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 56e4101c3d..772fb52321 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
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
diff --git 
a/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/nodes_before_top_and_sections_abt.html
 
b/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/nodes_before_top_and_sections_abt.html
index a28205d5e5..19bb2c0020 100644
--- 
a/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/nodes_before_top_and_sections_abt.html
+++ 
b/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/nodes_before_top_and_sections_abt.html
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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>
diff --git 
a/tp/tests/indices/res_parser/printindex_between_node_section/printindex_between_node_section.html
 
b/tp/tests/indices/res_parser/printindex_between_node_section/printindex_between_node_section.html
index f6c5864ba7..da7e320696 100644
--- 
a/tp/tests/indices/res_parser/printindex_between_node_section/printindex_between_node_section.html
+++ 
b/tp/tests/indices/res_parser/printindex_between_node_section/printindex_between_node_section.html
@@ -164,7 +164,7 @@ ul.no-bullet {list-style: none}
 </div>
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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>
diff --git 
a/tp/tests/indices/res_parser/printindex_between_part_chapter/printindex_between_part_chapter.html
 
b/tp/tests/indices/res_parser/printindex_between_part_chapter/printindex_between_part_chapter.html
index 4b96b5de21..139ddebe4e 100644
--- 
a/tp/tests/indices/res_parser/printindex_between_part_chapter/printindex_between_part_chapter.html
+++ 
b/tp/tests/indices/res_parser/printindex_between_part_chapter/printindex_between_part_chapter.html
@@ -167,7 +167,7 @@ ul.no-bullet {list-style: none}
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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>
diff --git 
a/tp/tests/indices/res_parser_info/index_special_region_html/index.html 
b/tp/tests/indices/res_parser_info/index_special_region_html/index.html
index 9c539a65f6..bbf8232be9 100644
--- a/tp/tests/indices/res_parser_info/index_special_region_html/index.html
+++ b/tp/tests/indices/res_parser_info/index_special_region_html/index.html
@@ -65,7 +65,7 @@ ul.no-bullet {list-style: none}
  &nbsp; [<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>][<a href="#Top" title="Index" 
rel="index">Index</a>]</p>
 </div>
 <h1 class="top" id="Top-1">Top</h1>
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
 <div class="contents">
diff --git 
a/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/index.html
 
b/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/index.html
index 4769b3c0f2..df41fc840e 100644
--- 
a/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/index.html
+++ 
b/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/index.html
@@ -64,7 +64,7 @@ ul.no-bullet {list-style: none}
  &nbsp; [<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>]</p>
 </div>
 <h1 class="top" id="Top-1">Top</h1>
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
 <div class="contents">
diff --git 
a/tp/tests/indices/res_parser_info/index_special_region_no_region_html/index.html
 
b/tp/tests/indices/res_parser_info/index_special_region_no_region_html/index.html
index 379cf07661..569a15444a 100644
--- 
a/tp/tests/indices/res_parser_info/index_special_region_no_region_html/index.html
+++ 
b/tp/tests/indices/res_parser_info/index_special_region_no_region_html/index.html
@@ -65,7 +65,7 @@ ul.no-bullet {list-style: none}
 </div>
 <h1 class="top" id="Top-1">Top</h1>
 
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
 <div class="contents">
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html 
b/tp/tests/layout/res_parser/formatting/formatting.html
index 294ab3efbc..63fa4dcf84 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -7402,7 +7402,7 @@ Menu comment
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <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>
@@ -7443,7 +7443,7 @@ Menu comment
 <h5><a id="FOOT10" href="#DOCF10">(12)</a></h5>
 <p>in footnote</p>
 </div><hr>
-<div class="contents_element" id="SEC_Contents">
+<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>
@@ -7470,7 +7470,7 @@ Menu comment
 </ul>
 </div>
 </div><hr>
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <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>
@@ -7486,7 +7486,7 @@ Menu comment
 </ul>
 </div>
 </div><hr>
-<div class="about_element" id="SEC_About">
+<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>
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html 
b/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
index e6d8c1669e..4ac0e8f375 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
@@ -837,7 +837,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<div class="about-element" id="SEC_About">
 <h1 class="about-heading">About This Document</h1>
 
 <p>
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html 
b/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
index 1a9f53a80e..b150bdbb14 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
@@ -837,7 +837,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <h1 class="shortcontents-heading">Short Table of Contents</h1>
 
 <div class="shortcontents">
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html 
b/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
index 07c3189216..4058578b25 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
@@ -837,7 +837,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
 <div class="contents">
diff --git 
a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html 
b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
index e32f24145a..8934c8cff3 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
@@ -7402,7 +7402,7 @@ Menu comment
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <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>
@@ -7443,7 +7443,7 @@ Menu comment
 <h5><a id="FOOT10" href="#DOCF10">(12)</a></h5>
 <p>in footnote</p>
 </div><hr>
-<div class="contents_element" id="SEC_Contents">
+<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>
@@ -7470,7 +7470,7 @@ Menu comment
 </ul>
 </div>
 </div><hr>
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <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>
@@ -7486,7 +7486,7 @@ Menu comment
 </ul>
 </div>
 </div><hr>
-<div class="about_element" id="SEC_About">
+<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>
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index 1c50cd57ef..6ed1ae05e9 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
@@ -7298,7 +7298,7 @@ Menu comment
 
 </div>
 </div>
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <h1 class="footnotes-heading">Footnotes</h1>
 
 <h5><a id="FOOT3" href="#DOCF3">(1)</a></h5>
@@ -7332,7 +7332,7 @@ Menu comment
 <a class="index-entry-anchor" id="index-counting-entry"></a>
 <h5><a id="FOOT10" href="#DOCF10">(12)</a></h5>
 <p>in footnote</p>
-</div><div class="contents_element" id="SEC_Contents">
+</div><div class="contents-element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
 <div class="contents">
@@ -7352,7 +7352,7 @@ Menu comment
   <li><a id="toc-chapter-2" href="#chapter2" rel="index">chapter 2</a></li>
 </ul>
 </div>
-</div><div class="shortcontents_element" id="SEC_Overview">
+</div><div class="shortcontents-element" id="SEC_Shortcontents">
 <h1 class="shortcontents-heading">Short Table of Contents</h1>
 
 <div class="shortcontents">
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
index 7ab87fb55d..ed8ec780f5 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
@@ -840,7 +840,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<div class="about-element" id="SEC_About">
 <h1 class="about-heading">About This Document</h1>
 
 <p>
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
index 61230ab01e..bd4f66e4bc 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
@@ -840,7 +840,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <h1 class="footnotes-heading">Footnotes</h1>
 
 <h5><a id="FOOT3" href="formatting.xhtml#DOCF3">(1)</a></h5>
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
index 0d1bfc0e72..3d44a3f31a 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
@@ -840,7 +840,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <h1 class="shortcontents-heading">Short Table of Contents</h1>
 
 <div class="shortcontents">
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
index ff1c6ce0db..2e67dbe423 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
@@ -840,7 +840,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h1 class="contents-heading">Table of Contents</h1>
 
 <div class="contents">
diff --git a/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html 
b/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
index 1ec90859c6..03896ecbf5 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
@@ -838,7 +838,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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="formatting_toc.html#SEC_Contents" 
title="Table of contents">Contents</a>]</td>
diff --git a/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html 
b/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
index 7f69ec825e..a128d522cf 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
@@ -838,7 +838,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <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="formatting_toc.html#SEC_Contents" 
title="Table of contents">Contents</a>]</td>
diff --git a/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html 
b/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
index fa87060efd..e764eed968 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
@@ -838,7 +838,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<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>
diff --git a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html 
b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
index 3ab6674fa9..ec5e909bbe 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -7402,7 +7402,7 @@ Menu comment
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left"><a href="#Top" title="Couverture (top) du 
document"><img src="a_top.png" border="0" alt="Racine: Top section" 
align="middle"></a></td>
 <td valign="middle" align="left"><a href="#SEC_Contents" title="Table des 
mati&egrave;res"><img src="a_tableofcon.png" border="0" alt="Table des 
mati&egrave;res: Table des mati&egrave;res" align="middle"></a></td>
@@ -7443,7 +7443,7 @@ Menu comment
 <h5><a id="FOOT10" href="#DOCF10">(12)</a></h5>
 <p>in footnote</p>
 </div><hr>
-<div class="contents_element" id="SEC_Contents">
+<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="Couverture (top) du 
document"><img src="a_top.png" border="0" alt="Racine: Top section" 
align="middle"></a></td>
 <td valign="middle" align="left"><a href="#SEC_Contents" title="Table des 
mati&egrave;res"><img src="a_tableofcon.png" border="0" alt="Table des 
mati&egrave;res: Table des mati&egrave;res" align="middle"></a></td>
@@ -7470,7 +7470,7 @@ Menu comment
 </ul>
 </div>
 </div><hr>
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left"><a href="#Top" title="Couverture (top) du 
document"><img src="a_top.png" border="0" alt="Racine: Top section" 
align="middle"></a></td>
 <td valign="middle" align="left"><a href="#SEC_Contents" title="Table des 
mati&egrave;res"><img src="a_tableofcon.png" border="0" alt="Table des 
mati&egrave;res: Table des mati&egrave;res" align="middle"></a></td>
@@ -7486,7 +7486,7 @@ Menu comment
 </ul>
 </div>
 </div><hr>
-<div class="about_element" id="SEC_About">
+<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="Couverture (top) du 
document"><img src="a_top.png" border="0" alt="Racine: Top section" 
align="middle"></a></td>
 <td valign="middle" align="left"><a href="#SEC_Contents" title="Table des 
mati&egrave;res"><img src="a_tableofcon.png" border="0" alt="Table des 
mati&egrave;res: Table des mati&egrave;res" align="middle"></a></td>
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html 
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index 294ab3efbc..63fa4dcf84 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -7402,7 +7402,7 @@ Menu comment
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <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>
@@ -7443,7 +7443,7 @@ Menu comment
 <h5><a id="FOOT10" href="#DOCF10">(12)</a></h5>
 <p>in footnote</p>
 </div><hr>
-<div class="contents_element" id="SEC_Contents">
+<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>
@@ -7470,7 +7470,7 @@ Menu comment
 </ul>
 </div>
 </div><hr>
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <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>
@@ -7486,7 +7486,7 @@ Menu comment
 </ul>
 </div>
 </div><hr>
-<div class="about_element" id="SEC_About">
+<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>
diff --git a/tp/tests/layout/res_parser/formatting_html32/formatting.html 
b/tp/tests/layout/res_parser/formatting_html32/formatting.html
index 294ab3efbc..63fa4dcf84 100644
--- a/tp/tests/layout/res_parser/formatting_html32/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html32/formatting.html
@@ -7402,7 +7402,7 @@ Menu comment
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <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>
@@ -7443,7 +7443,7 @@ Menu comment
 <h5><a id="FOOT10" href="#DOCF10">(12)</a></h5>
 <p>in footnote</p>
 </div><hr>
-<div class="contents_element" id="SEC_Contents">
+<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>
@@ -7470,7 +7470,7 @@ Menu comment
 </ul>
 </div>
 </div><hr>
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <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>
@@ -7486,7 +7486,7 @@ Menu comment
 </ul>
 </div>
 </div><hr>
-<div class="about_element" id="SEC_About">
+<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>
diff --git 
a/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html 
b/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
index 937b29fe61..97421a1c6b 100644
--- a/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
@@ -855,7 +855,7 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">chapter</a> &nbsp; [<a href="#
 
 
 
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
 <div class="contents">
@@ -876,7 +876,7 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">chapter</a> &nbsp; [<a href="#
 </ul>
 </div>
 </div>
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <h2 class="shortcontents-heading">Short Table of Contents</h2>
 
 <div class="shortcontents">
diff --git 
a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
index 9b6d5afa4b..5e0b3dba94 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
@@ -837,7 +837,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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="formatting_toc.html#SEC_Contents" 
title="Table of contents">Contents</a>]</td>
diff --git 
a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
index 35bb1e3bfb..1d17b8f5a7 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
@@ -837,7 +837,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <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="formatting_toc.html#SEC_Contents" 
title="Table of contents">Contents</a>]</td>
diff --git 
a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
index 4ca35f280d..4e9d0dbc0a 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
@@ -837,7 +837,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <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="formatting_toc.html#SEC_Contents" 
title="Table of contents">Contents</a>]</td>
diff --git 
a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
index faf79966e3..37069c22af 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
@@ -837,7 +837,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<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>
diff --git a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html 
b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
index c3fcc6f3d2..457b4f46b1 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
@@ -7402,7 +7402,7 @@ Menu comment
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <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>
@@ -7443,7 +7443,7 @@ Menu comment
 <h5><a id="FOOT10" href="#DOCF10">(12)</a></h5>
 <p>in footnote</p>
 </div><hr>
-<div class="contents_element" id="SEC_Contents">
+<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>
@@ -7470,7 +7470,7 @@ Menu comment
 </ul>
 </div>
 </div><hr>
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <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>
@@ -7486,7 +7486,7 @@ Menu comment
 </ul>
 </div>
 </div><hr>
-<div class="about_element" id="SEC_About">
+<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>
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html 
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index 5d2ef5b603..36ef2b18e5 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -7412,7 +7412,7 @@ Menu comment
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <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>
@@ -7453,7 +7453,7 @@ Menu comment
 <h5><a id="FOOT10" href="#DOCF10">(12)</a></h5>
 <p>in footnote</p>
 </div><hr>
-<div class="contents_element" id="SEC_Contents">
+<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>
@@ -7480,7 +7480,7 @@ Menu comment
 </ul>
 </div>
 </div><hr>
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <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>
@@ -7496,7 +7496,7 @@ Menu comment
 </ul>
 </div>
 </div><hr>
-<div class="about_element" id="SEC_About">
+<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>
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html 
b/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
index 9b6d5afa4b..5e0b3dba94 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
@@ -837,7 +837,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<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="formatting_toc.html#SEC_Contents" 
title="Table of contents">Contents</a>]</td>
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html 
b/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
index 35bb1e3bfb..1d17b8f5a7 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
@@ -837,7 +837,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <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="formatting_toc.html#SEC_Contents" 
title="Table of contents">Contents</a>]</td>
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html 
b/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
index 4ca35f280d..4e9d0dbc0a 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
@@ -837,7 +837,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <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="formatting_toc.html#SEC_Contents" 
title="Table of contents">Contents</a>]</td>
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html 
b/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
index faf79966e3..37069c22af 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
@@ -837,7 +837,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<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>
diff --git 
a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html 
b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
index 76f537fa39..1269c04ed9 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
@@ -7402,7 +7402,7 @@ Menu comment
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <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>
@@ -7443,7 +7443,7 @@ Menu comment
 <h5><a id="FOOT10" href="#DOCF10">(12)</a></h5>
 <p>in footnote</p>
 </div><hr>
-<div class="contents_element" id="SEC_Contents">
+<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>
@@ -7470,7 +7470,7 @@ Menu comment
 </ul>
 </div>
 </div><hr>
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <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>
@@ -7486,7 +7486,7 @@ Menu comment
 </ul>
 </div>
 </div><hr>
-<div class="about_element" id="SEC_About">
+<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>
diff --git 
a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html 
b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
index e9b7780eda..a9d7675201 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -7149,7 +7149,7 @@ Menu comment
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <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>
@@ -7181,7 +7181,7 @@ Menu comment
 <h5><a id="FOOT9" href="#DOCF9">(11)</a></h5>
 <p>in footnote</p>
 </div><hr>
-<div class="contents_element" id="SEC_Contents">
+<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>
@@ -7208,7 +7208,7 @@ Menu comment
 </ul>
 </div>
 </div><hr>
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <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>
@@ -7225,7 +7225,7 @@ Menu comment
 </ul>
 </div>
 </div><hr>
-<div class="about_element" id="SEC_About">
+<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>
diff --git a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html 
b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
index 066543f96d..b7cecac01d 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -7402,7 +7402,7 @@ Menu comment
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <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>
@@ -7443,7 +7443,7 @@ Menu comment
 <h5><a id="FOOT10" href="#DOCF10">(12)</a></h5>
 <p>in footnote</p>
 </div><hr>
-<div class="contents_element" id="SEC_Contents">
+<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>
@@ -7470,7 +7470,7 @@ Menu comment
 </ul>
 </div>
 </div><hr>
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <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>
@@ -7486,7 +7486,7 @@ Menu comment
 </ul>
 </div>
 </div><hr>
-<div class="about_element" id="SEC_About">
+<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>
diff --git a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html 
b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
index 995e1744e1..8b93b4175a 100644
--- a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
@@ -7402,7 +7402,7 @@ Menu comment
 <hr style="height: 6px;"/>
 </div>
 </div>
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <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>
@@ -7443,7 +7443,7 @@ Menu comment
 <h5><a id="FOOT10" href="#DOCF10">(12)</a></h5>
 <p>in footnote</p>
 </div><hr/>
-<div class="contents_element" id="SEC_Contents">
+<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>
@@ -7470,7 +7470,7 @@ Menu comment
 </ul>
 </div>
 </div><hr/>
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <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>
@@ -7486,7 +7486,7 @@ Menu comment
 </ul>
 </div>
 </div><hr/>
-<div class="about_element" id="SEC_About">
+<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>
diff --git 
a/tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation_abt.html
 
b/tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation_abt.html
index 7f32d5086a..f086518e1c 100644
--- 
a/tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation_abt.html
+++ 
b/tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation_abt.html
@@ -118,7 +118,7 @@ b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b  
bb  b bb.
 </table>
 
 <hr>
-<div class="about_element" id="SEC_About">
+<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="navigation_toc.html#SEC_Contents" 
title="Table of contents">Contents</a>]</td>
diff --git 
a/tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation_toc.html
 
b/tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation_toc.html
index e282bd5826..0d24580f81 100644
--- 
a/tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation_toc.html
+++ 
b/tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation_toc.html
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="navigation_abt.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/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic.html 
b/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic.html
index 1bcb25fe6c..34dd526c2a 100644
--- a/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic.html
+++ b/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic.html
@@ -107,7 +107,7 @@ ul.no-bullet {list-style: none}
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <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>
@@ -119,7 +119,7 @@ ul.no-bullet {list-style: none}
 <h5><a id="FOOT1" href="#DOCF1">(1)</a></h5>
 <p>my footnote</p>
 </div><hr>
-<div class="contents_element" id="SEC_Contents">
+<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>
@@ -135,7 +135,7 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 </div><hr>
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <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>
@@ -150,7 +150,7 @@ ul.no-bullet {list-style: none}
 </ul>
 </div>
 </div><hr>
-<div class="about_element" id="SEC_About">
+<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>
diff --git 
a/tp/tests/sectioning/res_parser/sectioning_directions/sectioning.html 
b/tp/tests/sectioning/res_parser/sectioning_directions/sectioning.html
index 560b3ebcdb..2a584f25ee 100644
--- a/tp/tests/sectioning/res_parser/sectioning_directions/sectioning.html
+++ b/tp/tests/sectioning/res_parser/sectioning_directions/sectioning.html
@@ -1452,7 +1452,7 @@ description here
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Up</td>
@@ -1584,7 +1584,7 @@ description here
 </ul>
 </div>
 </div><hr>
-<div class="about_element" id="SEC_About">
+<div class="about-element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Up</td>
diff --git 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/sectioning_abt.html
 
b/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/sectioning_abt.html
index 9918765e14..14653bee7a 100644
--- 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/sectioning_abt.html
+++ 
b/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/sectioning_abt.html
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="about_element" id="SEC_About">
+<div class="about-element" id="SEC_About">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Up</td>
diff --git 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/sectioning_toc.html
 
b/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/sectioning_toc.html
index 2ce64327cf..d6917bfef5 100644
--- 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/sectioning_toc.html
+++ 
b/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/sectioning_toc.html
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
 </head>
 
 <body lang="en">
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <table class="header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Up</td>
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm 
b/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm
index ec86bdf315..6dbdf79e05 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm
@@ -839,7 +839,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en"  background="../singular_images/Mybg.png">
 
-<div class="about_element" id="SEC_About">
+<div class="about-element" id="SEC_About">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm 
b/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
index 7efab2f9fd..16a5bc95ca 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
@@ -839,7 +839,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en"  background="../singular_images/Mybg.png">
 
-<div class="footnotes_element" id="SEC_Foot">
+<div class="footnotes-element" id="SEC_Footnotes">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm 
b/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm
index 86555bf8c0..5858498fb3 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm
@@ -839,7 +839,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en"  background="../singular_images/Mybg.png">
 
-<div class="shortcontents_element" id="SEC_Overview">
+<div class="shortcontents-element" id="SEC_Shortcontents">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm 
b/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm
index 56d6827579..37be6ecaeb 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm
@@ -839,7 +839,7 @@ ul.no-bullet {list-style: none}
 
 <body lang="en"  background="../singular_images/Mybg.png">
 
-<div class="contents_element" id="SEC_Contents">
+<div class="contents-element" id="SEC_Contents">
 <table border="0" cellpadding="0" cellspacing="0">
 <tr valign="top">
 <td align="left">
diff --git a/tp/tests/tex_html/res_parser/simplest_httex/simplest.html 
b/tp/tests/tex_html/res_parser/simplest_httex/simplest.html
index 336bcd87a4..07d52b1747 100644
--- a/tp/tests/tex_html/res_parser/simplest_httex/simplest.html
+++ b/tp/tests/tex_html/res_parser/simplest_httex/simplest.html
@@ -84,7 +84,7 @@ ul.no-bullet {list-style: none}
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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>
diff --git a/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying.html 
b/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying.html
index 3fe8dd4137..19658a6f26 100644
--- a/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying.html
+++ b/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying.html
@@ -166,7 +166,7 @@ $">
 <hr style="height: 6px;">
 </div>
 </div>
-<div class="about_element" id="SEC_About">
+<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>



reply via email to

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