[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Patrice Dumas |
|
Date: |
Sun, 31 Jul 2022 07:09:19 -0400 (EDT) |
branch: master
commit ed01b54934678f4ce7b7857479161b32e58c6b7c
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Jul 31 12:48:38 2022 +0200
No @deftypefnnewline effect on typed variable definitions in HTML
* tp/Texinfo/Convert/HTML.pm (_convert_def_line_type): effect of
@deftypefnnewline on for deftypefn and deftypeop only.
---
ChangeLog | 7 +++++
tp/Texinfo/Convert/HTML.pm | 30 ++++++++--------------
.../converters_tests/test_deftypefnnewline.pl | 4 +--
.../layout/res_parser/formatting/formatting.html | 24 ++++++++---------
.../layout/res_parser/formatting_chm/chapter.html | 16 +++++-------
.../res_parser/formatting_chm/formatting.html | 8 +++---
.../formatting_enable_encoding/formatting.html | 24 ++++++++---------
.../EPUB/xhtml/formatting.xhtml | 24 ++++++++---------
.../EPUB/xhtml/chapter.xhtml | 16 +++++-------
.../EPUB/xhtml/formatting.xhtml | 8 +++---
.../res_parser/formatting_fr_icons/formatting.html | 24 ++++++++---------
.../res_parser/formatting_html/formatting.html | 24 ++++++++---------
.../res_parser/formatting_html32/formatting.html | 24 ++++++++---------
.../formatting_html_no_texi2html/formatting.html | 16 +++++-------
.../res_parser/formatting_html_nodes/chapter.html | 16 +++++-------
.../res_parser/formatting_html_nodes/index.html | 8 +++---
.../formatting_inline_css/formatting.html | 24 ++++++++---------
.../res_parser/formatting_mathjax/formatting.html | 24 ++++++++---------
.../res_parser/formatting_nodes/chapter.html | 16 +++++-------
.../layout/res_parser/formatting_nodes/index.html | 8 +++---
.../formatting_numerical_entities/formatting.html | 24 ++++++++---------
.../formatting_regions/formatting_regions.html | 24 ++++++++---------
.../formatting_weird_quotes/formatting.html | 24 ++++++++---------
.../res_parser/formatting_xhtml/formatting.html | 24 ++++++++---------
.../res_parser/formatting_singular/chapter.html | 16 +++++-------
25 files changed, 191 insertions(+), 266 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 02c226e5a1..68656ead24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-07-31 Patrice Dumas <pertusus@free.fr>
+
+ No @deftypefnnewline effect on typed variable definitions
+
+ * tp/Texinfo/Convert/HTML.pm (_convert_def_line_type): effect of
+ @deftypefnnewline on for deftypefn and deftypeop only.
+
2022-07-30 Patrice Dumas <pertusus@free.fr>
Document EPUB_CREATE_CONTAINER_FILE
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 143574b349..3d1e970fb7 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -5933,7 +5933,8 @@ sub _convert_def_line_type($$$$)
# environment. There should be an explicit <br> in that case.
Probably
# requires changing the conversion of @* in a @def* line in
preformatted,
# nothing really specific of @deftypefnnewline on.
- if ($self->get_conf('deftypefnnewline') eq 'on') {
+ if ($self->get_conf('deftypefnnewline') eq 'on'
+ and ($command_name eq 'deftypefn' or $command_name eq
'deftypeop')) {
$category_tree
= {'type' => '_code',
'contents'
@@ -5951,7 +5952,8 @@ sub _convert_def_line_type($$$$)
my $strings = {
'type' => $element->{'extra'}->{'def_parsed_hash'}->{'type'},
'name' => $name};
- if ($self->get_conf('deftypefnnewline') eq 'on') {
+ if ($self->get_conf('deftypefnnewline') eq 'on'
+ and ($command_name eq 'deftypefn' or $command_name eq
'deftypeop')) {
$category_tree
= {'type' => '_code',
'contents'
@@ -6039,30 +6041,18 @@ sub _convert_def_line_type($$$$)
'class' => $element->{'extra'}->{'def_parsed_hash'}->{'class'},
'type' => $element->{'extra'}->{'def_parsed_hash'}->{'type'},
'arguments' => $arguments};
- if ($self->get_conf('deftypefnnewline') eq 'on') {
- $tree
- = $self->gdt("{category} of {class}:\@* \@emph{{type}}\@*
\@strong{{name}} \@emph{{arguments}}",
- $strings);
- } else {
- $tree
- = $self->gdt("{category} of {class}: \@emph{{type}}
\@strong{{name}} \@emph{{arguments}}",
- $strings);
- }
+ $tree
+ = $self->gdt("{category} of {class}: \@emph{{type}} \@strong{{name}}
\@emph{{arguments}}",
+ $strings);
} else {
my $strings = {
'category' => $category,
'type' => $element->{'extra'}->{'def_parsed_hash'}->{'type'},
'class' => $element->{'extra'}->{'def_parsed_hash'}->{'class'},
'name' => $name};
- if ($self->get_conf('deftypefnnewline') eq 'on') {
- $tree
- = $self->gdt("{category} of {class}:\@* \@emph{{type}}\@*
\@strong{{name}}",
- $strings);
- } else {
- $tree
- = $self->gdt("{category} of {class}: \@emph{{type}}
\@strong{{name}}",
- $strings);
- }
+ $tree
+ = $self->gdt("{category} of {class}: \@emph{{type}}
\@strong{{name}}",
+ $strings);
}
}
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index b697f4e844..5052818856 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -3446,12 +3446,12 @@
$result_converted{'html_text'}->{'test_deftypefnnewline'} = '
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname-of-c_002d_002dlass"><span>c--ategory of
c--lass:<br> <em class="emph">t--ype</em><br> <strong
class="strong">d--eftypecv_name</strong><a class="copiable-link"
href=\'#index-d_002d_002deftypecv_005fname-of-c_002d_002dlass\'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname-of-c_002d_002dlass"><span>c--ategory of
c--lass: <em class="emph">t--ype</em> <strong
class="strong">d--eftypecv_name</strong><a class="copiable-link"
href=\'#index-d_002d_002deftypecv_005fname-of-c_002d_002dlass\'>
¶</a></span></dt>
<dd><p>d–eftypecv
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname-of-c_002d_002dlass-1"><span>c--ategory
of c--lass:<br> <em class="emph">t--ype</em><br> <strong
class="strong">d--eftypecv_name</strong> <em class="emph">a--rguments...</em><a
class="copiable-link"
href=\'#index-d_002d_002deftypecv_005fname-of-c_002d_002dlass-1\'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname-of-c_002d_002dlass-1"><span>c--ategory
of c--lass: <em class="emph">t--ype</em> <strong
class="strong">d--eftypecv_name</strong> <em class="emph">a--rguments...</em><a
class="copiable-link"
href=\'#index-d_002d_002deftypecv_005fname-of-c_002d_002dlass-1\'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments
</p></dd></dl>
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html
b/tp/tests/layout/res_parser/formatting/formatting.html
index f875e6096f..63d2e4a902 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -1627,12 +1627,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -2705,12 +2705,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -3839,12 +3839,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -4915,12 +4915,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -6114,17 +6114,13 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
of c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv2
</pre></dd></dl>
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
of c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv with arguments2
</pre></dd></dl>
<pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter.html
b/tp/tests/layout/res_parser/formatting_chm/chapter.html
index e5c75db291..2e5eb24543 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter.html
@@ -1628,12 +1628,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -2704,12 +2704,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -3903,17 +3903,13 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
of c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv2
</pre></dd></dl>
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
of c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv with arguments2
</pre></dd></dl>
<pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.html
b/tp/tests/layout/res_parser/formatting_chm/formatting.html
index dafe6dbee7..4e35fa82ee 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting.html
@@ -1620,12 +1620,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -2698,12 +2698,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
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 d1058d058f..d33131cb72 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
@@ -1627,12 +1627,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -2705,12 +2705,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -3839,12 +3839,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -4915,12 +4915,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -6114,17 +6114,13 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
of c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv2
</pre></dd></dl>
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
of c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv with arguments2
</pre></dd></dl>
<pre class="example-preformatted">
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 8148f4d081..b0d3b13d2f 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
@@ -1626,12 +1626,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2">c--ategory2
of c--lass2:<br/> <em class="emph">t--ype2</em><br/> <strong
class="strong">d--eftypecv_name2</strong></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2">c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1">c--ategory2
of c--lass2:<br/> <em class="emph">t--ype2</em><br/> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1">c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -2704,12 +2704,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2">c--ategory2
of c--lass2:<br/> <em class="emph">t--ype2</em><br/> <strong
class="strong">d--eftypecv_name2</strong></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2">c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1">c--ategory2
of c--lass2:<br/> <em class="emph">t--ype2</em><br/> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1">c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -3800,12 +3800,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2">c--ategory2
of c--lass2:<br/> <em class="emph">t--ype2</em><br/> <strong
class="strong">d--eftypecv_name2</strong></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2">c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1">c--ategory2
of c--lass2:<br/> <em class="emph">t--ype2</em><br/> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1">c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -4876,12 +4876,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2">c--ategory2 of
c--lass2:<br/> <em class="emph">t--ype2</em><br/> <strong
class="strong">d--eftypecv_name2</strong></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2">c--ategory2 of
c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1">c--ategory2 of
c--lass2:<br/> <em class="emph">t--ype2</em><br/> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1">c--ategory2 of
c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -6075,17 +6075,13 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2">c--ategory2 of
c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2">c--ategory2 of
c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong></dt>
<dd><pre class="example-preformatted">d--eftypecv2
</pre></dd></dl>
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3">c--ategory2 of
c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3">c--ategory2 of
c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em></dt>
<dd><pre class="example-preformatted">d--eftypecv with arguments2
</pre></dd></dl>
<pre class="example-preformatted">
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
index 0208c39dc9..edd7849464 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
@@ -1633,12 +1633,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2">c--ategory2
of c--lass2:<br/> <em class="emph">t--ype2</em><br/> <strong
class="strong">d--eftypecv_name2</strong></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2">c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1">c--ategory2
of c--lass2:<br/> <em class="emph">t--ype2</em><br/> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1">c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -2709,12 +2709,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2">c--ategory2 of
c--lass2:<br/> <em class="emph">t--ype2</em><br/> <strong
class="strong">d--eftypecv_name2</strong></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2">c--ategory2 of
c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1">c--ategory2 of
c--lass2:<br/> <em class="emph">t--ype2</em><br/> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1">c--ategory2 of
c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -3908,17 +3908,13 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2">c--ategory2 of
c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2">c--ategory2 of
c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong></dt>
<dd><pre class="example-preformatted">d--eftypecv2
</pre></dd></dl>
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3">c--ategory2 of
c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3">c--ategory2 of
c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em></dt>
<dd><pre class="example-preformatted">d--eftypecv with arguments2
</pre></dd></dl>
<pre class="example-preformatted">
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index 20b7ae4153..209aa3f4fc 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
@@ -1623,12 +1623,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2">c--ategory2
of c--lass2:<br/> <em class="emph">t--ype2</em><br/> <strong
class="strong">d--eftypecv_name2</strong></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2">c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1">c--ategory2
of c--lass2:<br/> <em class="emph">t--ype2</em><br/> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1">c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -2701,12 +2701,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2">c--ategory2
of c--lass2:<br/> <em class="emph">t--ype2</em><br/> <strong
class="strong">d--eftypecv_name2</strong></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2">c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1">c--ategory2
of c--lass2:<br/> <em class="emph">t--ype2</em><br/> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1">c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
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 e3c971194d..29df9b4f86 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -1627,12 +1627,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
de c--lass2 :<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
de c--lass2 : <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
de c--lass2 :<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
de c--lass2 : <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -2705,12 +2705,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
de c--lass2 :<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
de c--lass2 : <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
de c--lass2 :<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
de c--lass2 : <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -3839,12 +3839,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
de c--lass2 :<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
de c--lass2 : <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
de c--lass2 :<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
de c--lass2 : <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -4915,12 +4915,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
de c--lass2 :<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
de c--lass2 : <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
de c--lass2 :<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
de c--lass2 : <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -6114,17 +6114,13 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
de c--lass2 :
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
de c--lass2 : <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv2
</pre></dd></dl>
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
de c--lass2 :
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
de c--lass2 : <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv with arguments2
</pre></dd></dl>
<pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index f875e6096f..63d2e4a902 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -1627,12 +1627,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -2705,12 +2705,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -3839,12 +3839,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -4915,12 +4915,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -6114,17 +6114,13 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
of c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv2
</pre></dd></dl>
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
of c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv with arguments2
</pre></dd></dl>
<pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_html32/formatting.html
b/tp/tests/layout/res_parser/formatting_html32/formatting.html
index 0a36167a7c..d8953fe0c4 100644
--- a/tp/tests/layout/res_parser/formatting_html32/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html32/formatting.html
@@ -1573,12 +1573,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl>
-<dt
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2">c--ategory2
of c--lass2:<br> <em>t--ype2</em><br> <strong>d--eftypecv_name2</strong></dt>
+<dt
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2">c--ategory2
of c--lass2: <em>t--ype2</em> <strong>d--eftypecv_name2</strong></dt>
<dd><p>d-eftypecv2
</p></dd></dl>
<dl>
-<dt
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1">c--ategory2
of c--lass2:<br> <em>t--ype2</em><br> <strong>d--eftypecv_name2</strong>
<em>a--rguments2...</em></dt>
+<dt
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1">c--ategory2
of c--lass2: <em>t--ype2</em> <strong>d--eftypecv_name2</strong>
<em>a--rguments2...</em></dt>
<dd><p>d-eftypecv with arguments2
</p></dd></dl>
@@ -2625,12 +2625,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl>
-<dt
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2">c--ategory2
of c--lass2:<br> <em>t--ype2</em><br> <strong>d--eftypecv_name2</strong></dt>
+<dt
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2">c--ategory2
of c--lass2: <em>t--ype2</em> <strong>d--eftypecv_name2</strong></dt>
<dd><p>d-eftypecv2
</p></dd></dl>
<dl>
-<dt
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1">c--ategory2
of c--lass2:<br> <em>t--ype2</em><br> <strong>d--eftypecv_name2</strong>
<em>a--rguments2...</em></dt>
+<dt
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1">c--ategory2
of c--lass2: <em>t--ype2</em> <strong>d--eftypecv_name2</strong>
<em>a--rguments2...</em></dt>
<dd><p>d-eftypecv with arguments2
</p></dd></dl>
@@ -3733,12 +3733,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl>
-<dt
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2">c--ategory2
of c--lass2:<br> <em>t--ype2</em><br> <strong>d--eftypecv_name2</strong></dt>
+<dt
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2">c--ategory2
of c--lass2: <em>t--ype2</em> <strong>d--eftypecv_name2</strong></dt>
<dd><p>d-eftypecv2
</p></dd></dl>
<dl>
-<dt
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1">c--ategory2
of c--lass2:<br> <em>t--ype2</em><br> <strong>d--eftypecv_name2</strong>
<em>a--rguments2...</em></dt>
+<dt
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1">c--ategory2
of c--lass2: <em>t--ype2</em> <strong>d--eftypecv_name2</strong>
<em>a--rguments2...</em></dt>
<dd><p>d-eftypecv with arguments2
</p></dd></dl>
@@ -4783,12 +4783,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl>
-<dt id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2">c--ategory2
of c--lass2:<br> <em>t--ype2</em><br> <strong>d--eftypecv_name2</strong></dt>
+<dt id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2">c--ategory2
of c--lass2: <em>t--ype2</em> <strong>d--eftypecv_name2</strong></dt>
<dd><p>d-eftypecv2
</p></dd></dl>
<dl>
-<dt id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1">c--ategory2
of c--lass2:<br> <em>t--ype2</em><br> <strong>d--eftypecv_name2</strong>
<em>a--rguments2...</em></dt>
+<dt id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1">c--ategory2
of c--lass2: <em>t--ype2</em> <strong>d--eftypecv_name2</strong>
<em>a--rguments2...</em></dt>
<dd><p>d-eftypecv with arguments2
</p></dd></dl>
@@ -5955,17 +5955,13 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<pre>
</pre><dl>
-<dt id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2">c--ategory2
of c--lass2:
- <em>t--ype2</em>
- <strong>d--eftypecv_name2</strong></dt>
+<dt id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2">c--ategory2
of c--lass2: <em>t--ype2</em> <strong>d--eftypecv_name2</strong></dt>
<dd><pre>d--eftypecv2
</pre></dd></dl>
<pre>
</pre><dl>
-<dt id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3">c--ategory2
of c--lass2:
- <em>t--ype2</em>
- <strong>d--eftypecv_name2</strong> <em>a--rguments2...</em></dt>
+<dt id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3">c--ategory2
of c--lass2: <em>t--ype2</em> <strong>d--eftypecv_name2</strong>
<em>a--rguments2...</em></dt>
<dd><pre>d--eftypecv with arguments2
</pre></dd></dl>
<pre>
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 80aa736345..2f483ed655 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
@@ -1686,12 +1686,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -2762,12 +2762,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -3961,17 +3961,13 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
of c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv2
</pre></dd></dl>
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
of c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv with arguments2
</pre></dd></dl>
<pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
index 1ce15efd57..ba75f425f1 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -1648,12 +1648,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -2724,12 +2724,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -3923,17 +3923,13 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
of c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv2
</pre></dd></dl>
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
of c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv with arguments2
</pre></dd></dl>
<pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
index 9cae88d386..aa3d2a10c8 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
@@ -1622,12 +1622,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -2700,12 +2700,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
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 f1a1244dfa..42879fc124 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
@@ -1599,12 +1599,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link" style="visibility:
hidden; text-decoration: none; line-height: 0em"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link" style="visibility:
hidden; text-decoration: none; line-height: 0em"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -2677,12 +2677,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link" style="visibility:
hidden; text-decoration: none; line-height: 0em"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link" style="visibility:
hidden; text-decoration: none; line-height: 0em"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -3811,12 +3811,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link" style="visibility:
hidden; text-decoration: none; line-height: 0em"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link" style="visibility:
hidden; text-decoration: none; line-height: 0em"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -4887,12 +4887,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link" style="visibility:
hidden; text-decoration: none; line-height: 0em"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link" style="visibility:
hidden; text-decoration: none; line-height: 0em"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -6086,17 +6086,13 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
of c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong><a class="copiable-link"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
style="visibility: hidden; text-decoration: none; line-height: 0em"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv2
</pre></dd></dl>
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
of c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link" style="visibility:
hidden; text-decoration: none; line-height: 0em"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link" style="visibility:
hidden; text-decoration: none; line-height: 0em"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv with arguments2
</pre></dd></dl>
<pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index a35e40d7f6..a7dd7898f4 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -1635,12 +1635,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -2711,12 +2711,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -3843,12 +3843,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -4917,12 +4917,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -6114,17 +6114,13 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
of c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv2
</pre></dd></dl>
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
of c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv with arguments2
</pre></dd></dl>
<pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
index 1ce15efd57..ba75f425f1 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -1648,12 +1648,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -2724,12 +2724,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -3923,17 +3923,13 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
of c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv2
</pre></dd></dl>
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
of c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv with arguments2
</pre></dd></dl>
<pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_nodes/index.html
b/tp/tests/layout/res_parser/formatting_nodes/index.html
index 9cae88d386..aa3d2a10c8 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/index.html
@@ -1622,12 +1622,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -2700,12 +2700,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
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 97d2df3838..ad37c8602e 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
@@ -1627,12 +1627,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -2705,12 +2705,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -3839,12 +3839,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -4915,12 +4915,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -6114,17 +6114,13 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
of c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv2
</pre></dd></dl>
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
of c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv with arguments2
</pre></dd></dl>
<pre class="example-preformatted">
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 f423ce0021..6e9368f4c6 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -1627,12 +1627,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -2704,12 +2704,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -3814,12 +3814,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -5012,17 +5012,13 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
of c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv2
</pre></dd></dl>
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
of c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv with arguments2
</pre></dd></dl>
<pre class="example-preformatted">
@@ -6128,12 +6124,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
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 e50bf93be4..7b5132fe29 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -1627,12 +1627,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -2705,12 +2705,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -3839,12 +3839,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -4915,12 +4915,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -6114,17 +6114,13 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
of c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv2
</pre></dd></dl>
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
of c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv with arguments2
</pre></dd></dl>
<pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
index 84434acf5a..1d51091c8e 100644
--- a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
@@ -1627,12 +1627,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br/> <em class="emph">t--ype2</em><br/> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br/> <em class="emph">t--ype2</em><br/> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-titlepage-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -2705,12 +2705,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br/> <em class="emph">t--ype2</em><br/> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br/> <em class="emph">t--ype2</em><br/> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -3839,12 +3839,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br/> <em class="emph">t--ype2</em><br/> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br/> <em class="emph">t--ype2</em><br/> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -4915,12 +4915,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br/> <em class="emph">t--ype2</em><br/> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br/> <em class="emph">t--ype2</em><br/> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -6114,17 +6114,13 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
of c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv2
</pre></dd></dl>
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
of c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv with arguments2
</pre></dd></dl>
<pre class="example-preformatted">
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
index 1d4a911d38..9affdaa430 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
@@ -1757,12 +1757,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -2970,12 +2970,12 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2'>
¶</a></span></dt>
<dd><p>d–eftypecv2
</p></dd></dl>
<dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2:<br> <em class="emph">t--ype2</em><br> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1'>
¶</a></span></dt>
<dd><p>d–eftypecv with arguments2
</p></dd></dl>
@@ -4306,17 +4306,13 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
of c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv2
</pre></dd></dl>
<pre class="example-preformatted">
</pre><dl class="first-deftypecv">
-<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
of c--lass2:
- <em class="emph">t--ype2</em>
- <strong class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
+<dt class="deftypecv"
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><span>c--ategory2
of c--lass2: <em class="emph">t--ype2</em> <strong
class="strong">d--eftypecv_name2</strong> <em
class="emph">a--rguments2...</em><a class="copiable-link"
href='#index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3'>
¶</a></span></dt>
<dd><pre class="example-preformatted">d--eftypecv with arguments2
</pre></dd></dl>
<pre class="example-preformatted">