texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: Use directly HTML code to format @def* line excep


From: Patrice Dumas
Subject: branch master updated: Use directly HTML code to format @def* line except for category
Date: Mon, 01 Aug 2022 07:43:17 -0400

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

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 9796ea6f6d Use directly HTML code to format @def* line except for 
category
9796ea6f6d is described below

commit 9796ea6f6dfa0d5e3fbc6c74a19a2a278a7df18d
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Aug 1 13:42:59 2022 +0200

    Use directly HTML code to format @def* line except for category
    
    * tp/Texinfo/Convert/HTML.pm (_convert_def_line_type): direct
    HTML format equivalent with previously used Texinfo commands
    with gdt.
---
 ChangeLog                                          |   8 ++
 tp/Texinfo/Convert/HTML.pm                         |  95 +++++++------------
 .../defcondx_Dbar/res_html/defxcond.html           |   4 +-
 .../defcondx_Ubar/res_html/defxcond.html           |   2 +-
 .../res_parser/index_special_region/Chapter.html   |   2 +-
 .../index_special_region_html/Chapter.html         |   2 +-
 .../Chapter.html                                   |   2 +-
 .../Chapter.html                                   |   2 +-
 .../index_special_region_no_region/Chapter.html    |   2 +-
 .../Chapter.html                                   |   2 +-
 .../index_special_region_html/index.html           |   2 +-
 .../index.html                                     |   2 +-
 .../index_special_region_no_region_html/index.html |   2 +-
 .../layout/res_parser/formatting/formatting.html   |  72 +++++++-------
 .../layout/res_parser/formatting_chm/chapter.html  |  48 +++++-----
 .../res_parser/formatting_chm/formatting.html      |  24 ++---
 .../formatting_enable_encoding/formatting.html     |  72 +++++++-------
 .../EPUB/xhtml/formatting.xhtml                    | 104 ++++++++++-----------
 .../EPUB/xhtml/chapter.xhtml                       |  64 ++++++-------
 .../EPUB/xhtml/formatting.xhtml                    |  40 ++++----
 .../res_parser/formatting_fr_icons/formatting.html |  72 +++++++-------
 .../res_parser/formatting_html/formatting.html     |  72 +++++++-------
 .../res_parser/formatting_html32/formatting.html   |  72 +++++++-------
 .../formatting_html_no_texi2html/formatting.html   |  48 +++++-----
 .../res_parser/formatting_html_nodes/chapter.html  |  48 +++++-----
 .../res_parser/formatting_html_nodes/index.html    |  24 ++---
 .../formatting_inline_css/formatting.html          |  72 +++++++-------
 .../res_parser/formatting_mathjax/formatting.html  |  72 +++++++-------
 .../res_parser/formatting_nodes/chapter.html       |  48 +++++-----
 .../layout/res_parser/formatting_nodes/index.html  |  24 ++---
 .../formatting_numerical_entities/formatting.html  |  72 +++++++-------
 .../formatting_regions/formatting_regions.html     |  72 +++++++-------
 .../formatting_weird_quotes/formatting.html        |  72 +++++++-------
 .../res_parser/formatting_xhtml/formatting.html    | 104 ++++++++++-----------
 .../res_parser/formatting_singular/chapter.html    |  48 +++++-----
 35 files changed, 692 insertions(+), 779 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8fa5a6e874..cecbcab928 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-07-31  Patrice Dumas  <pertusus@free.fr>
+
+       Use directly HTML code to format @def* line except for category
+
+       * tp/Texinfo/Convert/HTML.pm (_convert_def_line_type): direct
+       HTML format equivalent with previously used Texinfo commands
+       with gdt.
+
 2022-07-31  Patrice Dumas  <pertusus@free.fr>
 
        Common structure for non metasyntactic only argument def commands
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 8cb50ee917..4a09cbbf66 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -5908,69 +5908,46 @@ sub _convert_def_line_type($$$$)
       }
       $category_result = $self->convert_tree($category_tree);
     }
-    my $tree;
-    my $name;
-    if ($element->{'extra'} and $element->{'extra'}->{'def_parsed_hash'}
-        and defined($element->{'extra'}->{'def_parsed_hash'}->{'name'})) {
-      $name = $element->{'extra'}->{'def_parsed_hash'}->{'name'};
-    } else {
-      $name = '';
-    }
-    # only metasyntactic variable arguments (deffn, defvr, deftp, defop, defcv)
-    if (not $Texinfo::Common::def_no_var_arg_commands{$command_name}) {
-      if ($arguments) {
-        $tree = $self->gdt("\@code{{name}} \@r{\@slanted{{arguments}}}", {
-                'name' => $name,
-                'arguments' => $arguments});
+
+    my $def_call = '';
+    if ($element->{'extra'}->{'def_parsed_hash'}->{'type'}) {
+      $def_call .= $self->html_attribute_class('code', ['code']).">".
+          $self->_convert({'type' => '_code',
+            'contents' => 
[$element->{'extra'}->{'def_parsed_hash'}->{'type'}]})
+          .'</code>';
+      if ($self->get_conf('deftypefnnewline') eq 'on'
+          and ($command_name eq 'deftypefn' or $command_name eq 'deftypeop')) {
+        $def_call .= '<br> ';
       } else {
-        $tree = $self->gdt("\@code{{name}}", {'name' => $name});
+        $def_call .= ' ';
       }
+    }
+
+    if ($element->{'extra'} and $element->{'extra'}->{'def_parsed_hash'}
+        and defined($element->{'extra'}->{'def_parsed_hash'}->{'name'})) {
+      my $name = $element->{'extra'}->{'def_parsed_hash'}->{'name'};
+      $def_call .= $self->html_attribute_class('code', ['code']).">".
+         $self->_convert({'type' => '_code', 'contents' => [$name]})
+         .'</code>';
+    }
+
+    if ($arguments) {
     # arguments not only metasyntactic variables
     # (deftypefn, deftypevr, deftypeop, deftypecv)
-    } else {
-      if (!$element->{'extra'}->{'def_parsed_hash'}->{'type'}) {
-        if ($arguments) {
-          $tree = $self->gdt("\@code{{name}} \@code{{arguments}}", {
-                  'name' => $name,
-                  'arguments' => $arguments});
-        } else {
-          $tree = $self->gdt("\@code{{name}}", {'name' => $name});
-        }
+      if ($Texinfo::Common::def_no_var_arg_commands{$command_name}) {
+        $def_call .= ' '.$self->html_attribute_class('code', ['code']).">".
+          $self->_convert({'type' => '_code', 'contents' => $arguments})
+         .'</code>';
       } else {
-        if ($arguments) {
-          my $strings = {
-                'name' => $name,
-                'type' => $element->{'extra'}->{'def_parsed_hash'}->{'type'},
-                'arguments' => $arguments};
-          # FIXME if in @def* in @example and with @deftypefnnewline on
-          # there is no effect of @deftypefnnewline on, as @* in preformatted
-          # environment becomes an end of line, but the def* line is not in a 
preformatted
-          # 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'
-              and ($command_name eq 'deftypefn' or $command_name eq 
'deftypeop')) {
-            $tree
-               = $self->gdt("\@code{{type}}\@* \@code{{name}} 
\@code{{arguments}}",
-                          $strings);
-          } else {
-            $tree
-               = $self->gdt("\@code{{type}} \@code{{name}} 
\@code{{arguments}}",
-                          $strings);
-          }
-        } else {
-          my $strings = {
-                  'type' => $element->{'extra'}->{'def_parsed_hash'}->{'type'},
-                  'name' => $name};
-          if ($self->get_conf('deftypefnnewline') eq 'on'
-              and ($command_name eq 'deftypefn' or $command_name eq 
'deftypeop')) {
-            $tree = $self->gdt("\@code{{type}}\@* \@code{{name}}",
-                    $strings);
-          } else {
-            $tree = $self->gdt("\@code{{type}} \@code{{name}}",
-                    $strings);
-          }
-        }
+        # only metasyntactic variable arguments (deffn, defvr, deftp, defop, 
defcv)
+        push @{$self->{'document_context'}->[-1]->{'monospace'}}, 0;
+        my $open = $self->html_attribute_class('span', ['r']);
+        $def_call .= ' '.$open;
+        $def_call .= '>' if ($open ne '');
+        $def_call .= $self->html_attribute_class('i', ['slanted']).">"
+          . $self->_convert({'contents' => $arguments}). '</i>';
+        $def_call .= '</span>' if ($open ne '');
+        pop @{$self->{'document_context'}->[-1]->{'monospace'}};
       }
     }
 
@@ -5989,7 +5966,7 @@ sub _convert_def_line_type($$$$)
     }
     return $self->html_attribute_class('dt', \@classes)
          . "$index_label>" . $category_result . $anchor_span_open
-         . $self->convert_tree({'type' => '_code', 'contents' => [$tree]})
+         . $def_call
          . "$anchor$anchor_span_close</dt>\n";
   } else {
     my $category_prepared = '';
diff --git a/tp/t/results/formatting/defcondx_Dbar/res_html/defxcond.html 
b/tp/t/results/formatting/defcondx_Dbar/res_html/defxcond.html
index ff183370f3..562a8398c0 100644
--- a/tp/t/results/formatting/defcondx_Dbar/res_html/defxcond.html
+++ b/tp/t/results/formatting/defcondx_Dbar/res_html/defxcond.html
@@ -25,8 +25,8 @@ span.program-in-footer {font-size: smaller}
 
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">foo: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">bar: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">foo: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">bar: </span></dt>
 <dd>
 <p>Documentation.
 </p>
diff --git a/tp/t/results/formatting/defcondx_Ubar/res_html/defxcond.html 
b/tp/t/results/formatting/defcondx_Ubar/res_html/defxcond.html
index f0d0658b0a..37c9fecf95 100644
--- a/tp/t/results/formatting/defcondx_Ubar/res_html/defxcond.html
+++ b/tp/t/results/formatting/defcondx_Ubar/res_html/defxcond.html
@@ -25,7 +25,7 @@ span.program-in-footer {font-size: smaller}
 
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">foo: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">foo: </span></dt>
 <dd>
 
 <p>Documentation.
diff --git a/tp/tests/indices/res_parser/index_special_region/Chapter.html 
b/tp/tests/indices/res_parser/index_special_region/Chapter.html
index 181a782773..5a93da8aea 100644
--- a/tp/tests/indices/res_parser/index_special_region/Chapter.html
+++ b/tp/tests/indices/res_parser/index_special_region/Chapter.html
@@ -95,7 +95,7 @@ and titlepage, and various wrong index entries.
 
 <dl class="first-deffn">
 <dt class="deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
 </dl>
 
diff --git a/tp/tests/indices/res_parser/index_special_region_html/Chapter.html 
b/tp/tests/indices/res_parser/index_special_region_html/Chapter.html
index 727cb87cdc..4d70c3eff0 100644
--- a/tp/tests/indices/res_parser/index_special_region_html/Chapter.html
+++ b/tp/tests/indices/res_parser/index_special_region_html/Chapter.html
@@ -95,7 +95,7 @@ and titlepage, and various wrong index entries.
 
 <dl class="first-deffn">
 <dt class="deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
 </dl>
 
diff --git 
a/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Chapter.html
 
b/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Chapter.html
index fcc2225e1b..bb70c27c33 100644
--- 
a/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Chapter.html
+++ 
b/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Chapter.html
@@ -56,7 +56,7 @@ and titlepage, and various wrong index entries.
 
 <dl class="first-deffn">
 <dt class="deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
 </dl>
 
diff --git 
a/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Chapter.html
 
b/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Chapter.html
index acaab4fa82..27da634405 100644
--- 
a/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Chapter.html
+++ 
b/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Chapter.html
@@ -56,7 +56,7 @@ and titlepage, and various wrong index entries.
 
 <dl class="first-deffn">
 <dt class="deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
 </dl>
 
diff --git 
a/tp/tests/indices/res_parser/index_special_region_no_region/Chapter.html 
b/tp/tests/indices/res_parser/index_special_region_no_region/Chapter.html
index 9abb338567..684deb957f 100644
--- a/tp/tests/indices/res_parser/index_special_region_no_region/Chapter.html
+++ b/tp/tests/indices/res_parser/index_special_region_no_region/Chapter.html
@@ -56,7 +56,7 @@ and titlepage, and various wrong index entries.
 
 <dl class="first-deffn">
 <dt class="deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
 </dl>
 
diff --git 
a/tp/tests/indices/res_parser/index_special_region_no_region_html/Chapter.html 
b/tp/tests/indices/res_parser/index_special_region_no_region_html/Chapter.html
index f7bb746774..55d99cce95 100644
--- 
a/tp/tests/indices/res_parser/index_special_region_no_region_html/Chapter.html
+++ 
b/tp/tests/indices/res_parser/index_special_region_no_region_html/Chapter.html
@@ -56,7 +56,7 @@ and titlepage, and various wrong index entries.
 
 <dl class="first-deffn">
 <dt class="deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
 </dl>
 
diff --git 
a/tp/tests/indices/res_parser_info/index_special_region_html/index.html 
b/tp/tests/indices/res_parser_info/index_special_region_html/index.html
index c70dcd4c8e..c4d64a9283 100644
--- a/tp/tests/indices/res_parser_info/index_special_region_html/index.html
+++ b/tp/tests/indices/res_parser_info/index_special_region_html/index.html
@@ -103,7 +103,7 @@ and titlepage, and various wrong index entries.
 
 <dl class="first-deffn">
 <dt class="deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
 </dl>
 
diff --git 
a/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/index.html
 
b/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/index.html
index fa35d2294d..357c0dace9 100644
--- 
a/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/index.html
+++ 
b/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/index.html
@@ -63,7 +63,7 @@ and titlepage, and various wrong index entries.
 
 <dl class="first-deffn">
 <dt class="deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
 </dl>
 
diff --git 
a/tp/tests/indices/res_parser_info/index_special_region_no_region_html/index.html
 
b/tp/tests/indices/res_parser_info/index_special_region_no_region_html/index.html
index 408892ae2d..b5674dbeb3 100644
--- 
a/tp/tests/indices/res_parser_info/index_special_region_no_region_html/index.html
+++ 
b/tp/tests/indices/res_parser_info/index_special_region_no_region_html/index.html
@@ -64,7 +64,7 @@ and titlepage, and various wrong index entries.
 
 <dl class="first-deffn">
 <dt class="deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
 </dl>
 
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html 
b/tp/tests/layout/res_parser/formatting/formatting.html
index 0b254cecc4..f9df174e64 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -1899,7 +1899,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-titlepage-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-titlepage-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-titlepage-machin-4'> &para;</a></span></dt>
@@ -1911,11 +1911,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-titlepage-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -2976,7 +2976,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-copying-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-copying-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-copying-machin-4'> &para;</a></span></dt>
@@ -2988,11 +2988,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-copying-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -4110,7 +4110,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-copying-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-copying-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-copying-machin-4'> &para;</a></span></dt>
@@ -4122,11 +4122,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-copying-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -5186,7 +5186,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-machin-4'> &para;</a></span></dt>
@@ -5198,11 +5198,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-invalid"><span class="category-def">fsetinv: 
</span><span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-invalid'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -6083,32 +6083,28 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
 <dt class="deftypefn deftypefun-alias-deftypefn" id="index-name2-1"><span 
class="category-def">Function:
- </span><span><code class="code">data-type2</code>
- <code class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-name2-1'> &para;</a></span></dt>
+ </span><span><code class="code">data-type2</code><br> <code 
class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-name2-1'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">aaa2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypefn">
 <dt class="deftypefn" id="index-d_002d_002deftypefn_005fname2-1"><span 
class="category-def">c--ategory2:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypefn_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypefn_005fname2-1'> &para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypefn_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypefn_005fname2-1'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypefn no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
&para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
&para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
@@ -6417,7 +6413,7 @@ Invalid use of @':
 <pre class="example-preformatted">
 
 </pre><dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-8"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-machin-8'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-9"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-machin-9'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-10"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-machin-10'> &para;</a></span></dt>
@@ -6430,11 +6426,11 @@ Invalid use of @':
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-invalid-1"><span class="category-def">fsetinv: 
</span><span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-invalid-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </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 3287707f55..81e4339b10 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter.html
@@ -1899,7 +1899,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-copying-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-copying-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-copying-machin-4'> &para;</a></span></dt>
@@ -1911,11 +1911,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-copying-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -2975,7 +2975,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-machin-4'> &para;</a></span></dt>
@@ -2987,11 +2987,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-invalid"><span class="category-def">fsetinv: 
</span><span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-invalid'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -3872,32 +3872,28 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
 <dt class="deftypefn deftypefun-alias-deftypefn" id="index-name2-1"><span 
class="category-def">Function:
- </span><span><code class="code">data-type2</code>
- <code class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-name2-1'> &para;</a></span></dt>
+ </span><span><code class="code">data-type2</code><br> <code 
class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-name2-1'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">aaa2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypefn">
 <dt class="deftypefn" id="index-d_002d_002deftypefn_005fname2-1"><span 
class="category-def">c--ategory2:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypefn_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypefn_005fname2-1'> &para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypefn_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypefn_005fname2-1'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypefn no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
&para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
&para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
@@ -4206,7 +4202,7 @@ Invalid use of @':
 <pre class="example-preformatted">
 
 </pre><dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-8"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-machin-8'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-9"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-machin-9'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-10"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-machin-10'> &para;</a></span></dt>
@@ -4219,11 +4215,11 @@ Invalid use of @':
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-invalid-1"><span class="category-def">fsetinv: 
</span><span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-invalid-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </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 22e54c601a..6f58291bc2 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting.html
@@ -1892,7 +1892,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-titlepage-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-titlepage-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-titlepage-machin-4'> &para;</a></span></dt>
@@ -1904,11 +1904,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-titlepage-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -2969,7 +2969,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-copying-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-copying-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-copying-machin-4'> &para;</a></span></dt>
@@ -2981,11 +2981,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-copying-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
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 f3e3828948..adfc3f6ee0 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
@@ -1899,7 +1899,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-titlepage-machin-2'> ¶</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-titlepage-machin-3'> ¶</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-titlepage-machin-4'> ¶</a></span></dt>
@@ -1911,11 +1911,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-titlepage-invalid'> 
¶</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
‘<samp class="samp">i</samp>’ ule</b>: </span><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
‘<samp class="samp">i</samp>’ ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g–roupe
@@ -2976,7 +2976,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-copying-machin-2'> ¶</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-copying-machin-3'> ¶</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-copying-machin-4'> ¶</a></span></dt>
@@ -2988,11 +2988,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-copying-invalid'> 
¶</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
‘<samp class="samp">i</samp>’ ule</b>: </span><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
‘<samp class="samp">i</samp>’ ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g–roupe
@@ -4110,7 +4110,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-copying-machin-2'> ¶</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-copying-machin-3'> ¶</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-copying-machin-4'> ¶</a></span></dt>
@@ -4122,11 +4122,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-copying-invalid'> 
¶</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
‘<samp class="samp">i</samp>’ ule</b>: </span><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
‘<samp class="samp">i</samp>’ ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g–roupe
@@ -5186,7 +5186,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-machin-2'> ¶</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-machin-3'> ¶</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-machin-4'> ¶</a></span></dt>
@@ -5198,11 +5198,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-invalid"><span class="category-def">fsetinv: 
</span><span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-invalid'> ¶</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
‘<samp class="samp">i</samp>’ ule</b>: </span><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
‘<samp class="samp">i</samp>’ ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g–roupe
@@ -6083,32 +6083,28 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
 <dt class="deftypefn deftypefun-alias-deftypefn" id="index-name2-1"><span 
class="category-def">Function:
- </span><span><code class="code">data-type2</code>
- <code class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-name2-1'> ¶</a></span></dt>
+ </span><span><code class="code">data-type2</code><br> <code 
class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-name2-1'> ¶</a></span></dt>
 <dd><pre class="example-preformatted">aaa2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypefn">
 <dt class="deftypefn" id="index-d_002d_002deftypefn_005fname2-1"><span 
class="category-def">c--ategory2:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypefn_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypefn_005fname2-1'> ¶</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypefn_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypefn_005fname2-1'> ¶</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypefn no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
¶</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
¶</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
¶</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
¶</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
@@ -6417,7 +6413,7 @@ Invalid use of @':
 <pre class="example-preformatted">
 
 </pre><dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-8"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-machin-8'> ¶</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-9"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-machin-9'> ¶</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-10"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-machin-10'> ¶</a></span></dt>
@@ -6430,11 +6426,11 @@ Invalid use of @':
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-invalid-1"><span class="category-def">fsetinv: 
</span><span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-invalid-1'> ¶</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
‘<samp class="samp">i</samp>’ ule</b>: </span><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
‘<samp class="samp">i</samp>’ ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </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 2999c1e76a..3a05a3b8f4 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
@@ -1606,22 +1606,22 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 
 <dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
-<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-titlepage-name2"><span class="category-def">Function:<br/> 
</span><code class="code">data-type2</code><br/> <code 
class="code">name2</code> <code class="code">arguments2...</code></dt>
+<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-titlepage-name2"><span class="category-def">Function:<br/> 
</span><code class="code">data-type2</code><br> <code class="code">name2</code> 
<code class="code">arguments2...</code></dt>
 <dd><p>aaa2
 </p></dd></dl>
 
 <dl class="first-deftypefn">
-<dt class="deftypefn" id="index-titlepage-d_002d_002deftypefn_005fname2"><span 
class="category-def">c&#8211;ategory2:<br/> </span><code 
class="code">t--ype2</code><br/> <code 
class="code">d--eftypefn_name2</code></dt>
+<dt class="deftypefn" id="index-titlepage-d_002d_002deftypefn_005fname2"><span 
class="category-def">c&#8211;ategory2:<br/> </span><code 
class="code">t--ype2</code><br> <code class="code">d--eftypefn_name2</code></dt>
 <dd><p>d&#8211;eftypefn no arg2
 </p></dd></dl>
 
 <dl class="first-deftypeop">
-<dt class="deftypeop" 
id="index-titlepage-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code 
class="code">t--ype2</code><br/> <code class="code">d--eftypeop_name2</code> 
<code class="code">a--rguments2...</code></dt>
+<dt class="deftypeop" 
id="index-titlepage-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code class="code">t--ype2</code><br> 
<code class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code></dt>
 <dd><p>d&#8211;eftypeop2
 </p></dd></dl>
 
 <dl class="first-deftypeop">
-<dt class="deftypeop" 
id="index-titlepage-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code 
class="code">t--ype2</code><br/> <code 
class="code">d--eftypeop_name2</code></dt>
+<dt class="deftypeop" 
id="index-titlepage-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code class="code">t--ype2</code><br> 
<code class="code">d--eftypeop_name2</code></dt>
 <dd><p>d&#8211;eftypeop no arg2
 </p></dd></dl>
 
@@ -1898,7 +1898,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-2"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-3"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-4"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span></dt>
@@ -1910,11 +1910,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-invalid"><span 
class="category-def">fsetinv: </span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&#8211;roupe
@@ -2684,22 +2684,22 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 
 <dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
-<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-copying-name2"><span class="category-def">Function:<br/> </span><code 
class="code">data-type2</code><br/> <code class="code">name2</code> <code 
class="code">arguments2...</code></dt>
+<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-copying-name2"><span class="category-def">Function:<br/> </span><code 
class="code">data-type2</code><br> <code class="code">name2</code> <code 
class="code">arguments2...</code></dt>
 <dd><p>aaa2
 </p></dd></dl>
 
 <dl class="first-deftypefn">
-<dt class="deftypefn" id="index-copying-d_002d_002deftypefn_005fname2"><span 
class="category-def">c&#8211;ategory2:<br/> </span><code 
class="code">t--ype2</code><br/> <code 
class="code">d--eftypefn_name2</code></dt>
+<dt class="deftypefn" id="index-copying-d_002d_002deftypefn_005fname2"><span 
class="category-def">c&#8211;ategory2:<br/> </span><code 
class="code">t--ype2</code><br> <code class="code">d--eftypefn_name2</code></dt>
 <dd><p>d&#8211;eftypefn no arg2
 </p></dd></dl>
 
 <dl class="first-deftypeop">
-<dt class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code 
class="code">t--ype2</code><br/> <code class="code">d--eftypeop_name2</code> 
<code class="code">a--rguments2...</code></dt>
+<dt class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code class="code">t--ype2</code><br> 
<code class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code></dt>
 <dd><p>d&#8211;eftypeop2
 </p></dd></dl>
 
 <dl class="first-deftypeop">
-<dt class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code 
class="code">t--ype2</code><br/> <code 
class="code">d--eftypeop_name2</code></dt>
+<dt class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code class="code">t--ype2</code><br> 
<code class="code">d--eftypeop_name2</code></dt>
 <dd><p>d&#8211;eftypeop no arg2
 </p></dd></dl>
 
@@ -2975,7 +2975,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span></dt>
@@ -2987,11 +2987,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&#8211;roupe
@@ -3780,22 +3780,22 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 
 <dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
-<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-copying-name2"><span class="category-def">Function:<br/> </span><code 
class="code">data-type2</code><br/> <code class="code">name2</code> <code 
class="code">arguments2...</code></dt>
+<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-copying-name2"><span class="category-def">Function:<br/> </span><code 
class="code">data-type2</code><br> <code class="code">name2</code> <code 
class="code">arguments2...</code></dt>
 <dd><p>aaa2
 </p></dd></dl>
 
 <dl class="first-deftypefn">
-<dt class="deftypefn" id="index-copying-d_002d_002deftypefn_005fname2"><span 
class="category-def">c&#8211;ategory2:<br/> </span><code 
class="code">t--ype2</code><br/> <code 
class="code">d--eftypefn_name2</code></dt>
+<dt class="deftypefn" id="index-copying-d_002d_002deftypefn_005fname2"><span 
class="category-def">c&#8211;ategory2:<br/> </span><code 
class="code">t--ype2</code><br> <code class="code">d--eftypefn_name2</code></dt>
 <dd><p>d&#8211;eftypefn no arg2
 </p></dd></dl>
 
 <dl class="first-deftypeop">
-<dt class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code 
class="code">t--ype2</code><br/> <code class="code">d--eftypeop_name2</code> 
<code class="code">a--rguments2...</code></dt>
+<dt class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code class="code">t--ype2</code><br> 
<code class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code></dt>
 <dd><p>d&#8211;eftypeop2
 </p></dd></dl>
 
 <dl class="first-deftypeop">
-<dt class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code 
class="code">t--ype2</code><br/> <code 
class="code">d--eftypeop_name2</code></dt>
+<dt class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code class="code">t--ype2</code><br> 
<code class="code">d--eftypeop_name2</code></dt>
 <dd><p>d&#8211;eftypeop no arg2
 </p></dd></dl>
 
@@ -4071,7 +4071,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span></dt>
@@ -4083,11 +4083,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&#8211;roupe
@@ -4856,22 +4856,22 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 
 <dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
-<dt class="deftypefn deftypefun-alias-deftypefn" id="index-name2"><span 
class="category-def">Function:<br/> </span><code 
class="code">data-type2</code><br/> <code class="code">name2</code> <code 
class="code">arguments2...</code></dt>
+<dt class="deftypefn deftypefun-alias-deftypefn" id="index-name2"><span 
class="category-def">Function:<br/> </span><code 
class="code">data-type2</code><br> <code class="code">name2</code> <code 
class="code">arguments2...</code></dt>
 <dd><p>aaa2
 </p></dd></dl>
 
 <dl class="first-deftypefn">
-<dt class="deftypefn" id="index-d_002d_002deftypefn_005fname2"><span 
class="category-def">c&#8211;ategory2:<br/> </span><code 
class="code">t--ype2</code><br/> <code 
class="code">d--eftypefn_name2</code></dt>
+<dt class="deftypefn" id="index-d_002d_002deftypefn_005fname2"><span 
class="category-def">c&#8211;ategory2:<br/> </span><code 
class="code">t--ype2</code><br> <code class="code">d--eftypefn_name2</code></dt>
 <dd><p>d&#8211;eftypefn no arg2
 </p></dd></dl>
 
 <dl class="first-deftypeop">
-<dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code 
class="code">t--ype2</code><br/> <code class="code">d--eftypeop_name2</code> 
<code class="code">a--rguments2...</code></dt>
+<dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code class="code">t--ype2</code><br> 
<code class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code></dt>
 <dd><p>d&#8211;eftypeop2
 </p></dd></dl>
 
 <dl class="first-deftypeop">
-<dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code 
class="code">t--ype2</code><br/> <code 
class="code">d--eftypeop_name2</code></dt>
+<dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code class="code">t--ype2</code><br> 
<code class="code">d--eftypeop_name2</code></dt>
 <dd><p>d&#8211;eftypeop no arg2
 </p></dd></dl>
 
@@ -5147,7 +5147,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-2"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-3"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-4"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span></dt>
@@ -5159,11 +5159,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-invalid"><span class="category-def">fsetinv: 
</span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&#8211;roupe
@@ -6044,32 +6044,28 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
 <dt class="deftypefn deftypefun-alias-deftypefn" id="index-name2-1"><span 
class="category-def">Function:
- </span><code class="code">data-type2</code>
- <code class="code">name2</code> <code class="code">arguments2...</code></dt>
+ </span><code class="code">data-type2</code><br> <code 
class="code">name2</code> <code class="code">arguments2...</code></dt>
 <dd><pre class="example-preformatted">aaa2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypefn">
 <dt class="deftypefn" id="index-d_002d_002deftypefn_005fname2-1"><span 
class="category-def">c--ategory2:
- </span><code class="code">t--ype2</code>
- <code class="code">d--eftypefn_name2</code></dt>
+ </span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypefn_name2</code></dt>
 <dd><pre class="example-preformatted">d--eftypefn no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code></dt>
+ </span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code></dt>
 <dd><pre class="example-preformatted">d--eftypeop2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code></dt>
+ </span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code></dt>
 <dd><pre class="example-preformatted">d--eftypeop no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
@@ -6378,7 +6374,7 @@ Invalid use of @':
 <pre class="example-preformatted">
 
 </pre><dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-8"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-9"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-10"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span></dt>
@@ -6391,11 +6387,11 @@ Invalid use of @':
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-invalid-1"><span class="category-def">fsetinv: 
</span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </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 faa1434780..d416560139 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
@@ -1613,22 +1613,22 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 
 <dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
-<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-copying-name2"><span class="category-def">Function:<br/> </span><code 
class="code">data-type2</code><br/> <code class="code">name2</code> <code 
class="code">arguments2...</code></dt>
+<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-copying-name2"><span class="category-def">Function:<br/> </span><code 
class="code">data-type2</code><br> <code class="code">name2</code> <code 
class="code">arguments2...</code></dt>
 <dd><p>aaa2
 </p></dd></dl>
 
 <dl class="first-deftypefn">
-<dt class="deftypefn" id="index-copying-d_002d_002deftypefn_005fname2"><span 
class="category-def">c&#8211;ategory2:<br/> </span><code 
class="code">t--ype2</code><br/> <code 
class="code">d--eftypefn_name2</code></dt>
+<dt class="deftypefn" id="index-copying-d_002d_002deftypefn_005fname2"><span 
class="category-def">c&#8211;ategory2:<br/> </span><code 
class="code">t--ype2</code><br> <code class="code">d--eftypefn_name2</code></dt>
 <dd><p>d&#8211;eftypefn no arg2
 </p></dd></dl>
 
 <dl class="first-deftypeop">
-<dt class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code 
class="code">t--ype2</code><br/> <code class="code">d--eftypeop_name2</code> 
<code class="code">a--rguments2...</code></dt>
+<dt class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code class="code">t--ype2</code><br> 
<code class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code></dt>
 <dd><p>d&#8211;eftypeop2
 </p></dd></dl>
 
 <dl class="first-deftypeop">
-<dt class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code 
class="code">t--ype2</code><br/> <code 
class="code">d--eftypeop_name2</code></dt>
+<dt class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code class="code">t--ype2</code><br> 
<code class="code">d--eftypeop_name2</code></dt>
 <dd><p>d&#8211;eftypeop no arg2
 </p></dd></dl>
 
@@ -1904,7 +1904,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span></dt>
@@ -1916,11 +1916,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&#8211;roupe
@@ -2689,22 +2689,22 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 
 <dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
-<dt class="deftypefn deftypefun-alias-deftypefn" id="index-name2"><span 
class="category-def">Function:<br/> </span><code 
class="code">data-type2</code><br/> <code class="code">name2</code> <code 
class="code">arguments2...</code></dt>
+<dt class="deftypefn deftypefun-alias-deftypefn" id="index-name2"><span 
class="category-def">Function:<br/> </span><code 
class="code">data-type2</code><br> <code class="code">name2</code> <code 
class="code">arguments2...</code></dt>
 <dd><p>aaa2
 </p></dd></dl>
 
 <dl class="first-deftypefn">
-<dt class="deftypefn" id="index-d_002d_002deftypefn_005fname2"><span 
class="category-def">c&#8211;ategory2:<br/> </span><code 
class="code">t--ype2</code><br/> <code 
class="code">d--eftypefn_name2</code></dt>
+<dt class="deftypefn" id="index-d_002d_002deftypefn_005fname2"><span 
class="category-def">c&#8211;ategory2:<br/> </span><code 
class="code">t--ype2</code><br> <code class="code">d--eftypefn_name2</code></dt>
 <dd><p>d&#8211;eftypefn no arg2
 </p></dd></dl>
 
 <dl class="first-deftypeop">
-<dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code 
class="code">t--ype2</code><br/> <code class="code">d--eftypeop_name2</code> 
<code class="code">a--rguments2...</code></dt>
+<dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code class="code">t--ype2</code><br> 
<code class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code></dt>
 <dd><p>d&#8211;eftypeop2
 </p></dd></dl>
 
 <dl class="first-deftypeop">
-<dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code 
class="code">t--ype2</code><br/> <code 
class="code">d--eftypeop_name2</code></dt>
+<dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code class="code">t--ype2</code><br> 
<code class="code">d--eftypeop_name2</code></dt>
 <dd><p>d&#8211;eftypeop no arg2
 </p></dd></dl>
 
@@ -2980,7 +2980,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-2"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-3"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-4"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span></dt>
@@ -2992,11 +2992,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-invalid"><span class="category-def">fsetinv: 
</span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&#8211;roupe
@@ -3877,32 +3877,28 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
 <dt class="deftypefn deftypefun-alias-deftypefn" id="index-name2-1"><span 
class="category-def">Function:
- </span><code class="code">data-type2</code>
- <code class="code">name2</code> <code class="code">arguments2...</code></dt>
+ </span><code class="code">data-type2</code><br> <code 
class="code">name2</code> <code class="code">arguments2...</code></dt>
 <dd><pre class="example-preformatted">aaa2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypefn">
 <dt class="deftypefn" id="index-d_002d_002deftypefn_005fname2-1"><span 
class="category-def">c--ategory2:
- </span><code class="code">t--ype2</code>
- <code class="code">d--eftypefn_name2</code></dt>
+ </span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypefn_name2</code></dt>
 <dd><pre class="example-preformatted">d--eftypefn no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code></dt>
+ </span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code></dt>
 <dd><pre class="example-preformatted">d--eftypeop2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code></dt>
+ </span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code></dt>
 <dd><pre class="example-preformatted">d--eftypeop no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
@@ -4211,7 +4207,7 @@ Invalid use of @':
 <pre class="example-preformatted">
 
 </pre><dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-8"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-9"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-10"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span></dt>
@@ -4224,11 +4220,11 @@ Invalid use of @':
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-invalid-1"><span class="category-def">fsetinv: 
</span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </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 564ded13a3..3865c2d23b 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
@@ -1603,22 +1603,22 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 
 <dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
-<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-titlepage-name2"><span class="category-def">Function:<br/> 
</span><code class="code">data-type2</code><br/> <code 
class="code">name2</code> <code class="code">arguments2...</code></dt>
+<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-titlepage-name2"><span class="category-def">Function:<br/> 
</span><code class="code">data-type2</code><br> <code class="code">name2</code> 
<code class="code">arguments2...</code></dt>
 <dd><p>aaa2
 </p></dd></dl>
 
 <dl class="first-deftypefn">
-<dt class="deftypefn" id="index-titlepage-d_002d_002deftypefn_005fname2"><span 
class="category-def">c&#8211;ategory2:<br/> </span><code 
class="code">t--ype2</code><br/> <code 
class="code">d--eftypefn_name2</code></dt>
+<dt class="deftypefn" id="index-titlepage-d_002d_002deftypefn_005fname2"><span 
class="category-def">c&#8211;ategory2:<br/> </span><code 
class="code">t--ype2</code><br> <code class="code">d--eftypefn_name2</code></dt>
 <dd><p>d&#8211;eftypefn no arg2
 </p></dd></dl>
 
 <dl class="first-deftypeop">
-<dt class="deftypeop" 
id="index-titlepage-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code 
class="code">t--ype2</code><br/> <code class="code">d--eftypeop_name2</code> 
<code class="code">a--rguments2...</code></dt>
+<dt class="deftypeop" 
id="index-titlepage-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code class="code">t--ype2</code><br> 
<code class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code></dt>
 <dd><p>d&#8211;eftypeop2
 </p></dd></dl>
 
 <dl class="first-deftypeop">
-<dt class="deftypeop" 
id="index-titlepage-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code 
class="code">t--ype2</code><br/> <code 
class="code">d--eftypeop_name2</code></dt>
+<dt class="deftypeop" 
id="index-titlepage-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code class="code">t--ype2</code><br> 
<code class="code">d--eftypeop_name2</code></dt>
 <dd><p>d&#8211;eftypeop no arg2
 </p></dd></dl>
 
@@ -1895,7 +1895,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-2"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-3"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-4"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span></dt>
@@ -1907,11 +1907,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-invalid"><span 
class="category-def">fsetinv: </span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&#8211;roupe
@@ -2681,22 +2681,22 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 
 <dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
-<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-copying-name2"><span class="category-def">Function:<br/> </span><code 
class="code">data-type2</code><br/> <code class="code">name2</code> <code 
class="code">arguments2...</code></dt>
+<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-copying-name2"><span class="category-def">Function:<br/> </span><code 
class="code">data-type2</code><br> <code class="code">name2</code> <code 
class="code">arguments2...</code></dt>
 <dd><p>aaa2
 </p></dd></dl>
 
 <dl class="first-deftypefn">
-<dt class="deftypefn" id="index-copying-d_002d_002deftypefn_005fname2"><span 
class="category-def">c&#8211;ategory2:<br/> </span><code 
class="code">t--ype2</code><br/> <code 
class="code">d--eftypefn_name2</code></dt>
+<dt class="deftypefn" id="index-copying-d_002d_002deftypefn_005fname2"><span 
class="category-def">c&#8211;ategory2:<br/> </span><code 
class="code">t--ype2</code><br> <code class="code">d--eftypefn_name2</code></dt>
 <dd><p>d&#8211;eftypefn no arg2
 </p></dd></dl>
 
 <dl class="first-deftypeop">
-<dt class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code 
class="code">t--ype2</code><br/> <code class="code">d--eftypeop_name2</code> 
<code class="code">a--rguments2...</code></dt>
+<dt class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code class="code">t--ype2</code><br> 
<code class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code></dt>
 <dd><p>d&#8211;eftypeop2
 </p></dd></dl>
 
 <dl class="first-deftypeop">
-<dt class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code 
class="code">t--ype2</code><br/> <code 
class="code">d--eftypeop_name2</code></dt>
+<dt class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><span 
class="category-def">c&#8211;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><code class="code">t--ype2</code><br> 
<code class="code">d--eftypeop_name2</code></dt>
 <dd><p>d&#8211;eftypeop no arg2
 </p></dd></dl>
 
@@ -2972,7 +2972,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span></dt>
@@ -2984,11 +2984,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&#8211;roupe
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 2c127e3068..b86e36af90 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -1899,7 +1899,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun&nbsp;:</span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun&nbsp;:</span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-2"><span 
class="category-def">truc&nbsp;:</span><span><code class="code">machin</code> 
<span class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-titlepage-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-3"><span 
class="category-def">truc&nbsp;:</span><span><code class="code">machin</code> 
<span class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-titlepage-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-4"><span 
class="category-def">truc&nbsp;:</span><span><code class="code">machin</code> 
<span class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-titlepage-machin-4'> &para;</a></span></dt>
@@ -1911,11 +1911,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-invalid"><span 
class="category-def">fsetinv&nbsp;:</span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-titlepage-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>&nbsp;:</span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span 
class="category-def">aaa&nbsp;:</span><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span 
class="category-def">&nbsp;:</span><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span 
class="category-def">truc&nbsp;:</span><code class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>&nbsp;:</span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span 
class="category-def">aaa&nbsp;:</span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">&nbsp;:</span></dt>
+<dt class="deffnx def-cmd-deffn"><span 
class="category-def">truc&nbsp;:</span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -2976,7 +2976,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun&nbsp;:</span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun&nbsp;:</span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc&nbsp;:</span><span><code class="code">machin</code> 
<span class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-copying-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc&nbsp;:</span><span><code class="code">machin</code> 
<span class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-copying-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc&nbsp;:</span><span><code class="code">machin</code> 
<span class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-copying-machin-4'> &para;</a></span></dt>
@@ -2988,11 +2988,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv&nbsp;:</span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-copying-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>&nbsp;:</span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span 
class="category-def">aaa&nbsp;:</span><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span 
class="category-def">&nbsp;:</span><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span 
class="category-def">truc&nbsp;:</span><code class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>&nbsp;:</span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span 
class="category-def">aaa&nbsp;:</span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">&nbsp;:</span></dt>
+<dt class="deffnx def-cmd-deffn"><span 
class="category-def">truc&nbsp;:</span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -4110,7 +4110,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun&nbsp;:</span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun&nbsp;:</span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc&nbsp;:</span><span><code class="code">machin</code> 
<span class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-copying-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc&nbsp;:</span><span><code class="code">machin</code> 
<span class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-copying-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc&nbsp;:</span><span><code class="code">machin</code> 
<span class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-copying-machin-4'> &para;</a></span></dt>
@@ -4122,11 +4122,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv&nbsp;:</span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-copying-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>&nbsp;:</span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span 
class="category-def">aaa&nbsp;:</span><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span 
class="category-def">&nbsp;:</span><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span 
class="category-def">truc&nbsp;:</span><code class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>&nbsp;:</span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span 
class="category-def">aaa&nbsp;:</span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">&nbsp;:</span></dt>
+<dt class="deffnx def-cmd-deffn"><span 
class="category-def">truc&nbsp;:</span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -5186,7 +5186,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun&nbsp;:</span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun&nbsp;:</span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-2"><span 
class="category-def">truc&nbsp;:</span><span><code class="code">machin</code> 
<span class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-3"><span 
class="category-def">truc&nbsp;:</span><span><code class="code">machin</code> 
<span class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-4"><span 
class="category-def">truc&nbsp;:</span><span><code class="code">machin</code> 
<span class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-machin-4'> &para;</a></span></dt>
@@ -5198,11 +5198,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-invalid"><span 
class="category-def">fsetinv&nbsp;:</span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>&nbsp;:</span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span 
class="category-def">aaa&nbsp;:</span><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span 
class="category-def">&nbsp;:</span><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span 
class="category-def">truc&nbsp;:</span><code class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>&nbsp;:</span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span 
class="category-def">aaa&nbsp;:</span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">&nbsp;:</span></dt>
+<dt class="deffnx def-cmd-deffn"><span 
class="category-def">truc&nbsp;:</span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -6083,32 +6083,28 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
 <dt class="deftypefn deftypefun-alias-deftypefn" id="index-name2-1"><span 
class="category-def">Fonction&nbsp;:
- </span><span><code class="code">data-type2</code>
- <code class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-name2-1'> &para;</a></span></dt>
+ </span><span><code class="code">data-type2</code><br> <code 
class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-name2-1'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">aaa2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypefn">
 <dt class="deftypefn" id="index-d_002d_002deftypefn_005fname2-1"><span 
class="category-def">c--ategory2&nbsp;:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypefn_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypefn_005fname2-1'> &para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypefn_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypefn_005fname2-1'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypefn no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
&para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
&para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
@@ -6417,7 +6413,7 @@ Invalid use of @':
 <pre class="example-preformatted">
 
 </pre><dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun&nbsp;:</span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun&nbsp;:</span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-8"><span 
class="category-def">truc&nbsp;:</span><span><code class="code">machin</code> 
<span class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-machin-8'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-9"><span 
class="category-def">truc&nbsp;:</span><span><code class="code">machin</code> 
<span class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-machin-9'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-10"><span 
class="category-def">truc&nbsp;:</span><span><code class="code">machin</code> 
<span class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-machin-10'> &para;</a></span></dt>
@@ -6430,11 +6426,11 @@ Invalid use of @':
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-invalid-1"><span 
class="category-def">fsetinv&nbsp;:</span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-invalid-1'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>&nbsp;:</span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span 
class="category-def">aaa&nbsp;:</span><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span 
class="category-def">&nbsp;:</span><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span 
class="category-def">truc&nbsp;:</span><code class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>&nbsp;:</span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span 
class="category-def">aaa&nbsp;:</span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">&nbsp;:</span></dt>
+<dt class="deffnx def-cmd-deffn"><span 
class="category-def">truc&nbsp;:</span></dt>
 </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 0b254cecc4..f9df174e64 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -1899,7 +1899,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-titlepage-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-titlepage-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-titlepage-machin-4'> &para;</a></span></dt>
@@ -1911,11 +1911,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-titlepage-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -2976,7 +2976,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-copying-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-copying-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-copying-machin-4'> &para;</a></span></dt>
@@ -2988,11 +2988,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-copying-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -4110,7 +4110,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-copying-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-copying-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-copying-machin-4'> &para;</a></span></dt>
@@ -4122,11 +4122,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-copying-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -5186,7 +5186,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-machin-4'> &para;</a></span></dt>
@@ -5198,11 +5198,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-invalid"><span class="category-def">fsetinv: 
</span><span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-invalid'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -6083,32 +6083,28 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
 <dt class="deftypefn deftypefun-alias-deftypefn" id="index-name2-1"><span 
class="category-def">Function:
- </span><span><code class="code">data-type2</code>
- <code class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-name2-1'> &para;</a></span></dt>
+ </span><span><code class="code">data-type2</code><br> <code 
class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-name2-1'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">aaa2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypefn">
 <dt class="deftypefn" id="index-d_002d_002deftypefn_005fname2-1"><span 
class="category-def">c--ategory2:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypefn_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypefn_005fname2-1'> &para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypefn_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypefn_005fname2-1'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypefn no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
&para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
&para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
@@ -6417,7 +6413,7 @@ Invalid use of @':
 <pre class="example-preformatted">
 
 </pre><dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-8"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-machin-8'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-9"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-machin-9'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-10"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-machin-10'> &para;</a></span></dt>
@@ -6430,11 +6426,11 @@ Invalid use of @':
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-invalid-1"><span class="category-def">fsetinv: 
</span><span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-invalid-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </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 d80ad28e59..f9e048af79 100644
--- a/tp/tests/layout/res_parser/formatting_html32/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html32/formatting.html
@@ -1845,7 +1845,7 @@ html ''
 </dl>
 
 <dl>
-<dt>fun: <code></code></dt>
+<dt>fun: </dt>
 <dt id="index-titlepage-machin-2">truc: <code>machin</code> <i>bidule chose 
and</i></dt>
 <dt id="index-titlepage-machin-3">truc: <code>machin</code> <i>bidule chose 
and  after</i></dt>
 <dt id="index-titlepage-machin-4">truc: <code>machin</code> <i>bidule chose 
and </i></dt>
@@ -1857,11 +1857,11 @@ html ''
 
 <dl>
 <dt id="index-titlepage-invalid">fsetinv: <code><var>invalid</var></code> <i>a 
g</i></dt>
-<dt><b>id `<samp>i</samp>' ule</b>: <code></code></dt>
-<dt><code></code></dt>
-<dt>aaa: <code></code></dt>
-<dt>: <code></code></dt>
-<dt>truc: <code></code></dt>
+<dt><b>id `<samp>i</samp>' ule</b>: </dt>
+<dt></dt>
+<dt>aaa: </dt>
+<dt>: </dt>
+<dt>truc: </dt>
 </dl>
 
 <div><p>g-roupe
@@ -2896,7 +2896,7 @@ html ''
 </dl>
 
 <dl>
-<dt>fun: <code></code></dt>
+<dt>fun: </dt>
 <dt id="index-copying-machin-2">truc: <code>machin</code> <i>bidule chose 
and</i></dt>
 <dt id="index-copying-machin-3">truc: <code>machin</code> <i>bidule chose and  
after</i></dt>
 <dt id="index-copying-machin-4">truc: <code>machin</code> <i>bidule chose and 
</i></dt>
@@ -2908,11 +2908,11 @@ html ''
 
 <dl>
 <dt id="index-copying-invalid">fsetinv: <code><var>invalid</var></code> <i>a 
g</i></dt>
-<dt><b>id `<samp>i</samp>' ule</b>: <code></code></dt>
-<dt><code></code></dt>
-<dt>aaa: <code></code></dt>
-<dt>: <code></code></dt>
-<dt>truc: <code></code></dt>
+<dt><b>id `<samp>i</samp>' ule</b>: </dt>
+<dt></dt>
+<dt>aaa: </dt>
+<dt>: </dt>
+<dt>truc: </dt>
 </dl>
 
 <div><p>g-roupe
@@ -4004,7 +4004,7 @@ html ''
 </dl>
 
 <dl>
-<dt>fun: <code></code></dt>
+<dt>fun: </dt>
 <dt id="index-copying-machin-2">truc: <code>machin</code> <i>bidule chose 
and</i></dt>
 <dt id="index-copying-machin-3">truc: <code>machin</code> <i>bidule chose and  
after</i></dt>
 <dt id="index-copying-machin-4">truc: <code>machin</code> <i>bidule chose and 
</i></dt>
@@ -4016,11 +4016,11 @@ html ''
 
 <dl>
 <dt id="index-copying-invalid">fsetinv: <code><var>invalid</var></code> <i>a 
g</i></dt>
-<dt><b>id `<samp>i</samp>' ule</b>: <code></code></dt>
-<dt><code></code></dt>
-<dt>aaa: <code></code></dt>
-<dt>: <code></code></dt>
-<dt>truc: <code></code></dt>
+<dt><b>id `<samp>i</samp>' ule</b>: </dt>
+<dt></dt>
+<dt>aaa: </dt>
+<dt>: </dt>
+<dt>truc: </dt>
 </dl>
 
 <div><p>g-roupe
@@ -5054,7 +5054,7 @@ html ''
 </dl>
 
 <dl>
-<dt>fun: <code></code></dt>
+<dt>fun: </dt>
 <dt id="index-machin-2">truc: <code>machin</code> <i>bidule chose and</i></dt>
 <dt id="index-machin-3">truc: <code>machin</code> <i>bidule chose and  
after</i></dt>
 <dt id="index-machin-4">truc: <code>machin</code> <i>bidule chose and </i></dt>
@@ -5066,11 +5066,11 @@ html ''
 
 <dl>
 <dt id="index-invalid">fsetinv: <code><var>invalid</var></code> <i>a g</i></dt>
-<dt><b>id `<samp>i</samp>' ule</b>: <code></code></dt>
-<dt><code></code></dt>
-<dt>aaa: <code></code></dt>
-<dt>: <code></code></dt>
-<dt>truc: <code></code></dt>
+<dt><b>id `<samp>i</samp>' ule</b>: </dt>
+<dt></dt>
+<dt>aaa: </dt>
+<dt>: </dt>
+<dt>truc: </dt>
 </dl>
 
 <div><p>g-roupe
@@ -5924,32 +5924,28 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl>
 <dt id="index-name2-1">Function:
- <code>data-type2</code>
- <code>name2</code> <code>arguments2...</code></dt>
+ <code>data-type2</code><br> <code>name2</code> <code>arguments2...</code></dt>
 <dd><pre>aaa2
 </pre></dd></dl>
 <pre>
 
 </pre><dl>
 <dt id="index-d_002d_002deftypefn_005fname2-1">c--ategory2:
- <code>t--ype2</code>
- <code>d--eftypefn_name2</code></dt>
+ <code>t--ype2</code><br> <code>d--eftypefn_name2</code></dt>
 <dd><pre>d--eftypefn no arg2
 </pre></dd></dl>
 <pre>
 
 </pre><dl>
 <dt id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2">c--ategory2 
on <code>c--lass2</code>:
- <code>t--ype2</code>
- <code>d--eftypeop_name2</code> <code>a--rguments2...</code></dt>
+ <code>t--ype2</code><br> <code>d--eftypeop_name2</code> 
<code>a--rguments2...</code></dt>
 <dd><pre>d--eftypeop2
 </pre></dd></dl>
 <pre>
 
 </pre><dl>
 <dt id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3">c--ategory2 
on <code>c--lass2</code>:
- <code>t--ype2</code>
- <code>d--eftypeop_name2</code></dt>
+ <code>t--ype2</code><br> <code>d--eftypeop_name2</code></dt>
 <dd><pre>d--eftypeop no arg2
 </pre></dd></dl>
 <pre>
@@ -6258,7 +6254,7 @@ Invalid use of @':
 <pre>
 
 </pre><dl>
-<dt>fun: <code></code></dt>
+<dt>fun: </dt>
 <dt id="index-machin-8">truc: <code>machin</code> <i>bidule chose and</i></dt>
 <dt id="index-machin-9">truc: <code>machin</code> <i>bidule chose and  
after</i></dt>
 <dt id="index-machin-10">truc: <code>machin</code> <i>bidule chose and 
</i></dt>
@@ -6271,11 +6267,11 @@ Invalid use of @':
 
 </pre><dl>
 <dt id="index-invalid-1">fsetinv: <code><var>invalid</var></code> <i>a 
g</i></dt>
-<dt><b>id `<samp>i</samp>' ule</b>: <code></code></dt>
-<dt><code></code></dt>
-<dt>aaa: <code></code></dt>
-<dt>: <code></code></dt>
-<dt>truc: <code></code></dt>
+<dt><b>id `<samp>i</samp>' ule</b>: </dt>
+<dt></dt>
+<dt>aaa: </dt>
+<dt>: </dt>
+<dt>truc: </dt>
 </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 4d3be6d38d..f01549e445 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
@@ -1957,7 +1957,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-copying-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-copying-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-copying-machin-4'> &para;</a></span></dt>
@@ -1969,11 +1969,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-copying-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -3033,7 +3033,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-machin-4'> &para;</a></span></dt>
@@ -3045,11 +3045,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-invalid"><span class="category-def">fsetinv: 
</span><span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-invalid'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -3930,32 +3930,28 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
 <dt class="deftypefn deftypefun-alias-deftypefn" id="index-name2-1"><span 
class="category-def">Function:
- </span><span><code class="code">data-type2</code>
- <code class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-name2-1'> &para;</a></span></dt>
+ </span><span><code class="code">data-type2</code><br> <code 
class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-name2-1'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">aaa2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypefn">
 <dt class="deftypefn" id="index-d_002d_002deftypefn_005fname2-1"><span 
class="category-def">c--ategory2:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypefn_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypefn_005fname2-1'> &para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypefn_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypefn_005fname2-1'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypefn no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
&para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
&para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
@@ -4264,7 +4260,7 @@ Invalid use of @':
 <pre class="example-preformatted">
 
 </pre><dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-8"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-machin-8'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-9"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-machin-9'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-10"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-machin-10'> &para;</a></span></dt>
@@ -4277,11 +4273,11 @@ Invalid use of @':
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-invalid-1"><span class="category-def">fsetinv: 
</span><span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-invalid-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </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 f61c3c9c1e..d3577861b0 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -1919,7 +1919,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-copying-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-copying-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-copying-machin-4'> &para;</a></span></dt>
@@ -1931,11 +1931,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-copying-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -2995,7 +2995,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-machin-4'> &para;</a></span></dt>
@@ -3007,11 +3007,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-invalid"><span class="category-def">fsetinv: 
</span><span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-invalid'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -3892,32 +3892,28 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
 <dt class="deftypefn deftypefun-alias-deftypefn" id="index-name2-1"><span 
class="category-def">Function:
- </span><span><code class="code">data-type2</code>
- <code class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-name2-1'> &para;</a></span></dt>
+ </span><span><code class="code">data-type2</code><br> <code 
class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-name2-1'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">aaa2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypefn">
 <dt class="deftypefn" id="index-d_002d_002deftypefn_005fname2-1"><span 
class="category-def">c--ategory2:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypefn_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypefn_005fname2-1'> &para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypefn_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypefn_005fname2-1'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypefn no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
&para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
&para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
@@ -4226,7 +4222,7 @@ Invalid use of @':
 <pre class="example-preformatted">
 
 </pre><dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-8"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-machin-8'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-9"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-machin-9'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-10"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-machin-10'> &para;</a></span></dt>
@@ -4239,11 +4235,11 @@ Invalid use of @':
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-invalid-1"><span class="category-def">fsetinv: 
</span><span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-invalid-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </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 609945ddf7..eff98cb036 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
@@ -1894,7 +1894,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-titlepage-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-titlepage-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-titlepage-machin-4'> &para;</a></span></dt>
@@ -1906,11 +1906,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-titlepage-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -2971,7 +2971,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-copying-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-copying-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-copying-machin-4'> &para;</a></span></dt>
@@ -2983,11 +2983,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-copying-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
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 daaf12960d..d1e578be29 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
@@ -1871,7 +1871,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted">bidule chose and</i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-titlepage-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-titlepage-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted">bidule chose and </i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-titlepage-machin-4'> &para;</a></span></dt>
@@ -1883,11 +1883,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r" style="font-family: initial; 
font-weight: normal; font-style: normal"><i class="slanted">a g</i></span><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-titlepage-invalid'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -2948,7 +2948,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted">bidule chose and</i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-copying-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-copying-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted">bidule chose and </i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-copying-machin-4'> &para;</a></span></dt>
@@ -2960,11 +2960,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r" style="font-family: initial; 
font-weight: normal; font-style: normal"><i class="slanted">a g</i></span><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-copying-invalid'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -4082,7 +4082,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted">bidule chose and</i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-copying-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-copying-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted">bidule chose and </i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-copying-machin-4'> &para;</a></span></dt>
@@ -4094,11 +4094,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r" style="font-family: initial; 
font-weight: normal; font-style: normal"><i class="slanted">a g</i></span><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-copying-invalid'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -5158,7 +5158,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted">bidule chose and</i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted">bidule chose and </i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-machin-4'> &para;</a></span></dt>
@@ -5170,11 +5170,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-invalid"><span class="category-def">fsetinv: 
</span><span><code class="code"><var class="var">invalid</var></code> <span 
class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted">a g</i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-invalid'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -6055,32 +6055,28 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
 <dt class="deftypefn deftypefun-alias-deftypefn" id="index-name2-1"><span 
class="category-def">Function:
- </span><span><code class="code">data-type2</code>
- <code class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-name2-1'> &para;</a></span></dt>
+ </span><span><code class="code">data-type2</code><br> <code 
class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-name2-1'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">aaa2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypefn">
 <dt class="deftypefn" id="index-d_002d_002deftypefn_005fname2-1"><span 
class="category-def">c--ategory2:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypefn_name2</code><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-d_002d_002deftypefn_005fname2-1'> &para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypefn_name2</code><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-d_002d_002deftypefn_005fname2-1'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypefn no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" style="visibility: 
hidden; text-decoration: none; line-height: 0em" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
&para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" style="visibility: 
hidden; text-decoration: none; line-height: 0em" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
&para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
@@ -6389,7 +6385,7 @@ Invalid use of @':
 <pre class="example-preformatted">
 
 </pre><dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-8"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted">bidule chose and</i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-machin-8'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-9"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-machin-9'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-10"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted">bidule chose and </i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-machin-10'> &para;</a></span></dt>
@@ -6402,11 +6398,11 @@ Invalid use of @':
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-invalid-1"><span class="category-def">fsetinv: 
</span><span><code class="code"><var class="var">invalid</var></code> <span 
class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted">a g</i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-invalid-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </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 7b001220c4..1f557873de 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -1907,7 +1907,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-titlepage-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-titlepage-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-titlepage-machin-4'> &para;</a></span></dt>
@@ -1919,11 +1919,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-titlepage-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -2982,7 +2982,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-copying-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-copying-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-copying-machin-4'> &para;</a></span></dt>
@@ -2994,11 +2994,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-copying-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -4114,7 +4114,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-copying-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-copying-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-copying-machin-4'> &para;</a></span></dt>
@@ -4126,11 +4126,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-copying-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -5188,7 +5188,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-machin-4'> &para;</a></span></dt>
@@ -5200,11 +5200,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-invalid"><span class="category-def">fsetinv: 
</span><span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-invalid'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -6083,32 +6083,28 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
 <dt class="deftypefn deftypefun-alias-deftypefn" id="index-name2-1"><span 
class="category-def">Function:
- </span><span><code class="code">data-type2</code>
- <code class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-name2-1'> &para;</a></span></dt>
+ </span><span><code class="code">data-type2</code><br> <code 
class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-name2-1'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">aaa2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypefn">
 <dt class="deftypefn" id="index-d_002d_002deftypefn_005fname2-1"><span 
class="category-def">c--ategory2:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypefn_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypefn_005fname2-1'> &para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypefn_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypefn_005fname2-1'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypefn no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
&para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
&para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
@@ -6417,7 +6413,7 @@ Invalid use of @':
 <pre class="example-preformatted">
 
 </pre><dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-8"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-machin-8'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-9"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-machin-9'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-10"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-machin-10'> &para;</a></span></dt>
@@ -6430,11 +6426,11 @@ Invalid use of @':
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-invalid-1"><span class="category-def">fsetinv: 
</span><span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-invalid-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </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 f61c3c9c1e..d3577861b0 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -1919,7 +1919,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-copying-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-copying-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-copying-machin-4'> &para;</a></span></dt>
@@ -1931,11 +1931,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-copying-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -2995,7 +2995,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-machin-4'> &para;</a></span></dt>
@@ -3007,11 +3007,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-invalid"><span class="category-def">fsetinv: 
</span><span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-invalid'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -3892,32 +3892,28 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
 <dt class="deftypefn deftypefun-alias-deftypefn" id="index-name2-1"><span 
class="category-def">Function:
- </span><span><code class="code">data-type2</code>
- <code class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-name2-1'> &para;</a></span></dt>
+ </span><span><code class="code">data-type2</code><br> <code 
class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-name2-1'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">aaa2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypefn">
 <dt class="deftypefn" id="index-d_002d_002deftypefn_005fname2-1"><span 
class="category-def">c--ategory2:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypefn_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypefn_005fname2-1'> &para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypefn_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypefn_005fname2-1'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypefn no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
&para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
&para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
@@ -4226,7 +4222,7 @@ Invalid use of @':
 <pre class="example-preformatted">
 
 </pre><dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-8"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-machin-8'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-9"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-machin-9'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-10"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-machin-10'> &para;</a></span></dt>
@@ -4239,11 +4235,11 @@ Invalid use of @':
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-invalid-1"><span class="category-def">fsetinv: 
</span><span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-invalid-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </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 609945ddf7..eff98cb036 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/index.html
@@ -1894,7 +1894,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-titlepage-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-titlepage-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-titlepage-machin-4'> &para;</a></span></dt>
@@ -1906,11 +1906,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-titlepage-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -2971,7 +2971,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-copying-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-copying-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-copying-machin-4'> &para;</a></span></dt>
@@ -2983,11 +2983,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-copying-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
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 7b9aa6e951..05ae0d2306 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
@@ -1899,7 +1899,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-titlepage-machin-2'> &#182;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-titlepage-machin-3'> &#182;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-titlepage-machin-4'> &#182;</a></span></dt>
@@ -1911,11 +1911,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-titlepage-invalid'> 
&#182;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&#8211;roupe
@@ -2976,7 +2976,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-copying-machin-2'> &#182;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-copying-machin-3'> &#182;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-copying-machin-4'> &#182;</a></span></dt>
@@ -2988,11 +2988,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-copying-invalid'> 
&#182;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&#8211;roupe
@@ -4110,7 +4110,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-copying-machin-2'> &#182;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-copying-machin-3'> &#182;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-copying-machin-4'> &#182;</a></span></dt>
@@ -4122,11 +4122,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-copying-invalid'> 
&#182;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&#8211;roupe
@@ -5186,7 +5186,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-machin-2'> &#182;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-machin-3'> &#182;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-machin-4'> &#182;</a></span></dt>
@@ -5198,11 +5198,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-invalid"><span class="category-def">fsetinv: 
</span><span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-invalid'> &#182;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&#8211;roupe
@@ -6083,32 +6083,28 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
 <dt class="deftypefn deftypefun-alias-deftypefn" id="index-name2-1"><span 
class="category-def">Function:
- </span><span><code class="code">data-type2</code>
- <code class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-name2-1'> &#182;</a></span></dt>
+ </span><span><code class="code">data-type2</code><br> <code 
class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-name2-1'> &#182;</a></span></dt>
 <dd><pre class="example-preformatted">aaa2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypefn">
 <dt class="deftypefn" id="index-d_002d_002deftypefn_005fname2-1"><span 
class="category-def">c--ategory2:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypefn_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypefn_005fname2-1'> &#182;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypefn_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypefn_005fname2-1'> &#182;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypefn no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
&#182;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
&#182;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
&#182;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
&#182;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
@@ -6417,7 +6413,7 @@ Invalid use of @':
 <pre class="example-preformatted">
 
 </pre><dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-8"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-machin-8'> &#182;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-9"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-machin-9'> &#182;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-10"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-machin-10'> &#182;</a></span></dt>
@@ -6430,11 +6426,11 @@ Invalid use of @':
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-invalid-1"><span class="category-def">fsetinv: 
</span><span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-invalid-1'> &#182;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </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 9fa6bdacea..fb1da93c8c 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -1899,7 +1899,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-titlepage-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-titlepage-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-titlepage-machin-4'> &para;</a></span></dt>
@@ -1911,11 +1911,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-titlepage-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -2975,7 +2975,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-copying-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-copying-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-copying-machin-4'> &para;</a></span></dt>
@@ -2987,11 +2987,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-copying-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -4085,7 +4085,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-machin-4'> &para;</a></span></dt>
@@ -4097,11 +4097,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-invalid"><span class="category-def">fsetinv: 
</span><span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-invalid'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -4981,32 +4981,28 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
 <dt class="deftypefn deftypefun-alias-deftypefn" id="index-name2-1"><span 
class="category-def">Function:
- </span><span><code class="code">data-type2</code>
- <code class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-name2-1'> &para;</a></span></dt>
+ </span><span><code class="code">data-type2</code><br> <code 
class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-name2-1'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">aaa2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypefn">
 <dt class="deftypefn" id="index-d_002d_002deftypefn_005fname2-1"><span 
class="category-def">c--ategory2:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypefn_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypefn_005fname2-1'> &para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypefn_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypefn_005fname2-1'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypefn no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
&para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
&para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
@@ -5315,7 +5311,7 @@ Invalid use of @':
 <pre class="example-preformatted">
 
 </pre><dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-8"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-machin-8'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-9"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-machin-9'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-10"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-machin-10'> &para;</a></span></dt>
@@ -5328,11 +5324,11 @@ Invalid use of @':
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-invalid-1"><span class="category-def">fsetinv: 
</span><span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-invalid-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 <pre class="example-preformatted">
 
@@ -6395,7 +6391,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-copying-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-copying-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-copying-machin-4'> &para;</a></span></dt>
@@ -6407,11 +6403,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-copying-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
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 aa26a1b750..c2b7b28246 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -1899,7 +1899,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-titlepage-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-titlepage-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-titlepage-machin-4'> &para;</a></span></dt>
@@ -1911,11 +1911,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-titlepage-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
@<samp class="samp">i</samp>'&lsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
@<samp class="samp">i</samp>'&lsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -2976,7 +2976,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-copying-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-copying-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-copying-machin-4'> &para;</a></span></dt>
@@ -2988,11 +2988,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-copying-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
@<samp class="samp">i</samp>'&lsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
@<samp class="samp">i</samp>'&lsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -4110,7 +4110,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-copying-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-copying-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-copying-machin-4'> &para;</a></span></dt>
@@ -4122,11 +4122,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-copying-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
@<samp class="samp">i</samp>'&lsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
@<samp class="samp">i</samp>'&lsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -5186,7 +5186,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-machin-4'> &para;</a></span></dt>
@@ -5198,11 +5198,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-invalid"><span class="category-def">fsetinv: 
</span><span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-invalid'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
@<samp class="samp">i</samp>'&lsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
@<samp class="samp">i</samp>'&lsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -6083,32 +6083,28 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
 <dt class="deftypefn deftypefun-alias-deftypefn" id="index-name2-1"><span 
class="category-def">Function:
- </span><span><code class="code">data-type2</code>
- <code class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-name2-1'> &para;</a></span></dt>
+ </span><span><code class="code">data-type2</code><br> <code 
class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-name2-1'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">aaa2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypefn">
 <dt class="deftypefn" id="index-d_002d_002deftypefn_005fname2-1"><span 
class="category-def">c--ategory2:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypefn_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypefn_005fname2-1'> &para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypefn_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypefn_005fname2-1'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypefn no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
&para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
&para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
@@ -6417,7 +6413,7 @@ Invalid use of @':
 <pre class="example-preformatted">
 
 </pre><dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-8"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-machin-8'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-9"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-machin-9'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-10"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-machin-10'> &para;</a></span></dt>
@@ -6430,11 +6426,11 @@ Invalid use of @':
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-invalid-1"><span class="category-def">fsetinv: 
</span><span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-invalid-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
@<samp class="samp">i</samp>'&lsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
@<samp class="samp">i</samp>'&lsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </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 433f4563b4..e90c582a0a 100644
--- a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
@@ -1607,22 +1607,22 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 
 <dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
-<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-titlepage-name2"><span class="category-def">Function:<br/> 
</span><span><code class="code">data-type2</code><br/> <code 
class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-titlepage-name2'> &para;</a></span></dt>
+<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-titlepage-name2"><span class="category-def">Function:<br/> 
</span><span><code class="code">data-type2</code><br> <code 
class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-titlepage-name2'> &para;</a></span></dt>
 <dd><p>aaa2
 </p></dd></dl>
 
 <dl class="first-deftypefn">
-<dt class="deftypefn" id="index-titlepage-d_002d_002deftypefn_005fname2"><span 
class="category-def">c&ndash;ategory2:<br/> </span><span><code 
class="code">t--ype2</code><br/> <code class="code">d--eftypefn_name2</code><a 
class="copiable-link" href='#index-titlepage-d_002d_002deftypefn_005fname2'> 
&para;</a></span></dt>
+<dt class="deftypefn" id="index-titlepage-d_002d_002deftypefn_005fname2"><span 
class="category-def">c&ndash;ategory2:<br/> </span><span><code 
class="code">t--ype2</code><br> <code class="code">d--eftypefn_name2</code><a 
class="copiable-link" href='#index-titlepage-d_002d_002deftypefn_005fname2'> 
&para;</a></span></dt>
 <dd><p>d&ndash;eftypefn no arg2
 </p></dd></dl>
 
 <dl class="first-deftypeop">
-<dt class="deftypeop" 
id="index-titlepage-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><span 
class="category-def">c&ndash;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><span><code 
class="code">t--ype2</code><br/> <code class="code">d--eftypeop_name2</code> 
<code class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-titlepage-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2'> 
&para;</a></span></dt>
+<dt class="deftypeop" 
id="index-titlepage-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><span 
class="category-def">c&ndash;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><span><code 
class="code">t--ype2</code><br> <code class="code">d--eftypeop_name2</code> 
<code class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-titlepage-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2'> 
&para;</a></span></dt>
 <dd><p>d&ndash;eftypeop2
 </p></dd></dl>
 
 <dl class="first-deftypeop">
-<dt class="deftypeop" 
id="index-titlepage-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><span 
class="category-def">c&ndash;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><span><code 
class="code">t--ype2</code><br/> <code class="code">d--eftypeop_name2</code><a 
class="copiable-link" 
href='#index-titlepage-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1'> 
&para;</a></span></dt>
+<dt class="deftypeop" 
id="index-titlepage-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><span 
class="category-def">c&ndash;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><span><code 
class="code">t--ype2</code><br> <code class="code">d--eftypeop_name2</code><a 
class="copiable-link" 
href='#index-titlepage-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1'> 
&para;</a></span></dt>
 <dd><p>d&ndash;eftypeop no arg2
 </p></dd></dl>
 
@@ -1899,7 +1899,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-titlepage-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-titlepage-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-titlepage-machin-4'> &para;</a></span></dt>
@@ -1911,11 +1911,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-titlepage-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -2685,22 +2685,22 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 
 <dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
-<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-copying-name2"><span class="category-def">Function:<br/> 
</span><span><code class="code">data-type2</code><br/> <code 
class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-copying-name2'> &para;</a></span></dt>
+<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-copying-name2"><span class="category-def">Function:<br/> 
</span><span><code class="code">data-type2</code><br> <code 
class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-copying-name2'> &para;</a></span></dt>
 <dd><p>aaa2
 </p></dd></dl>
 
 <dl class="first-deftypefn">
-<dt class="deftypefn" id="index-copying-d_002d_002deftypefn_005fname2"><span 
class="category-def">c&ndash;ategory2:<br/> </span><span><code 
class="code">t--ype2</code><br/> <code class="code">d--eftypefn_name2</code><a 
class="copiable-link" href='#index-copying-d_002d_002deftypefn_005fname2'> 
&para;</a></span></dt>
+<dt class="deftypefn" id="index-copying-d_002d_002deftypefn_005fname2"><span 
class="category-def">c&ndash;ategory2:<br/> </span><span><code 
class="code">t--ype2</code><br> <code class="code">d--eftypefn_name2</code><a 
class="copiable-link" href='#index-copying-d_002d_002deftypefn_005fname2'> 
&para;</a></span></dt>
 <dd><p>d&ndash;eftypefn no arg2
 </p></dd></dl>
 
 <dl class="first-deftypeop">
-<dt class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><span 
class="category-def">c&ndash;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><span><code 
class="code">t--ype2</code><br/> <code class="code">d--eftypeop_name2</code> 
<code class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2'> 
&para;</a></span></dt>
+<dt class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><span 
class="category-def">c&ndash;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><span><code 
class="code">t--ype2</code><br> <code class="code">d--eftypeop_name2</code> 
<code class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2'> 
&para;</a></span></dt>
 <dd><p>d&ndash;eftypeop2
 </p></dd></dl>
 
 <dl class="first-deftypeop">
-<dt class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><span 
class="category-def">c&ndash;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><span><code 
class="code">t--ype2</code><br/> <code class="code">d--eftypeop_name2</code><a 
class="copiable-link" 
href='#index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1'> 
&para;</a></span></dt>
+<dt class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><span 
class="category-def">c&ndash;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><span><code 
class="code">t--ype2</code><br> <code class="code">d--eftypeop_name2</code><a 
class="copiable-link" 
href='#index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1'> 
&para;</a></span></dt>
 <dd><p>d&ndash;eftypeop no arg2
 </p></dd></dl>
 
@@ -2976,7 +2976,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-copying-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-copying-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-copying-machin-4'> &para;</a></span></dt>
@@ -2988,11 +2988,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-copying-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -3819,22 +3819,22 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 
 <dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
-<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-copying-name2"><span class="category-def">Function:<br/> 
</span><span><code class="code">data-type2</code><br/> <code 
class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-copying-name2'> &para;</a></span></dt>
+<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-copying-name2"><span class="category-def">Function:<br/> 
</span><span><code class="code">data-type2</code><br> <code 
class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-copying-name2'> &para;</a></span></dt>
 <dd><p>aaa2
 </p></dd></dl>
 
 <dl class="first-deftypefn">
-<dt class="deftypefn" id="index-copying-d_002d_002deftypefn_005fname2"><span 
class="category-def">c&ndash;ategory2:<br/> </span><span><code 
class="code">t--ype2</code><br/> <code class="code">d--eftypefn_name2</code><a 
class="copiable-link" href='#index-copying-d_002d_002deftypefn_005fname2'> 
&para;</a></span></dt>
+<dt class="deftypefn" id="index-copying-d_002d_002deftypefn_005fname2"><span 
class="category-def">c&ndash;ategory2:<br/> </span><span><code 
class="code">t--ype2</code><br> <code class="code">d--eftypefn_name2</code><a 
class="copiable-link" href='#index-copying-d_002d_002deftypefn_005fname2'> 
&para;</a></span></dt>
 <dd><p>d&ndash;eftypefn no arg2
 </p></dd></dl>
 
 <dl class="first-deftypeop">
-<dt class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><span 
class="category-def">c&ndash;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><span><code 
class="code">t--ype2</code><br/> <code class="code">d--eftypeop_name2</code> 
<code class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2'> 
&para;</a></span></dt>
+<dt class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><span 
class="category-def">c&ndash;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><span><code 
class="code">t--ype2</code><br> <code class="code">d--eftypeop_name2</code> 
<code class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2'> 
&para;</a></span></dt>
 <dd><p>d&ndash;eftypeop2
 </p></dd></dl>
 
 <dl class="first-deftypeop">
-<dt class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><span 
class="category-def">c&ndash;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><span><code 
class="code">t--ype2</code><br/> <code class="code">d--eftypeop_name2</code><a 
class="copiable-link" 
href='#index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1'> 
&para;</a></span></dt>
+<dt class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><span 
class="category-def">c&ndash;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><span><code 
class="code">t--ype2</code><br> <code class="code">d--eftypeop_name2</code><a 
class="copiable-link" 
href='#index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1'> 
&para;</a></span></dt>
 <dd><p>d&ndash;eftypeop no arg2
 </p></dd></dl>
 
@@ -4110,7 +4110,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-copying-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-copying-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-copying-machin-4'> &para;</a></span></dt>
@@ -4122,11 +4122,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-copying-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -4895,22 +4895,22 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 
 <dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
-<dt class="deftypefn deftypefun-alias-deftypefn" id="index-name2"><span 
class="category-def">Function:<br/> </span><span><code 
class="code">data-type2</code><br/> <code class="code">name2</code> <code 
class="code">arguments2...</code><a class="copiable-link" href='#index-name2'> 
&para;</a></span></dt>
+<dt class="deftypefn deftypefun-alias-deftypefn" id="index-name2"><span 
class="category-def">Function:<br/> </span><span><code 
class="code">data-type2</code><br> <code class="code">name2</code> <code 
class="code">arguments2...</code><a class="copiable-link" href='#index-name2'> 
&para;</a></span></dt>
 <dd><p>aaa2
 </p></dd></dl>
 
 <dl class="first-deftypefn">
-<dt class="deftypefn" id="index-d_002d_002deftypefn_005fname2"><span 
class="category-def">c&ndash;ategory2:<br/> </span><span><code 
class="code">t--ype2</code><br/> <code class="code">d--eftypefn_name2</code><a 
class="copiable-link" href='#index-d_002d_002deftypefn_005fname2'> 
&para;</a></span></dt>
+<dt class="deftypefn" id="index-d_002d_002deftypefn_005fname2"><span 
class="category-def">c&ndash;ategory2:<br/> </span><span><code 
class="code">t--ype2</code><br> <code class="code">d--eftypefn_name2</code><a 
class="copiable-link" href='#index-d_002d_002deftypefn_005fname2'> 
&para;</a></span></dt>
 <dd><p>d&ndash;eftypefn no arg2
 </p></dd></dl>
 
 <dl class="first-deftypeop">
-<dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><span 
class="category-def">c&ndash;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><span><code 
class="code">t--ype2</code><br/> <code class="code">d--eftypeop_name2</code> 
<code class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2'> 
&para;</a></span></dt>
+<dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><span 
class="category-def">c&ndash;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><span><code 
class="code">t--ype2</code><br> <code class="code">d--eftypeop_name2</code> 
<code class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2'> 
&para;</a></span></dt>
 <dd><p>d&ndash;eftypeop2
 </p></dd></dl>
 
 <dl class="first-deftypeop">
-<dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><span 
class="category-def">c&ndash;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><span><code 
class="code">t--ype2</code><br/> <code class="code">d--eftypeop_name2</code><a 
class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1'> 
&para;</a></span></dt>
+<dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><span 
class="category-def">c&ndash;ategory2 on <code 
class="code">c--lass2</code>:<br/> </span><span><code 
class="code">t--ype2</code><br> <code class="code">d--eftypeop_name2</code><a 
class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1'> 
&para;</a></span></dt>
 <dd><p>d&ndash;eftypeop no arg2
 </p></dd></dl>
 
@@ -5186,7 +5186,7 @@ html ''
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-machin-4'> &para;</a></span></dt>
@@ -5198,11 +5198,11 @@ html ''
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-invalid"><span class="category-def">fsetinv: 
</span><span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-invalid'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -6083,32 +6083,28 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
 <dt class="deftypefn deftypefun-alias-deftypefn" id="index-name2-1"><span 
class="category-def">Function:
- </span><span><code class="code">data-type2</code>
- <code class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-name2-1'> &para;</a></span></dt>
+ </span><span><code class="code">data-type2</code><br> <code 
class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-name2-1'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">aaa2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypefn">
 <dt class="deftypefn" id="index-d_002d_002deftypefn_005fname2-1"><span 
class="category-def">c--ategory2:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypefn_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypefn_005fname2-1'> &para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypefn_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypefn_005fname2-1'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypefn no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
&para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
&para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
@@ -6417,7 +6413,7 @@ Invalid use of @':
 <pre class="example-preformatted">
 
 </pre><dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-8"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-machin-8'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-9"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-machin-9'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-10"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-machin-10'> &para;</a></span></dt>
@@ -6430,11 +6426,11 @@ Invalid use of @':
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-invalid-1"><span class="category-def">fsetinv: 
</span><span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-invalid-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </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 03346fbc2a..180b37b5be 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
@@ -2081,7 +2081,7 @@ $">
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-copying-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-copying-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-copying-machin-4'> &para;</a></span></dt>
@@ -2093,11 +2093,11 @@ $">
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-invalid"><span 
class="category-def">fsetinv: </span><span><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span><a class="copiable-link" href='#index-copying-invalid'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -3294,7 +3294,7 @@ $">
 </dl>
 
 <dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-2"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-machin-2'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-3"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-machin-3'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-4"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-machin-4'> &para;</a></span></dt>
@@ -3306,11 +3306,11 @@ $">
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-invalid"><span class="category-def">fsetinv: 
</span><span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-invalid'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 
 <div class="group"><p>g&ndash;roupe
@@ -4275,32 +4275,28 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
 <dt class="deftypefn deftypefun-alias-deftypefn" id="index-name2-1"><span 
class="category-def">Function:
- </span><span><code class="code">data-type2</code>
- <code class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-name2-1'> &para;</a></span></dt>
+ </span><span><code class="code">data-type2</code><br> <code 
class="code">name2</code> <code class="code">arguments2...</code><a 
class="copiable-link" href='#index-name2-1'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">aaa2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypefn">
 <dt class="deftypefn" id="index-d_002d_002deftypefn_005fname2-1"><span 
class="category-def">c--ategory2:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypefn_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypefn_005fname2-1'> &para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypefn_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypefn_005fname2-1'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypefn no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
&para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop2
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop">
 <dt class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3"><span 
class="category-def">c--ategory2 on <code class="code">c--lass2</code>:
- </span><span><code class="code">t--ype2</code>
- <code class="code">d--eftypeop_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
&para;</a></span></dt>
+ </span><span><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code><a class="copiable-link" 
href='#index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeop no arg2
 </pre></dd></dl>
 <pre class="example-preformatted">
@@ -4662,7 +4658,7 @@ $">
 <pre class="example-preformatted">
 
 </pre><dl class="first-deffn">
-<dt class="deffn"><span class="category-def">fun: </span><code 
class="code"></code></dt>
+<dt class="deffn"><span class="category-def">fun: </span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-8"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and</i></span><a 
class="copiable-link" href='#index-machin-8'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-9"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and  after</i></span><a 
class="copiable-link" href='#index-machin-9'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin-10"><span 
class="category-def">truc: </span><span><code class="code">machin</code> <span 
class="r"><i class="slanted">bidule chose and </i></span><a 
class="copiable-link" href='#index-machin-10'> &para;</a></span></dt>
@@ -4675,11 +4671,11 @@ $">
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-invalid-1"><span class="category-def">fsetinv: 
</span><span><code class="code"><var class="var">invalid</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-invalid-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><code class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
-<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span><code 
class="code"></code></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b>: </span></dt>
+<dt class="deffnx def-cmd-deffn"></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">aaa: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">: </span></dt>
+<dt class="deffnx def-cmd-deffn"><span class="category-def">truc: </span></dt>
 </dl>
 <pre class="example-preformatted">
 



reply via email to

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