branch master updated: Format DEF_TABLE @def* lines similarly with default case

[Patrice Dumas]

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 817722312d Format DEF_TABLE @def* lines similarly with default case
817722312d is described below

commit 817722312d48dea87a01c208424e1019e3d8a374
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Aug 1 14:29:47 2022 +0200

    Format DEF_TABLE @def* lines similarly with default case
    
    * tp/Texinfo/Convert/HTML.pm (_convert_def_line_type): use the
    same def call for DEF_TABLE as in the default case.  Do
    not format empty arguments.
---
 ChangeLog                                          |   8 +
 tp/Texinfo/Convert/HTML.pm                         | 124 +++----
 tp/t/results/coverage/def.pl                       |   8 +-
 tp/t/results/indices/empty_string_index_entry.pl   |   4 +-
 .../layout/res_parser/formatting/formatting.html   |  50 +--
 .../layout/res_parser/formatting_chm/chapter.html  |  30 +-
 .../res_parser/formatting_chm/formatting.html      |  20 +-
 .../formatting_enable_encoding/formatting.html     |  50 +--
 .../EPUB/xhtml/formatting.xhtml                    |  50 +--
 .../EPUB/xhtml/chapter.xhtml                       |  30 +-
 .../EPUB/xhtml/formatting.xhtml                    |  20 +-
 .../res_parser/formatting_exotic/chapter.html      | 386 ++++++++++-----------
 .../res_parser/formatting_fr_icons/formatting.html |  50 +--
 .../res_parser/formatting_html/formatting.html     |  50 +--
 .../res_parser/formatting_html32/formatting.html   |  50 +--
 .../formatting_html_no_texi2html/formatting.html   |  30 +-
 .../res_parser/formatting_html_nodes/chapter.html  |  30 +-
 .../res_parser/formatting_html_nodes/index.html    |  20 +-
 .../formatting_inline_css/formatting.html          |  50 +--
 .../res_parser/formatting_mathjax/formatting.html  |  50 +--
 .../res_parser/formatting_nodes/chapter.html       |  30 +-
 .../layout/res_parser/formatting_nodes/index.html  |  20 +-
 .../formatting_numerical_entities/formatting.html  |  50 +--
 .../formatting_regions/formatting_regions.html     |  50 +--
 .../formatting_weird_quotes/formatting.html        |  50 +--
 .../res_parser/formatting_xhtml/formatting.html    |  50 +--
 .../res_parser/formatting_singular/chapter.html    |  30 +-
 27 files changed, 694 insertions(+), 696 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cecbcab928..b15a307105 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-07-31  Patrice Dumas  <pertusus@free.fr>
+
+       Format DEF_TABLE @def* lines similarly with default case
+
+       * tp/Texinfo/Convert/HTML.pm (_convert_def_line_type): use the
+       same def call for DEF_TABLE as in the default case.  Do
+       not format empty arguments.
+
 2022-07-31  Patrice Dumas  <pertusus@free.fr>
 
        Use directly HTML code to format @def* line except for category
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 4a09cbbf66..4f9e46dd4e 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -5868,6 +5868,62 @@ sub _convert_def_line_type($$$$)
   }
   unshift @classes, $original_command_name;
 
+  my $result_type = '';
+  if ($element->{'extra'}->{'def_parsed_hash'}->{'type'}) {
+    my $type_text = $self->_convert({'type' => '_code',
+       'contents' => [$element->{'extra'}->{'def_parsed_hash'}->{'type'}]});
+    if ($type_text ne '') {
+      $result_type = $self->html_attribute_class('code', ['code']).">".
+         $type_text .'</code>';
+    }
+    if ($self->get_conf('deftypefnnewline') eq 'on'
+        and ($command_name eq 'deftypefn' or $command_name eq 'deftypeop')) {
+      $result_type .= '<br>';
+    }
+  }
+
+  my $result_name = '';
+  if ($element->{'extra'} and $element->{'extra'}->{'def_parsed_hash'}
+      and defined($element->{'extra'}->{'def_parsed_hash'}->{'name'})) {
+    my $name_content = $element->{'extra'}->{'def_parsed_hash'}->{'name'};
+    $result_name = $self->html_attribute_class('code', ['code']).">".
+       $self->_convert({'type' => '_code', 'contents' => [$name_content]})
+       .'</code>';
+  }
+
+  my $result_arguments = '';
+  if ($arguments) {
+  # arguments not only metasyntactic variables
+  # (deftypefn, deftypevr, deftypeop, deftypecv)
+    if ($Texinfo::Common::def_no_var_arg_commands{$command_name}) {
+      my $arguments_formatted = $self->_convert({'type' => '_code',
+                                                 'contents' => $arguments});
+      $result_arguments = $self->html_attribute_class('code', ['code']).">".
+        $arguments_formatted.'</code>'
+          if ($arguments_formatted =~ /\S/);
+    } else {
+      # only metasyntactic variable arguments (deffn, defvr, deftp, defop, 
defcv)
+      push @{$self->{'document_context'}->[-1]->{'monospace'}}, 0;
+      my $arguments_formatted = $self->_convert({'contents' => $arguments});
+      pop @{$self->{'document_context'}->[-1]->{'monospace'}};
+      if ($arguments_formatted =~ /\S/) {
+        my $open = $self->html_attribute_class('span', ['r']);
+        $result_arguments = $open;
+        $result_arguments .= '>' if ($open ne '');
+        $result_arguments .= $self->html_attribute_class('i', ['slanted']).">"
+          . $arguments_formatted .'</i>';
+        $result_arguments .= '</span>' if ($open ne '');
+      }
+    }
+  }
+
+  my $def_call = '';
+  $def_call .= $result_type . ' ' if ($result_type ne '');
+
+  $def_call .= $result_name;
+
+  $def_call .= ' ' . $result_arguments if ($result_arguments ne '');
+
   if (!$self->get_conf('DEF_TABLE')) {
     my $category;
     if ($element->{'extra'} and $element->{'extra'}->{'def_parsed_hash'}
@@ -5909,48 +5965,6 @@ sub _convert_def_line_type($$$$)
       $category_result = $self->convert_tree($category_tree);
     }
 
-    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 {
-        $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)
-      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 {
-        # 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'}};
-      }
-    }
-
     if ($category_result ne '') {
       my $open = $self->html_attribute_class('span', ['category-def']);
       if ($open ne '') {
@@ -5980,32 +5994,8 @@ sub _convert_def_line_type($$$$)
       }
     }
   
-    my $arguments_text = '';
-    if ($arguments) {
-      $arguments_text = $self->convert_tree({'type' => '_code',
-                                             'contents' => $arguments});
-      $arguments_text = '<em> ' . $arguments_text . '</em>'
-        if ($arguments_text =~ /\S/);
-    }
-
-  
-    my $def_type = '';
-    my $type_name = '';
-    if ($element->{'extra'}->{'def_parsed_hash'}->{'type'}) {
-      $def_type = $self->convert_tree({'type' => '_code',
-          'contents' => [$element->{'extra'}->{'def_parsed_hash'}->{'type'}]});
-    }
-    $type_name = " <em>$def_type</em>" if ($def_type ne '');
-    my $name = '';
-    if ($element->{'extra'}->{'def_parsed_hash'}->{'name'}) {
-      $name = $self->convert_tree({'type' => '_code',
-          'contents' => [$element->{'extra'}->{'def_parsed_hash'}->{'name'}]});
-    }
-    $type_name .= ' <strong>' . $name . '</strong>' if ($name ne '');
-    $type_name .= $arguments_text;
-
     return $self->html_attribute_class('tr', \@classes)
-       . "$index_label><td align=\"left\">" . $type_name .
+       . "$index_label><td align=\"left\">" . $def_call .
        "</td><td align=\"right\">" . $category_prepared . "</td></tr>\n";
   }
 }
diff --git a/tp/t/results/coverage/def.pl b/tp/t/results/coverage/def.pl
index c2afc04588..fdcdafb7cc 100644
--- a/tp/t/results/coverage/def.pl
+++ b/tp/t/results/coverage/def.pl
@@ -2481,10 +2481,10 @@ $result_converted{'html_text'}->{'def'} = '
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href=\'#index-i\'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href=\'#index-truc\'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href=\'#index-log-trap\'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href=\'#index-log-trap1\'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href=\'#index-log-trap2\'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href=\'#index-truc\'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href=\'#index-log-trap\'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href=\'#index-log-trap1\'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href=\'#index-log-trap2\'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href=\'#index-id-ule\'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href=\'#index-id-i-ule\'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-machin"><span 
class="category-def">: </span><span><code class="code">machin</code><a 
class="copiable-link" href=\'#index-machin\'> &para;</a></span></dt>
diff --git a/tp/t/results/indices/empty_string_index_entry.pl 
b/tp/t/results/indices/empty_string_index_entry.pl
index d0792e2905..62ca2e0998 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -932,8 +932,8 @@ 
$result_converted{'html_text'}->{'empty_string_index_entry'} = '<h1 class="node"
 </dl>
 
 <dl class="first-deffn first-defun-alias-first-deffn">
-<dt class="deffn defun-alias-deffn" id="index--2"><span 
class="category-def">Function: </span><span><code class="code"><!-- /@w 
--></code> <span class="r"><i class="slanted"> </i></span><a 
class="copiable-link" href=\'#index--2\'> &para;</a></span></dt>
-<dt class="deffnx defunx-alias-deffnx def-cmd-deffn" id="index--3"><span 
class="category-def">Function: </span><span><code class="code"><!-- /@w 
--></code> <span class="r"><i class="slanted"> </i></span><a 
class="copiable-link" href=\'#index--3\'> &para;</a></span></dt>
+<dt class="deffn defun-alias-deffn" id="index--2"><span 
class="category-def">Function: </span><span><code class="code"><!-- /@w 
--></code><a class="copiable-link" href=\'#index--2\'> &para;</a></span></dt>
+<dt class="deffnx defunx-alias-deffnx def-cmd-deffn" id="index--3"><span 
class="category-def">Function: </span><span><code class="code"><!-- /@w 
--></code><a class="copiable-link" href=\'#index--3\'> &para;</a></span></dt>
 </dl>
 
 ';
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html 
b/tp/tests/layout/res_parser/formatting/formatting.html
index f9df174e64..4733287c15 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -1436,10 +1436,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-titlepage-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" 
id="index-titlepage-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-titlepage-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-titlepage-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-titlepage-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-titlepage-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-titlepage-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-titlepage-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -1465,7 +1465,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-titlepage-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-titlepage-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -2514,10 +2514,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-copying-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-copying-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-copying-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-copying-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-copying-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -2543,7 +2543,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -3648,10 +3648,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-copying-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-copying-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-copying-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-copying-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-copying-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -3677,7 +3677,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -4724,10 +4724,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" href='#index-id-i-ule'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -4753,7 +4753,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -5880,10 +5880,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <pre class="example-preformatted"> 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-2"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-2'> &para;</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: 
</span><span><code class="code">truc</code> <span class="r"><i 
class="slanted"></i></span><a class="copiable-link" href='#index-truc-2'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap1-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap2-1'> &para;</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: 
</span><span><code class="code">truc</code><a class="copiable-link" 
href='#index-truc-2'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-log-trap-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-log-trap1-1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-log-trap2-1'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule-1"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-id-ule-1'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule-1"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-id-i-ule-1'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -5912,7 +5912,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-3"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-3'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc-3'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc-3'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">text in def item for second def item
 </pre></dd></dl>
 <pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter.html 
b/tp/tests/layout/res_parser/formatting_chm/chapter.html
index 81e4339b10..f0a664a236 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter.html
@@ -1437,10 +1437,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-copying-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-copying-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-copying-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-copying-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-copying-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -1466,7 +1466,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -2513,10 +2513,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" href='#index-id-i-ule'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -2542,7 +2542,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -3669,10 +3669,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <pre class="example-preformatted"> 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-2"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-2'> &para;</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: 
</span><span><code class="code">truc</code> <span class="r"><i 
class="slanted"></i></span><a class="copiable-link" href='#index-truc-2'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap1-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap2-1'> &para;</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: 
</span><span><code class="code">truc</code><a class="copiable-link" 
href='#index-truc-2'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-log-trap-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-log-trap1-1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-log-trap2-1'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule-1"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-id-ule-1'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule-1"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-id-i-ule-1'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -3701,7 +3701,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-3"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-3'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc-3'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc-3'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">text in def item for second def item
 </pre></dd></dl>
 <pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.html 
b/tp/tests/layout/res_parser/formatting_chm/formatting.html
index 6f58291bc2..7ea1eb8639 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting.html
@@ -1429,10 +1429,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-titlepage-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" 
id="index-titlepage-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-titlepage-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-titlepage-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-titlepage-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-titlepage-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-titlepage-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-titlepage-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -1458,7 +1458,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-titlepage-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-titlepage-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -2507,10 +2507,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-copying-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-copying-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-copying-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-copying-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-copying-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -2536,7 +2536,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
diff --git 
a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html 
b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
index adfc3f6ee0..bdf313f149 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
@@ -1436,10 +1436,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-titlepage-i'> ¶</a></span></dt>
 <dd><a class="index-entry-id" 
id="index-titlepage-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-truc'> ¶</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap'> ¶</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap1'> ¶</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap2'> ¶</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-titlepage-truc'> ¶</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-titlepage-log-trap'> ¶</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-titlepage-log-trap1'> 
¶</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-titlepage-log-trap2'> 
¶</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-titlepage-id-ule'> ¶</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
‘<samp class="samp">i</samp>’ ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-titlepage-id-i-ule'> ¶</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -1465,7 +1465,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-titlepage-i-1'> ¶</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-truc-1'> ¶</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-titlepage-truc-1'> ¶</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -2514,10 +2514,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i'> ¶</a></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc'> ¶</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap'> ¶</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap1'> ¶</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap2'> ¶</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc'> ¶</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-copying-log-trap'> ¶</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-copying-log-trap1'> 
¶</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-copying-log-trap2'> 
¶</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-copying-id-ule'> ¶</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
‘<samp class="samp">i</samp>’ ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-copying-id-i-ule'> ¶</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -2543,7 +2543,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i-1'> ¶</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc-1'> ¶</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc-1'> ¶</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -3648,10 +3648,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i'> ¶</a></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc'> ¶</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap'> ¶</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap1'> ¶</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap2'> ¶</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc'> ¶</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-copying-log-trap'> ¶</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-copying-log-trap1'> 
¶</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-copying-log-trap2'> 
¶</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-copying-id-ule'> ¶</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
‘<samp class="samp">i</samp>’ ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-copying-id-i-ule'> ¶</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -3677,7 +3677,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i-1'> ¶</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc-1'> ¶</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc-1'> ¶</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -4724,10 +4724,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i'> ¶</a></span></dt>
 <dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc'> ¶</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap'> ¶</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap1'> ¶</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap2'> ¶</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc'> ¶</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-log-trap'> ¶</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-log-trap1'> ¶</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-log-trap2'> ¶</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-id-ule'> ¶</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
‘<samp class="samp">i</samp>’ ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" href='#index-id-i-ule'> 
¶</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -4753,7 +4753,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-1'> ¶</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc-1'> ¶</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc-1'> ¶</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -5880,10 +5880,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <pre class="example-preformatted"> 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-2"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-2'> ¶</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: 
</span><span><code class="code">truc</code> <span class="r"><i 
class="slanted"></i></span><a class="copiable-link" href='#index-truc-2'> 
¶</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap-1'> ¶</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap1-1'> ¶</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap2-1'> ¶</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: 
</span><span><code class="code">truc</code><a class="copiable-link" 
href='#index-truc-2'> ¶</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-log-trap-1'> ¶</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-log-trap1-1'> 
¶</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-log-trap2-1'> 
¶</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule-1"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-id-ule-1'> ¶</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule-1"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
‘<samp class="samp">i</samp>’ ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-id-i-ule-1'> ¶</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -5912,7 +5912,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-3"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-3'> ¶</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc-3'> ¶</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc-3'> ¶</a></span></dt>
 <dd><pre class="example-preformatted">text in def item for second def item
 </pre></dd></dl>
 <pre class="example-preformatted">
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index 3a05a3b8f4..e155c882d7 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
@@ -1435,10 +1435,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i"><span class="category-def">fset: 
</span><code class="code"><var class="var">i</var></code> <span class="r"><i 
class="slanted">a g</i></span></dt>
 <dd><a class="index-entry-id" 
id="index-titlepage-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde: </span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command: </span><code class="code">log trap</code> <span 
class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command: </span><code class="code">log trap1</code> <span 
class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command: </span><code class="code">log trap2</code> <span 
class="r"><i class="slanted"></i></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde: </span><code class="code">truc</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command: </span><code class="code">log trap</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command: </span><code class="code">log trap1</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command: </span><code class="code">log trap2</code></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-ule"><span 
class="category-def">cmde: </span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-i-ule"><span 
class="category-def">cmde2: </span><code class="code"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -1464,7 +1464,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i-1"><span class="category-def">fset: 
</span><code class="code"><var class="var">i</var></code> <span class="r"><i 
class="slanted">a g</i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde: </span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde: </span><code class="code">truc</code></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -2513,10 +2513,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><code class="code"><var class="var">i</var></code> <span class="r"><i 
class="slanted">a g</i></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><code class="code">log trap</code> <span 
class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><code class="code">log trap1</code> <span 
class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><code class="code">log trap2</code> <span 
class="r"><i class="slanted"></i></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><code class="code">truc</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><code class="code">log trap</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><code class="code">log trap1</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><code class="code">log trap2</code></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><code class="code"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -2542,7 +2542,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><code class="code"><var class="var">i</var></code> <span class="r"><i 
class="slanted">a g</i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><code class="code">truc</code></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -3609,10 +3609,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><code class="code"><var class="var">i</var></code> <span class="r"><i 
class="slanted">a g</i></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><code class="code">log trap</code> <span 
class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><code class="code">log trap1</code> <span 
class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><code class="code">log trap2</code> <span 
class="r"><i class="slanted"></i></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><code class="code">truc</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><code class="code">log trap</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><code class="code">log trap1</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><code class="code">log trap2</code></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><code class="code"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -3638,7 +3638,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><code class="code"><var class="var">i</var></code> <span class="r"><i 
class="slanted">a g</i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><code class="code">truc</code></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -4685,10 +4685,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-i"><span class="category-def">fset: </span><code 
class="code"><var class="var">i</var></code> <span class="r"><i 
class="slanted">a g</i></span></dt>
 <dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><code class="code">log trap</code> <span 
class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><code class="code">log trap1</code> <span 
class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><code class="code">log trap2</code> <span 
class="r"><i class="slanted"></i></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><code class="code">truc</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><code class="code">log trap</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><code class="code">log trap1</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><code class="code">log trap2</code></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule"><span 
class="category-def">cmde: </span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule"><span 
class="category-def">cmde2: </span><code class="code"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -4714,7 +4714,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-i-1"><span class="category-def">fset: </span><code 
class="code"><var class="var">i</var></code> <span class="r"><i 
class="slanted">a g</i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><code class="code">truc</code></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -5841,10 +5841,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <pre class="example-preformatted"> 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-2"><span class="category-def">fset: </span><code 
class="code"><var class="var">i</var></code> <span class="r"><i 
class="slanted">a g</i></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: </span><code 
class="code">truc</code> <span class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><code class="code">log trap</code> <span 
class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><code class="code">log trap1</code> <span 
class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><code class="code">log trap2</code> <span 
class="r"><i class="slanted"></i></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: </span><code 
class="code">truc</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><code class="code">log trap</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><code class="code">log trap1</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><code class="code">log trap2</code></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule-1"><span 
class="category-def">cmde: </span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule-1"><span 
class="category-def">cmde2: </span><code class="code"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -5873,7 +5873,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-3"><span class="category-def">fset: </span><code 
class="code"><var class="var">i</var></code> <span class="r"><i 
class="slanted">a g</i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><code class="code">truc</code></dt>
 <dd><pre class="example-preformatted">text in def item for second def item
 </pre></dd></dl>
 <pre class="example-preformatted">
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
index d416560139..0631cf778d 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
@@ -1442,10 +1442,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><code class="code"><var class="var">i</var></code> <span class="r"><i 
class="slanted">a g</i></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><code class="code">log trap</code> <span 
class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><code class="code">log trap1</code> <span 
class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><code class="code">log trap2</code> <span 
class="r"><i class="slanted"></i></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><code class="code">truc</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><code class="code">log trap</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><code class="code">log trap1</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><code class="code">log trap2</code></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><code class="code"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -1471,7 +1471,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><code class="code"><var class="var">i</var></code> <span class="r"><i 
class="slanted">a g</i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><code class="code">truc</code></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -2518,10 +2518,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-i"><span class="category-def">fset: </span><code 
class="code"><var class="var">i</var></code> <span class="r"><i 
class="slanted">a g</i></span></dt>
 <dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><code class="code">log trap</code> <span 
class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><code class="code">log trap1</code> <span 
class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><code class="code">log trap2</code> <span 
class="r"><i class="slanted"></i></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><code class="code">truc</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><code class="code">log trap</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><code class="code">log trap1</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><code class="code">log trap2</code></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule"><span 
class="category-def">cmde: </span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule"><span 
class="category-def">cmde2: </span><code class="code"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -2547,7 +2547,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-i-1"><span class="category-def">fset: </span><code 
class="code"><var class="var">i</var></code> <span class="r"><i 
class="slanted">a g</i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><code class="code">truc</code></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -3674,10 +3674,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <pre class="example-preformatted"> 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-2"><span class="category-def">fset: </span><code 
class="code"><var class="var">i</var></code> <span class="r"><i 
class="slanted">a g</i></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: </span><code 
class="code">truc</code> <span class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><code class="code">log trap</code> <span 
class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><code class="code">log trap1</code> <span 
class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><code class="code">log trap2</code> <span 
class="r"><i class="slanted"></i></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: </span><code 
class="code">truc</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><code class="code">log trap</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><code class="code">log trap1</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><code class="code">log trap2</code></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule-1"><span 
class="category-def">cmde: </span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule-1"><span 
class="category-def">cmde2: </span><code class="code"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -3706,7 +3706,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-3"><span class="category-def">fset: </span><code 
class="code"><var class="var">i</var></code> <span class="r"><i 
class="slanted">a g</i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><code class="code">truc</code></dt>
 <dd><pre class="example-preformatted">text in def item for second def item
 </pre></dd></dl>
 <pre class="example-preformatted">
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index 3865c2d23b..4aabea561a 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
@@ -1432,10 +1432,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i"><span class="category-def">fset: 
</span><code class="code"><var class="var">i</var></code> <span class="r"><i 
class="slanted">a g</i></span></dt>
 <dd><a class="index-entry-id" 
id="index-titlepage-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde: </span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command: </span><code class="code">log trap</code> <span 
class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command: </span><code class="code">log trap1</code> <span 
class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command: </span><code class="code">log trap2</code> <span 
class="r"><i class="slanted"></i></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde: </span><code class="code">truc</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command: </span><code class="code">log trap</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command: </span><code class="code">log trap1</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command: </span><code class="code">log trap2</code></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-ule"><span 
class="category-def">cmde: </span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-i-ule"><span 
class="category-def">cmde2: </span><code class="code"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -1461,7 +1461,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i-1"><span class="category-def">fset: 
</span><code class="code"><var class="var">i</var></code> <span class="r"><i 
class="slanted">a g</i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde: </span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde: </span><code class="code">truc</code></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -2510,10 +2510,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><code class="code"><var class="var">i</var></code> <span class="r"><i 
class="slanted">a g</i></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><code class="code">log trap</code> <span 
class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><code class="code">log trap1</code> <span 
class="r"><i class="slanted"></i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><code class="code">log trap2</code> <span 
class="r"><i class="slanted"></i></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><code class="code">truc</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><code class="code">log trap</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><code class="code">log trap1</code></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><code class="code">log trap2</code></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><code class="code"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -2539,7 +2539,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><code class="code"><var class="var">i</var></code> <span class="r"><i 
class="slanted">a g</i></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><code class="code">truc</code></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter.html 
b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index 10e9edefe0..dc8e9ff3e8 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
@@ -1442,220 +1442,220 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 </pre></div>
 
 <table class="first-deffn" width="100%">
-<tr class="deffn" id="index-copying-d_002d_002deffn_005fname"><td 
align="left"> <strong>d--effn_name</strong><em> a--rguments...</em></td><td 
align="right">c--ategory</td></tr>
+<tr class="deffn" id="index-copying-d_002d_002deffn_005fname"><td 
align="left"><code class="code">d--effn_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td 
align="right">c--ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;effn
 </p></td></tr></table>
 
 <table class="first-deffn" width="100%">
-<tr class="deffn" id="index-copying-de_002d_002dffn_005fname"><td 
align="left"> <strong>de--ffn_name</strong><em> ar--guments    more args <br> 
even more so</em></td><td align="right">cate--gory</td></tr>
+<tr class="deffn" id="index-copying-de_002d_002dffn_005fname"><td 
align="left"><code class="code">de--ffn_name</code> <span class="r"><i 
class="slanted">ar&ndash;guments    more args <br> even more 
so</i></span></td><td align="right">cate--gory</td></tr>
 <tr><td colspan="2"><p>def&ndash;fn
 </p></td></tr></table>
  
 <table class="first-deffn" width="100%">
-<tr class="deffn" id="index-copying-i"><td align="left"> <strong><var 
class="var">i</var></strong><em> a g</em></td><td align="right">fset</td></tr>
+<tr class="deffn" id="index-copying-i"><td align="left"><code 
class="code"><var class="var">i</var></code> <span class="r"><i 
class="slanted">a g</i></span></td><td align="right">fset</td></tr>
 <tr><td colspan="2"><a class="index-entry-id" 
id="index-copying-index-entry-within-deffn"></a>
-</td></tr><tr class="deffnx def-cmd-deffn" id="index-copying-truc"><td 
align="left"> <strong>truc</strong></td><td align="right">cmde</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-copying-log-trap"><td align="left"> 
<strong>log trap</strong></td><td align="right">Command</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><td 
align="left"> <strong>log trap1</strong></td><td align="right">Command</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><td 
align="left"> <strong>log trap2</strong></td><td align="right">Command</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-copying-id-ule"><td align="left"> 
<strong><b class="b">id ule</b></strong><em> truc</em></td><td 
align="right">cmde</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><td align="left"> 
<strong><b class="b">id &lsquo;<samp class="samp">i</samp>&rsquo; 
ule</b></strong><em> truc</em></td><td align="right">cmde2</td></tr>
-<tr class="deffnx def-cmd-deffn"><td align="left"></td><td 
align="right"></td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-copying-machin"><td align="left"> 
<strong>machin</strong></td><td align="right"></td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-copying-bidule-machin"><td 
align="left"> <strong>bidule machin</strong></td><td align="right"></td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-copying-machin-1"><td align="left"> 
<strong>machin</strong></td><td align="right">truc</td></tr>
-<tr class="deffnx def-cmd-deffn"><td align="left"></td><td 
align="right">truc</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-copying-followed"><td align="left"> 
<strong>followed</strong><em> by a comment</em></td><td 
align="right">truc</td></tr>
-<tr class="deffnx def-cmd-deffn"><td align="left"></td><td 
align="right"></td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-copying-a"><td align="left"> 
<strong>a</strong><em> b c d e <b class="b">f g</b> h i</em></td><td 
align="right">truc</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-copying-deffnx"><td align="left"> 
<strong>deffnx</strong><em> before end deffn</em></td><td 
align="right">truc</td></tr>
+</td></tr><tr class="deffnx def-cmd-deffn" id="index-copying-truc"><td 
align="left"><code class="code">truc</code></td><td align="right">cmde</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-copying-log-trap"><td 
align="left"><code class="code">log trap</code></td><td 
align="right">Command</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><td 
align="left"><code class="code">log trap1</code></td><td 
align="right">Command</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><td 
align="left"><code class="code">log trap2</code></td><td 
align="right">Command</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-copying-id-ule"><td 
align="left"><code class="code"><b class="b">id ule</b></code> <span 
class="r"><i class="slanted">truc</i></span></td><td 
align="right">cmde</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><td 
align="left"><code class="code"><b class="b">id &lsquo;<samp 
class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span></td><td align="right">cmde2</td></tr>
+<tr class="deffnx def-cmd-deffn"><td align="left"><code 
class="code"></code></td><td align="right"></td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-copying-machin"><td 
align="left"><code class="code">machin</code></td><td align="right"></td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-copying-bidule-machin"><td 
align="left"><code class="code">bidule machin</code></td><td 
align="right"></td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-copying-machin-1"><td 
align="left"><code class="code">machin</code></td><td 
align="right">truc</td></tr>
+<tr class="deffnx def-cmd-deffn"><td align="left"><code 
class="code"></code></td><td align="right">truc</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-copying-followed"><td 
align="left"><code class="code">followed</code> <span class="r"><i 
class="slanted">by a comment</i></span></td><td align="right">truc</td></tr>
+<tr class="deffnx def-cmd-deffn"><td align="left"><code 
class="code"></code></td><td align="right"></td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-copying-a"><td align="left"><code 
class="code">a</code> <span class="r"><i class="slanted">b c d e <b class="b">f 
g</b> h i</i></span></td><td align="right">truc</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-copying-deffnx"><td 
align="left"><code class="code">deffnx</code> <span class="r"><i 
class="slanted">before end deffn</i></span></td><td align="right">truc</td></tr>
 </table>
 
 
 <table class="first-deffn" width="100%">
-<tr class="deffn" id="index-copying-deffn"><td align="left"> 
<strong>deffn</strong></td><td align="right">empty</td></tr>
+<tr class="deffn" id="index-copying-deffn"><td align="left"><code 
class="code">deffn</code></td><td align="right">empty</td></tr>
 </table>
 
 <table class="first-deffn" width="100%">
-<tr class="deffn" id="index-copying-deffn-1"><td align="left"> 
<strong>deffn</strong><em> with deffnx</em></td><td 
align="right">empty</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-copying-deffnx-1"><td align="left"> 
<strong>deffnx</strong></td><td align="right">empty</td></tr>
+<tr class="deffn" id="index-copying-deffn-1"><td align="left"><code 
class="code">deffn</code> <span class="r"><i class="slanted">with 
deffnx</i></span></td><td align="right">empty</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-copying-deffnx-1"><td 
align="left"><code class="code">deffnx</code></td><td 
align="right">empty</td></tr>
 </table>
 
 <table class="first-deffn" width="100%">
-<tr class="deffn" id="index-copying-i-1"><td align="left"> <strong><var 
class="var">i</var></strong><em> a g</em></td><td align="right">fset</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-copying-truc-1"><td align="left"> 
<strong>truc</strong></td><td align="right">cmde</td></tr>
+<tr class="deffn" id="index-copying-i-1"><td align="left"><code 
class="code"><var class="var">i</var></code> <span class="r"><i 
class="slanted">a g</i></span></td><td align="right">fset</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-copying-truc-1"><td 
align="left"><code class="code">truc</code></td><td align="right">cmde</td></tr>
 <tr><td colspan="2"><p>text in def item for second def item
 </p></td></tr></table>
 
 
 <table class="first-defvr" width="100%">
-<tr class="defvr" id="index-copying-d_002d_002defvr_005fname"><td 
align="left"> <strong>d--efvr_name</strong></td><td 
align="right">c--ategory</td></tr>
+<tr class="defvr" id="index-copying-d_002d_002defvr_005fname"><td 
align="left"><code class="code">d--efvr_name</code></td><td 
align="right">c--ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;efvr
 </p></td></tr></table>
 
 <table class="first-deffn" width="100%">
-<tr class="deffn" id="index-copying-n_002d_002dame"><td align="left"> 
<strong>n--ame</strong><em> a--rguments...</em></td><td 
align="right">c--ategory</td></tr>
+<tr class="deffn" id="index-copying-n_002d_002dame"><td align="left"><code 
class="code">n--ame</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td 
align="right">c--ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;effn
 </p></td></tr></table>
 
 <table class="first-deffn" width="100%">
-<tr class="deffn" id="index-copying-n_002d_002dame-1"><td align="left"> 
<strong>n--ame</strong></td><td align="right">c--ategory</td></tr>
+<tr class="deffn" id="index-copying-n_002d_002dame-1"><td align="left"><code 
class="code">n--ame</code></td><td align="right">c--ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;effn no arg
 </p></td></tr></table>
 
 <table class="first-deftypefn" width="100%">
-<tr class="deftypefn" id="index-copying-d_002d_002deftypefn_005fname"><td 
align="left"> <em>t--ype</em> <strong>d--eftypefn_name</strong><em> 
a--rguments...</em></td><td align="right">c--ategory</td></tr>
+<tr class="deftypefn" id="index-copying-d_002d_002deftypefn_005fname"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypefn_name</code> <code 
class="code">a--rguments...</code></td><td align="right">c--ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypefn
 </p></td></tr></table>
 
 <table class="first-deftypefn" width="100%">
-<tr class="deftypefn" id="index-copying-d_002d_002deftypefn_005fname-1"><td 
align="left"> <em>t--ype</em> <strong>d--eftypefn_name</strong></td><td 
align="right">c--ategory</td></tr>
+<tr class="deftypefn" id="index-copying-d_002d_002deftypefn_005fname-1"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypefn_name</code></td><td align="right">c--ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypefn no arg
 </p></td></tr></table>
 
 <table class="first-deftypeop" width="100%">
-<tr class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><td 
align="left"> <em>t--ype</em> <strong>d--eftypeop_name</strong><em> 
a--rguments...</em></td><td align="right">c--ategory on c--lass</td></tr>
+<tr class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypeop_name</code> <code 
class="code">a--rguments...</code></td><td align="right">c--ategory on 
c--lass</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypeop
 </p></td></tr></table>
 
 <table class="first-deftypeop" width="100%">
-<tr class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname-on-c_002d_002dlass-1"><td 
align="left"> <em>t--ype</em> <strong>d--eftypeop_name</strong></td><td 
align="right">c--ategory on c--lass</td></tr>
+<tr class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname-on-c_002d_002dlass-1"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypeop_name</code></td><td align="right">c--ategory on 
c--lass</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypeop no arg
 </p></td></tr></table>
 
 <table class="first-deftypevr" width="100%">
-<tr class="deftypevr" id="index-copying-d_002d_002deftypevr_005fname"><td 
align="left"> <em>t--ype</em> <strong>d--eftypevr_name</strong></td><td 
align="right">c--ategory</td></tr>
+<tr class="deftypevr" id="index-copying-d_002d_002deftypevr_005fname"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypevr_name</code></td><td align="right">c--ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypevr
 </p></td></tr></table>
 
 <table class="first-defcv" width="100%">
-<tr class="defcv" id="index-copying-d_002d_002defcv_005fname"><td 
align="left"> <strong>d--efcv_name</strong></td><td align="right">c--ategory of 
c--lass</td></tr>
+<tr class="defcv" id="index-copying-d_002d_002defcv_005fname"><td 
align="left"><code class="code">d--efcv_name</code></td><td 
align="right">c--ategory of c--lass</td></tr>
 <tr><td colspan="2"><p>d&ndash;efcv
 </p></td></tr></table>
 
 <table class="first-defcv" width="100%">
-<tr class="defcv" id="index-copying-d_002d_002defcv_005fname-1"><td 
align="left"> <strong>d--efcv_name</strong><em> a--rguments...</em></td><td 
align="right">c--ategory of c--lass</td></tr>
+<tr class="defcv" id="index-copying-d_002d_002defcv_005fname-1"><td 
align="left"><code class="code">d--efcv_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td align="right">c--ategory 
of c--lass</td></tr>
 <tr><td colspan="2"><p>d&ndash;efcv with arguments
 </p></td></tr></table>
 
 <table class="first-deftypecv" width="100%">
-<tr class="deftypecv" 
id="index-copying-d_002d_002deftypecv_005fname-of-c_002d_002dlass"><td 
align="left"> <em>t--ype</em> <strong>d--eftypecv_name</strong></td><td 
align="right">c--ategory of c--lass</td></tr>
+<tr class="deftypecv" 
id="index-copying-d_002d_002deftypecv_005fname-of-c_002d_002dlass"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypecv_name</code></td><td align="right">c--ategory of 
c--lass</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypecv
 </p></td></tr></table>
 
 <table class="first-deftypecv" width="100%">
-<tr class="deftypecv" 
id="index-copying-d_002d_002deftypecv_005fname-of-c_002d_002dlass-1"><td 
align="left"> <em>t--ype</em> <strong>d--eftypecv_name</strong><em> 
a--rguments...</em></td><td align="right">c--ategory of c--lass</td></tr>
+<tr class="deftypecv" 
id="index-copying-d_002d_002deftypecv_005fname-of-c_002d_002dlass-1"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypecv_name</code> <code 
class="code">a--rguments...</code></td><td align="right">c--ategory of 
c--lass</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypecv with arguments
 </p></td></tr></table>
 
 <table class="first-defop" width="100%">
-<tr class="defop" 
id="index-copying-d_002d_002defop_005fname-on-c_002d_002dlass"><td 
align="left"> <strong>d--efop_name</strong><em> a--rguments...</em></td><td 
align="right">c--ategory on c--lass</td></tr>
+<tr class="defop" 
id="index-copying-d_002d_002defop_005fname-on-c_002d_002dlass"><td 
align="left"><code class="code">d--efop_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td align="right">c--ategory 
on c--lass</td></tr>
 <tr><td colspan="2"><p>d&ndash;efop
 </p></td></tr></table>
 
 <table class="first-defop" width="100%">
-<tr class="defop" 
id="index-copying-d_002d_002defop_005fname-on-c_002d_002dlass-1"><td 
align="left"> <strong>d--efop_name</strong></td><td align="right">c--ategory on 
c--lass</td></tr>
+<tr class="defop" 
id="index-copying-d_002d_002defop_005fname-on-c_002d_002dlass-1"><td 
align="left"><code class="code">d--efop_name</code></td><td 
align="right">c--ategory on c--lass</td></tr>
 <tr><td colspan="2"><p>d&ndash;efop no arg
 </p></td></tr></table>
 
 <table class="first-deftp" width="100%">
-<tr class="deftp" id="index-copying-d_002d_002deftp_005fname"><td 
align="left"> <strong>d--eftp_name</strong><em> a--ttributes...</em></td><td 
align="right">c--ategory</td></tr>
+<tr class="deftp" id="index-copying-d_002d_002deftp_005fname"><td 
align="left"><code class="code">d--eftp_name</code> <span class="r"><i 
class="slanted">a&ndash;ttributes...</i></span></td><td 
align="right">c--ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftp
 </p></td></tr></table>
 
 <table class="first-deffn first-defun-alias-first-deffn" width="100%">
-<tr class="deffn defun-alias-deffn" 
id="index-copying-d_002d_002defun_005fname"><td align="left"> 
<strong>d--efun_name</strong><em> a--rguments...</em></td><td 
align="right">Function</td></tr>
+<tr class="deffn defun-alias-deffn" 
id="index-copying-d_002d_002defun_005fname"><td align="left"><code 
class="code">d--efun_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td 
align="right">Function</td></tr>
 <tr><td colspan="2"><p>d&ndash;efun
 </p></td></tr></table>
 
 <table class="first-deffn first-defmac-alias-first-deffn" width="100%">
-<tr class="deffn defmac-alias-deffn" 
id="index-copying-d_002d_002defmac_005fname"><td align="left"> 
<strong>d--efmac_name</strong><em> a--rguments...</em></td><td 
align="right">Macro</td></tr>
+<tr class="deffn defmac-alias-deffn" 
id="index-copying-d_002d_002defmac_005fname"><td align="left"><code 
class="code">d--efmac_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td 
align="right">Macro</td></tr>
 <tr><td colspan="2"><p>d&ndash;efmac
 </p></td></tr></table>
 
 <table class="first-deffn first-defspec-alias-first-deffn" width="100%">
-<tr class="deffn defspec-alias-deffn" 
id="index-copying-d_002d_002defspec_005fname"><td align="left"> 
<strong>d--efspec_name</strong><em> a--rguments...</em></td><td 
align="right">Special Form</td></tr>
+<tr class="deffn defspec-alias-deffn" 
id="index-copying-d_002d_002defspec_005fname"><td align="left"><code 
class="code">d--efspec_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td align="right">Special 
Form</td></tr>
 <tr><td colspan="2"><p>d&ndash;efspec
 </p></td></tr></table>
 
 <table class="first-defvr first-defvar-alias-first-defvr" width="100%">
-<tr class="defvr defvar-alias-defvr" 
id="index-copying-d_002d_002defvar_005fname"><td align="left"> 
<strong>d--efvar_name</strong></td><td align="right">Variable</td></tr>
+<tr class="defvr defvar-alias-defvr" 
id="index-copying-d_002d_002defvar_005fname"><td align="left"><code 
class="code">d--efvar_name</code></td><td align="right">Variable</td></tr>
 <tr><td colspan="2"><p>d&ndash;efvar
 </p></td></tr></table>
 
 <table class="first-defvr first-defvar-alias-first-defvr" width="100%">
-<tr class="defvr defvar-alias-defvr" 
id="index-copying-d_002d_002defvar_005fname-1"><td align="left"> 
<strong>d--efvar_name</strong><em> arg--var arg--var1</em></td><td 
align="right">Variable</td></tr>
+<tr class="defvr defvar-alias-defvr" 
id="index-copying-d_002d_002defvar_005fname-1"><td align="left"><code 
class="code">d--efvar_name</code> <span class="r"><i 
class="slanted">arg&ndash;var arg&ndash;var1</i></span></td><td 
align="right">Variable</td></tr>
 <tr><td colspan="2"><p>d&ndash;efvar with args
 </p></td></tr></table>
 
 <table class="first-defvr first-defopt-alias-first-defvr" width="100%">
-<tr class="defvr defopt-alias-defvr" 
id="index-copying-d_002d_002defopt_005fname"><td align="left"> 
<strong>d--efopt_name</strong></td><td align="right">User Option</td></tr>
+<tr class="defvr defopt-alias-defvr" 
id="index-copying-d_002d_002defopt_005fname"><td align="left"><code 
class="code">d--efopt_name</code></td><td align="right">User Option</td></tr>
 <tr><td colspan="2"><p>d&ndash;efopt
 </p></td></tr></table>
 
 <table class="first-deftypefn first-deftypefun-alias-first-deftypefn" 
width="100%">
-<tr class="deftypefn deftypefun-alias-deftypefn" 
id="index-copying-d_002d_002deftypefun_005fname"><td align="left"> 
<em>t--ype</em> <strong>d--eftypefun_name</strong><em> 
a--rguments...</em></td><td align="right">Function</td></tr>
+<tr class="deftypefn deftypefun-alias-deftypefn" 
id="index-copying-d_002d_002deftypefun_005fname"><td align="left"><code 
class="code">t--ype</code> <code class="code">d--eftypefun_name</code> <code 
class="code">a--rguments...</code></td><td align="right">Function</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypefun
 </p></td></tr></table>
 
 <table class="first-deftypevr first-deftypevar-alias-first-deftypevr" 
width="100%">
-<tr class="deftypevr deftypevar-alias-deftypevr" 
id="index-copying-d_002d_002deftypevar_005fname"><td align="left"> 
<em>t--ype</em> <strong>d--eftypevar_name</strong></td><td 
align="right">Variable</td></tr>
+<tr class="deftypevr deftypevar-alias-deftypevr" 
id="index-copying-d_002d_002deftypevar_005fname"><td align="left"><code 
class="code">t--ype</code> <code class="code">d--eftypevar_name</code></td><td 
align="right">Variable</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypevar
 </p></td></tr></table>
 
 <table class="first-defcv first-defivar-alias-first-defcv" width="100%">
-<tr class="defcv defivar-alias-defcv" 
id="index-copying-d_002d_002defivar_005fname-of-c_002d_002dlass"><td 
align="left"> <strong>d--efivar_name</strong></td><td align="right">Instance 
Variable of c--lass</td></tr>
+<tr class="defcv defivar-alias-defcv" 
id="index-copying-d_002d_002defivar_005fname-of-c_002d_002dlass"><td 
align="left"><code class="code">d--efivar_name</code></td><td 
align="right">Instance Variable of c--lass</td></tr>
 <tr><td colspan="2"><p>d&ndash;efivar
 </p></td></tr></table>
 
 <table class="first-deftypecv first-deftypeivar-alias-first-deftypecv" 
width="100%">
-<tr class="deftypecv deftypeivar-alias-deftypecv" 
id="index-copying-d_002d_002deftypeivar_005fname-of-c_002d_002dlass"><td 
align="left"> <em>t--ype</em> <strong>d--eftypeivar_name</strong></td><td 
align="right">Instance Variable of c--lass</td></tr>
+<tr class="deftypecv deftypeivar-alias-deftypecv" 
id="index-copying-d_002d_002deftypeivar_005fname-of-c_002d_002dlass"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypeivar_name</code></td><td align="right">Instance Variable 
of c--lass</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypeivar
 </p></td></tr></table>
 
 <table class="first-defop first-defmethod-alias-first-defop" width="100%">
-<tr class="defop defmethod-alias-defop" 
id="index-copying-d_002d_002defmethod_005fname-on-c_002d_002dlass"><td 
align="left"> <strong>d--efmethod_name</strong><em> a--rguments...</em></td><td 
align="right">Method on c--lass</td></tr>
+<tr class="defop defmethod-alias-defop" 
id="index-copying-d_002d_002defmethod_005fname-on-c_002d_002dlass"><td 
align="left"><code class="code">d--efmethod_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td align="right">Method on 
c--lass</td></tr>
 <tr><td colspan="2"><p>d&ndash;efmethod
 </p></td></tr></table>
 
 <table class="first-deftypeop first-deftypemethod-alias-first-deftypeop" 
width="100%">
-<tr class="deftypeop deftypemethod-alias-deftypeop" 
id="index-copying-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><td 
align="left"> <em>t--ype</em> <strong>d--eftypemethod_name</strong><em> 
a--rguments...</em></td><td align="right">Method on c--lass</td></tr>
+<tr class="deftypeop deftypemethod-alias-deftypeop" 
id="index-copying-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypemethod_name</code> <code 
class="code">a--rguments...</code></td><td align="right">Method on 
c--lass</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypemethod
 </p></td></tr></table>
 
 
 <table class="first-deftypefn first-deftypefun-alias-first-deftypefn" 
width="100%">
-<tr class="deftypefn deftypefun-alias-deftypefn" id="index-copying-name2"><td 
align="left"> <em>data-type2</em> <strong>name2</strong><em> 
arguments2...</em></td><td align="right">Function</td></tr>
+<tr class="deftypefn deftypefun-alias-deftypefn" id="index-copying-name2"><td 
align="left"><code class="code">data-type2</code><br> <code 
class="code">name2</code> <code class="code">arguments2...</code></td><td 
align="right">Function</td></tr>
 <tr><td colspan="2"><p>aaa2
 </p></td></tr></table>
 
 <table class="first-deftypefn" width="100%">
-<tr class="deftypefn" id="index-copying-d_002d_002deftypefn_005fname2"><td 
align="left"> <em>t--ype2</em> <strong>d--eftypefn_name2</strong></td><td 
align="right">c--ategory2</td></tr>
+<tr class="deftypefn" id="index-copying-d_002d_002deftypefn_005fname2"><td 
align="left"><code class="code">t--ype2</code><br> <code 
class="code">d--eftypefn_name2</code></td><td 
align="right">c--ategory2</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypefn no arg2
 </p></td></tr></table>
 
 <table class="first-deftypeop" width="100%">
-<tr class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><td 
align="left"> <em>t--ype2</em> <strong>d--eftypeop_name2</strong><em> 
a--rguments2...</em></td><td align="right">c--ategory2 on c--lass2</td></tr>
+<tr class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><td 
align="left"><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code></td><td align="right">c--ategory2 on 
c--lass2</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypeop2
 </p></td></tr></table>
 
 <table class="first-deftypeop" width="100%">
-<tr class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><td 
align="left"> <em>t--ype2</em> <strong>d--eftypeop_name2</strong></td><td 
align="right">c--ategory2 on c--lass2</td></tr>
+<tr class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><td 
align="left"><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code></td><td align="right">c--ategory2 on 
c--lass2</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypeop no arg2
 </p></td></tr></table>
 
 <table class="first-deftypecv" width="100%">
-<tr class="deftypecv" 
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><td 
align="left"> <em>t--ype2</em> <strong>d--eftypecv_name2</strong></td><td 
align="right">c--ategory2 of c--lass2</td></tr>
+<tr class="deftypecv" 
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><td 
align="left"><code class="code">t--ype2</code> <code 
class="code">d--eftypecv_name2</code></td><td align="right">c--ategory2 of 
c--lass2</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypecv2
 </p></td></tr></table>
 
 <table class="first-deftypecv" width="100%">
-<tr class="deftypecv" 
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><td 
align="left"> <em>t--ype2</em> <strong>d--eftypecv_name2</strong><em> 
a--rguments2...</em></td><td align="right">c--ategory2 of c--lass2</td></tr>
+<tr class="deftypecv" 
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><td 
align="left"><code class="code">t--ype2</code> <code 
class="code">d--eftypecv_name2</code> <code 
class="code">a--rguments2...</code></td><td align="right">c--ategory2 of 
c--lass2</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypecv with arguments2
 </p></td></tr></table>
 
 <table class="first-deffn" width="100%">
-<tr class="deffn" id="index-copying-arg2"><td align="left"> 
<strong>arg2</strong></td><td align="right">fun2</td></tr>
+<tr class="deffn" id="index-copying-arg2"><td align="left"><code 
class="code">arg2</code></td><td align="right">fun2</td></tr>
 <tr><td colspan="2"><p>fff2
 </p></td></tr></table>
 
@@ -1917,17 +1917,17 @@ html ''
 
 <table class="first-deffn" width="100%">
 <tr class="deffn"><td align="left"></td><td align="right">fun</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-copying-machin-2"><td align="left"> 
<strong>machin</strong><em> bidule chose and</em></td><td 
align="right">truc</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-copying-machin-3"><td align="left"> 
<strong>machin</strong><em> bidule chose and  after</em></td><td 
align="right">truc</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-copying-machin-4"><td align="left"> 
<strong>machin</strong><em> bidule chose and </em></td><td 
align="right">truc</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-copying-machin-5"><td align="left"> 
<strong>machin</strong><em> bidule chose and and after</em></td><td 
align="right">truc</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-copying-followed-1"><td 
align="left"> <strong>followed</strong><em> by a comment</em></td><td 
align="right">truc</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-copying-machin-2"><td 
align="left"><code class="code">machin</code> <span class="r"><i 
class="slanted">bidule chose and</i></span></td><td align="right">truc</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-copying-machin-3"><td 
align="left"><code class="code">machin</code> <span class="r"><i 
class="slanted">bidule chose and  after</i></span></td><td 
align="right">truc</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-copying-machin-4"><td 
align="left"><code class="code">machin</code> <span class="r"><i 
class="slanted">bidule chose and </i></span></td><td 
align="right">truc</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-copying-machin-5"><td 
align="left"><code class="code">machin</code> <span class="r"><i 
class="slanted">bidule chose and and after</i></span></td><td 
align="right">truc</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-copying-followed-1"><td 
align="left"><code class="code">followed</code> <span class="r"><i 
class="slanted">by a comment</i></span></td><td align="right">truc</td></tr>
 <tr><td colspan="2"><p>Various deff lines
-</p></td></tr><tr class="deffnx def-cmd-deffn" id="index-copying-after"><td 
align="left"> <strong>after</strong><em> a deff item</em></td><td 
align="right">truc</td></tr>
+</p></td></tr><tr class="deffnx def-cmd-deffn" id="index-copying-after"><td 
align="left"><code class="code">after</code> <span class="r"><i 
class="slanted">a deff item</i></span></td><td align="right">truc</td></tr>
 </table>
 
 <table class="first-deffn" width="100%">
-<tr class="deffn" id="index-copying-invalid"><td align="left"> <strong><var 
class="var">invalid</var></strong><em> a g</em></td><td 
align="right">fsetinv</td></tr>
+<tr class="deffn" id="index-copying-invalid"><td align="left"><code 
class="code"><var class="var">invalid</var></code> <span class="r"><i 
class="slanted">a g</i></span></td><td align="right">fsetinv</td></tr>
 <tr class="deffnx def-cmd-deffn"><td align="left"></td><td align="right"><b 
class="b">id &lsquo;<samp class="samp">i</samp>&rsquo; ule</b></td></tr>
 <tr class="deffnx def-cmd-deffn"><td align="left"></td><td 
align="right"></td></tr>
 <tr class="deffnx def-cmd-deffn"><td align="left"></td><td 
align="right">aaa</td></tr>
@@ -2518,220 +2518,220 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 </pre></div>
 
 <table class="first-deffn" width="100%">
-<tr class="deffn" id="index-d_002d_002deffn_005fname"><td align="left"> 
<strong>d--effn_name</strong><em> a--rguments...</em></td><td 
align="right">c--ategory</td></tr>
+<tr class="deffn" id="index-d_002d_002deffn_005fname"><td align="left"><code 
class="code">d--effn_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td 
align="right">c--ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;effn
 </p></td></tr></table>
 
 <table class="first-deffn" width="100%">
-<tr class="deffn" id="index-de_002d_002dffn_005fname"><td align="left"> 
<strong>de--ffn_name</strong><em> ar--guments    more args <br> even more 
so</em></td><td align="right">cate--gory</td></tr>
+<tr class="deffn" id="index-de_002d_002dffn_005fname"><td align="left"><code 
class="code">de--ffn_name</code> <span class="r"><i 
class="slanted">ar&ndash;guments    more args <br> even more 
so</i></span></td><td align="right">cate--gory</td></tr>
 <tr><td colspan="2"><p>def&ndash;fn
 </p></td></tr></table>
  
 <table class="first-deffn" width="100%">
-<tr class="deffn" id="index-i"><td align="left"> <strong><var 
class="var">i</var></strong><em> a g</em></td><td align="right">fset</td></tr>
+<tr class="deffn" id="index-i"><td align="left"><code class="code"><var 
class="var">i</var></code> <span class="r"><i class="slanted">a 
g</i></span></td><td align="right">fset</td></tr>
 <tr><td colspan="2"><a class="index-entry-id" 
id="index-index-entry-within-deffn"></a>
-</td></tr><tr class="deffnx def-cmd-deffn" id="index-truc"><td align="left"> 
<strong>truc</strong></td><td align="right">cmde</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-log-trap"><td align="left"> 
<strong>log trap</strong></td><td align="right">Command</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-log-trap1"><td align="left"> 
<strong>log trap1</strong></td><td align="right">Command</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-log-trap2"><td align="left"> 
<strong>log trap2</strong></td><td align="right">Command</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-id-ule"><td align="left"> 
<strong><b class="b">id ule</b></strong><em> truc</em></td><td 
align="right">cmde</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-id-i-ule"><td align="left"> 
<strong><b class="b">id &lsquo;<samp class="samp">i</samp>&rsquo; 
ule</b></strong><em> truc</em></td><td align="right">cmde2</td></tr>
-<tr class="deffnx def-cmd-deffn"><td align="left"></td><td 
align="right"></td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-machin"><td align="left"> 
<strong>machin</strong></td><td align="right"></td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-bidule-machin"><td align="left"> 
<strong>bidule machin</strong></td><td align="right"></td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-machin-1"><td align="left"> 
<strong>machin</strong></td><td align="right">truc</td></tr>
-<tr class="deffnx def-cmd-deffn"><td align="left"></td><td 
align="right">truc</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-followed"><td align="left"> 
<strong>followed</strong><em> by a comment</em></td><td 
align="right">truc</td></tr>
-<tr class="deffnx def-cmd-deffn"><td align="left"></td><td 
align="right"></td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-a-1"><td align="left"> 
<strong>a</strong><em> b c d e <b class="b">f g</b> h i</em></td><td 
align="right">truc</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-deffnx"><td align="left"> 
<strong>deffnx</strong><em> before end deffn</em></td><td 
align="right">truc</td></tr>
+</td></tr><tr class="deffnx def-cmd-deffn" id="index-truc"><td 
align="left"><code class="code">truc</code></td><td align="right">cmde</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-log-trap"><td align="left"><code 
class="code">log trap</code></td><td align="right">Command</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-log-trap1"><td align="left"><code 
class="code">log trap1</code></td><td align="right">Command</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-log-trap2"><td align="left"><code 
class="code">log trap2</code></td><td align="right">Command</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-id-ule"><td align="left"><code 
class="code"><b class="b">id ule</b></code> <span class="r"><i 
class="slanted">truc</i></span></td><td align="right">cmde</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-id-i-ule"><td align="left"><code 
class="code"><b class="b">id &lsquo;<samp class="samp">i</samp>&rsquo; 
ule</b></code> <span class="r"><i class="slanted">truc</i></span></td><td 
align="right">cmde2</td></tr>
+<tr class="deffnx def-cmd-deffn"><td align="left"><code 
class="code"></code></td><td align="right"></td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-machin"><td align="left"><code 
class="code">machin</code></td><td align="right"></td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-bidule-machin"><td 
align="left"><code class="code">bidule machin</code></td><td 
align="right"></td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-machin-1"><td align="left"><code 
class="code">machin</code></td><td align="right">truc</td></tr>
+<tr class="deffnx def-cmd-deffn"><td align="left"><code 
class="code"></code></td><td align="right">truc</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-followed"><td align="left"><code 
class="code">followed</code> <span class="r"><i class="slanted">by a 
comment</i></span></td><td align="right">truc</td></tr>
+<tr class="deffnx def-cmd-deffn"><td align="left"><code 
class="code"></code></td><td align="right"></td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-a-1"><td align="left"><code 
class="code">a</code> <span class="r"><i class="slanted">b c d e <b class="b">f 
g</b> h i</i></span></td><td align="right">truc</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-deffnx"><td align="left"><code 
class="code">deffnx</code> <span class="r"><i class="slanted">before end 
deffn</i></span></td><td align="right">truc</td></tr>
 </table>
 
 
 <table class="first-deffn" width="100%">
-<tr class="deffn" id="index-deffn"><td align="left"> 
<strong>deffn</strong></td><td align="right">empty</td></tr>
+<tr class="deffn" id="index-deffn"><td align="left"><code 
class="code">deffn</code></td><td align="right">empty</td></tr>
 </table>
 
 <table class="first-deffn" width="100%">
-<tr class="deffn" id="index-deffn-1"><td align="left"> 
<strong>deffn</strong><em> with deffnx</em></td><td 
align="right">empty</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-deffnx-1"><td align="left"> 
<strong>deffnx</strong></td><td align="right">empty</td></tr>
+<tr class="deffn" id="index-deffn-1"><td align="left"><code 
class="code">deffn</code> <span class="r"><i class="slanted">with 
deffnx</i></span></td><td align="right">empty</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-deffnx-1"><td align="left"><code 
class="code">deffnx</code></td><td align="right">empty</td></tr>
 </table>
 
 <table class="first-deffn" width="100%">
-<tr class="deffn" id="index-i-1"><td align="left"> <strong><var 
class="var">i</var></strong><em> a g</em></td><td align="right">fset</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-truc-1"><td align="left"> 
<strong>truc</strong></td><td align="right">cmde</td></tr>
+<tr class="deffn" id="index-i-1"><td align="left"><code class="code"><var 
class="var">i</var></code> <span class="r"><i class="slanted">a 
g</i></span></td><td align="right">fset</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-truc-1"><td align="left"><code 
class="code">truc</code></td><td align="right">cmde</td></tr>
 <tr><td colspan="2"><p>text in def item for second def item
 </p></td></tr></table>
 
 
 <table class="first-defvr" width="100%">
-<tr class="defvr" id="index-d_002d_002defvr_005fname"><td align="left"> 
<strong>d--efvr_name</strong></td><td align="right">c--ategory</td></tr>
+<tr class="defvr" id="index-d_002d_002defvr_005fname"><td align="left"><code 
class="code">d--efvr_name</code></td><td align="right">c--ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;efvr
 </p></td></tr></table>
 
 <table class="first-deffn" width="100%">
-<tr class="deffn" id="index-n_002d_002dame"><td align="left"> 
<strong>n--ame</strong><em> a--rguments...</em></td><td 
align="right">c--ategory</td></tr>
+<tr class="deffn" id="index-n_002d_002dame"><td align="left"><code 
class="code">n--ame</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td 
align="right">c--ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;effn
 </p></td></tr></table>
 
 <table class="first-deffn" width="100%">
-<tr class="deffn" id="index-n_002d_002dame-1"><td align="left"> 
<strong>n--ame</strong></td><td align="right">c--ategory</td></tr>
+<tr class="deffn" id="index-n_002d_002dame-1"><td align="left"><code 
class="code">n--ame</code></td><td align="right">c--ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;effn no arg
 </p></td></tr></table>
 
 <table class="first-deftypefn" width="100%">
-<tr class="deftypefn" id="index-d_002d_002deftypefn_005fname"><td 
align="left"> <em>t--ype</em> <strong>d--eftypefn_name</strong><em> 
a--rguments...</em></td><td align="right">c--ategory</td></tr>
+<tr class="deftypefn" id="index-d_002d_002deftypefn_005fname"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypefn_name</code> <code 
class="code">a--rguments...</code></td><td align="right">c--ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypefn
 </p></td></tr></table>
 
 <table class="first-deftypefn" width="100%">
-<tr class="deftypefn" id="index-d_002d_002deftypefn_005fname-1"><td 
align="left"> <em>t--ype</em> <strong>d--eftypefn_name</strong></td><td 
align="right">c--ategory</td></tr>
+<tr class="deftypefn" id="index-d_002d_002deftypefn_005fname-1"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypefn_name</code></td><td align="right">c--ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypefn no arg
 </p></td></tr></table>
 
 <table class="first-deftypeop" width="100%">
-<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><td align="left"> 
<em>t--ype</em> <strong>d--eftypeop_name</strong><em> 
a--rguments...</em></td><td align="right">c--ategory on c--lass</td></tr>
+<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypeop_name</code> <code 
class="code">a--rguments...</code></td><td align="right">c--ategory on 
c--lass</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypeop
 </p></td></tr></table>
 
 <table class="first-deftypeop" width="100%">
-<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname-on-c_002d_002dlass-1"><td align="left"> 
<em>t--ype</em> <strong>d--eftypeop_name</strong></td><td 
align="right">c--ategory on c--lass</td></tr>
+<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname-on-c_002d_002dlass-1"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypeop_name</code></td><td align="right">c--ategory on 
c--lass</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypeop no arg
 </p></td></tr></table>
 
 <table class="first-deftypevr" width="100%">
-<tr class="deftypevr" id="index-d_002d_002deftypevr_005fname"><td 
align="left"> <em>t--ype</em> <strong>d--eftypevr_name</strong></td><td 
align="right">c--ategory</td></tr>
+<tr class="deftypevr" id="index-d_002d_002deftypevr_005fname"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypevr_name</code></td><td align="right">c--ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypevr
 </p></td></tr></table>
 
 <table class="first-defcv" width="100%">
-<tr class="defcv" id="index-d_002d_002defcv_005fname"><td align="left"> 
<strong>d--efcv_name</strong></td><td align="right">c--ategory of 
c--lass</td></tr>
+<tr class="defcv" id="index-d_002d_002defcv_005fname"><td align="left"><code 
class="code">d--efcv_name</code></td><td align="right">c--ategory of 
c--lass</td></tr>
 <tr><td colspan="2"><p>d&ndash;efcv
 </p></td></tr></table>
 
 <table class="first-defcv" width="100%">
-<tr class="defcv" id="index-d_002d_002defcv_005fname-1"><td align="left"> 
<strong>d--efcv_name</strong><em> a--rguments...</em></td><td 
align="right">c--ategory of c--lass</td></tr>
+<tr class="defcv" id="index-d_002d_002defcv_005fname-1"><td align="left"><code 
class="code">d--efcv_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td align="right">c--ategory 
of c--lass</td></tr>
 <tr><td colspan="2"><p>d&ndash;efcv with arguments
 </p></td></tr></table>
 
 <table class="first-deftypecv" width="100%">
-<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname-of-c_002d_002dlass"><td align="left"> 
<em>t--ype</em> <strong>d--eftypecv_name</strong></td><td 
align="right">c--ategory of c--lass</td></tr>
+<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname-of-c_002d_002dlass"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypecv_name</code></td><td align="right">c--ategory of 
c--lass</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypecv
 </p></td></tr></table>
 
 <table class="first-deftypecv" width="100%">
-<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname-of-c_002d_002dlass-1"><td align="left"> 
<em>t--ype</em> <strong>d--eftypecv_name</strong><em> 
a--rguments...</em></td><td align="right">c--ategory of c--lass</td></tr>
+<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname-of-c_002d_002dlass-1"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypecv_name</code> <code 
class="code">a--rguments...</code></td><td align="right">c--ategory of 
c--lass</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypecv with arguments
 </p></td></tr></table>
 
 <table class="first-defop" width="100%">
-<tr class="defop" id="index-d_002d_002defop_005fname-on-c_002d_002dlass"><td 
align="left"> <strong>d--efop_name</strong><em> a--rguments...</em></td><td 
align="right">c--ategory on c--lass</td></tr>
+<tr class="defop" id="index-d_002d_002defop_005fname-on-c_002d_002dlass"><td 
align="left"><code class="code">d--efop_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td align="right">c--ategory 
on c--lass</td></tr>
 <tr><td colspan="2"><p>d&ndash;efop
 </p></td></tr></table>
 
 <table class="first-defop" width="100%">
-<tr class="defop" id="index-d_002d_002defop_005fname-on-c_002d_002dlass-1"><td 
align="left"> <strong>d--efop_name</strong></td><td align="right">c--ategory on 
c--lass</td></tr>
+<tr class="defop" id="index-d_002d_002defop_005fname-on-c_002d_002dlass-1"><td 
align="left"><code class="code">d--efop_name</code></td><td 
align="right">c--ategory on c--lass</td></tr>
 <tr><td colspan="2"><p>d&ndash;efop no arg
 </p></td></tr></table>
 
 <table class="first-deftp" width="100%">
-<tr class="deftp" id="index-d_002d_002deftp_005fname"><td align="left"> 
<strong>d--eftp_name</strong><em> a--ttributes...</em></td><td 
align="right">c--ategory</td></tr>
+<tr class="deftp" id="index-d_002d_002deftp_005fname"><td align="left"><code 
class="code">d--eftp_name</code> <span class="r"><i 
class="slanted">a&ndash;ttributes...</i></span></td><td 
align="right">c--ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftp
 </p></td></tr></table>
 
 <table class="first-deffn first-defun-alias-first-deffn" width="100%">
-<tr class="deffn defun-alias-deffn" id="index-d_002d_002defun_005fname"><td 
align="left"> <strong>d--efun_name</strong><em> a--rguments...</em></td><td 
align="right">Function</td></tr>
+<tr class="deffn defun-alias-deffn" id="index-d_002d_002defun_005fname"><td 
align="left"><code class="code">d--efun_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td 
align="right">Function</td></tr>
 <tr><td colspan="2"><p>d&ndash;efun
 </p></td></tr></table>
 
 <table class="first-deffn first-defmac-alias-first-deffn" width="100%">
-<tr class="deffn defmac-alias-deffn" id="index-d_002d_002defmac_005fname"><td 
align="left"> <strong>d--efmac_name</strong><em> a--rguments...</em></td><td 
align="right">Macro</td></tr>
+<tr class="deffn defmac-alias-deffn" id="index-d_002d_002defmac_005fname"><td 
align="left"><code class="code">d--efmac_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td 
align="right">Macro</td></tr>
 <tr><td colspan="2"><p>d&ndash;efmac
 </p></td></tr></table>
 
 <table class="first-deffn first-defspec-alias-first-deffn" width="100%">
-<tr class="deffn defspec-alias-deffn" 
id="index-d_002d_002defspec_005fname"><td align="left"> 
<strong>d--efspec_name</strong><em> a--rguments...</em></td><td 
align="right">Special Form</td></tr>
+<tr class="deffn defspec-alias-deffn" 
id="index-d_002d_002defspec_005fname"><td align="left"><code 
class="code">d--efspec_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td align="right">Special 
Form</td></tr>
 <tr><td colspan="2"><p>d&ndash;efspec
 </p></td></tr></table>
 
 <table class="first-defvr first-defvar-alias-first-defvr" width="100%">
-<tr class="defvr defvar-alias-defvr" id="index-d_002d_002defvar_005fname"><td 
align="left"> <strong>d--efvar_name</strong></td><td 
align="right">Variable</td></tr>
+<tr class="defvr defvar-alias-defvr" id="index-d_002d_002defvar_005fname"><td 
align="left"><code class="code">d--efvar_name</code></td><td 
align="right">Variable</td></tr>
 <tr><td colspan="2"><p>d&ndash;efvar
 </p></td></tr></table>
 
 <table class="first-defvr first-defvar-alias-first-defvr" width="100%">
-<tr class="defvr defvar-alias-defvr" 
id="index-d_002d_002defvar_005fname-1"><td align="left"> 
<strong>d--efvar_name</strong><em> arg--var arg--var1</em></td><td 
align="right">Variable</td></tr>
+<tr class="defvr defvar-alias-defvr" 
id="index-d_002d_002defvar_005fname-1"><td align="left"><code 
class="code">d--efvar_name</code> <span class="r"><i 
class="slanted">arg&ndash;var arg&ndash;var1</i></span></td><td 
align="right">Variable</td></tr>
 <tr><td colspan="2"><p>d&ndash;efvar with args
 </p></td></tr></table>
 
 <table class="first-defvr first-defopt-alias-first-defvr" width="100%">
-<tr class="defvr defopt-alias-defvr" id="index-d_002d_002defopt_005fname"><td 
align="left"> <strong>d--efopt_name</strong></td><td align="right">User 
Option</td></tr>
+<tr class="defvr defopt-alias-defvr" id="index-d_002d_002defopt_005fname"><td 
align="left"><code class="code">d--efopt_name</code></td><td align="right">User 
Option</td></tr>
 <tr><td colspan="2"><p>d&ndash;efopt
 </p></td></tr></table>
 
 <table class="first-deftypefn first-deftypefun-alias-first-deftypefn" 
width="100%">
-<tr class="deftypefn deftypefun-alias-deftypefn" 
id="index-d_002d_002deftypefun_005fname"><td align="left"> <em>t--ype</em> 
<strong>d--eftypefun_name</strong><em> a--rguments...</em></td><td 
align="right">Function</td></tr>
+<tr class="deftypefn deftypefun-alias-deftypefn" 
id="index-d_002d_002deftypefun_005fname"><td align="left"><code 
class="code">t--ype</code> <code class="code">d--eftypefun_name</code> <code 
class="code">a--rguments...</code></td><td align="right">Function</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypefun
 </p></td></tr></table>
 
 <table class="first-deftypevr first-deftypevar-alias-first-deftypevr" 
width="100%">
-<tr class="deftypevr deftypevar-alias-deftypevr" 
id="index-d_002d_002deftypevar_005fname"><td align="left"> <em>t--ype</em> 
<strong>d--eftypevar_name</strong></td><td align="right">Variable</td></tr>
+<tr class="deftypevr deftypevar-alias-deftypevr" 
id="index-d_002d_002deftypevar_005fname"><td align="left"><code 
class="code">t--ype</code> <code class="code">d--eftypevar_name</code></td><td 
align="right">Variable</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypevar
 </p></td></tr></table>
 
 <table class="first-defcv first-defivar-alias-first-defcv" width="100%">
-<tr class="defcv defivar-alias-defcv" 
id="index-d_002d_002defivar_005fname-of-c_002d_002dlass"><td align="left"> 
<strong>d--efivar_name</strong></td><td align="right">Instance Variable of 
c--lass</td></tr>
+<tr class="defcv defivar-alias-defcv" 
id="index-d_002d_002defivar_005fname-of-c_002d_002dlass"><td align="left"><code 
class="code">d--efivar_name</code></td><td align="right">Instance Variable of 
c--lass</td></tr>
 <tr><td colspan="2"><p>d&ndash;efivar
 </p></td></tr></table>
 
 <table class="first-deftypecv first-deftypeivar-alias-first-deftypecv" 
width="100%">
-<tr class="deftypecv deftypeivar-alias-deftypecv" 
id="index-d_002d_002deftypeivar_005fname-of-c_002d_002dlass"><td align="left"> 
<em>t--ype</em> <strong>d--eftypeivar_name</strong></td><td 
align="right">Instance Variable of c--lass</td></tr>
+<tr class="deftypecv deftypeivar-alias-deftypecv" 
id="index-d_002d_002deftypeivar_005fname-of-c_002d_002dlass"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypeivar_name</code></td><td align="right">Instance Variable 
of c--lass</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypeivar
 </p></td></tr></table>
 
 <table class="first-defop first-defmethod-alias-first-defop" width="100%">
-<tr class="defop defmethod-alias-defop" 
id="index-d_002d_002defmethod_005fname-on-c_002d_002dlass"><td align="left"> 
<strong>d--efmethod_name</strong><em> a--rguments...</em></td><td 
align="right">Method on c--lass</td></tr>
+<tr class="defop defmethod-alias-defop" 
id="index-d_002d_002defmethod_005fname-on-c_002d_002dlass"><td 
align="left"><code class="code">d--efmethod_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td align="right">Method on 
c--lass</td></tr>
 <tr><td colspan="2"><p>d&ndash;efmethod
 </p></td></tr></table>
 
 <table class="first-deftypeop first-deftypemethod-alias-first-deftypeop" 
width="100%">
-<tr class="deftypeop deftypemethod-alias-deftypeop" 
id="index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><td 
align="left"> <em>t--ype</em> <strong>d--eftypemethod_name</strong><em> 
a--rguments...</em></td><td align="right">Method on c--lass</td></tr>
+<tr class="deftypeop deftypemethod-alias-deftypeop" 
id="index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypemethod_name</code> <code 
class="code">a--rguments...</code></td><td align="right">Method on 
c--lass</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypemethod
 </p></td></tr></table>
 
 
 <table class="first-deftypefn first-deftypefun-alias-first-deftypefn" 
width="100%">
-<tr class="deftypefn deftypefun-alias-deftypefn" id="index-name2"><td 
align="left"> <em>data-type2</em> <strong>name2</strong><em> 
arguments2...</em></td><td align="right">Function</td></tr>
+<tr class="deftypefn deftypefun-alias-deftypefn" id="index-name2"><td 
align="left"><code class="code">data-type2</code><br> <code 
class="code">name2</code> <code class="code">arguments2...</code></td><td 
align="right">Function</td></tr>
 <tr><td colspan="2"><p>aaa2
 </p></td></tr></table>
 
 <table class="first-deftypefn" width="100%">
-<tr class="deftypefn" id="index-d_002d_002deftypefn_005fname2"><td 
align="left"> <em>t--ype2</em> <strong>d--eftypefn_name2</strong></td><td 
align="right">c--ategory2</td></tr>
+<tr class="deftypefn" id="index-d_002d_002deftypefn_005fname2"><td 
align="left"><code class="code">t--ype2</code><br> <code 
class="code">d--eftypefn_name2</code></td><td 
align="right">c--ategory2</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypefn no arg2
 </p></td></tr></table>
 
 <table class="first-deftypeop" width="100%">
-<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><td align="left"> 
<em>t--ype2</em> <strong>d--eftypeop_name2</strong><em> 
a--rguments2...</em></td><td align="right">c--ategory2 on c--lass2</td></tr>
+<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><td 
align="left"><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code></td><td align="right">c--ategory2 on 
c--lass2</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypeop2
 </p></td></tr></table>
 
 <table class="first-deftypeop" width="100%">
-<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><td 
align="left"> <em>t--ype2</em> <strong>d--eftypeop_name2</strong></td><td 
align="right">c--ategory2 on c--lass2</td></tr>
+<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><td 
align="left"><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code></td><td align="right">c--ategory2 on 
c--lass2</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypeop no arg2
 </p></td></tr></table>
 
 <table class="first-deftypecv" width="100%">
-<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><td align="left"> 
<em>t--ype2</em> <strong>d--eftypecv_name2</strong></td><td 
align="right">c--ategory2 of c--lass2</td></tr>
+<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><td 
align="left"><code class="code">t--ype2</code> <code 
class="code">d--eftypecv_name2</code></td><td align="right">c--ategory2 of 
c--lass2</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypecv2
 </p></td></tr></table>
 
 <table class="first-deftypecv" width="100%">
-<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><td 
align="left"> <em>t--ype2</em> <strong>d--eftypecv_name2</strong><em> 
a--rguments2...</em></td><td align="right">c--ategory2 of c--lass2</td></tr>
+<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><td 
align="left"><code class="code">t--ype2</code> <code 
class="code">d--eftypecv_name2</code> <code 
class="code">a--rguments2...</code></td><td align="right">c--ategory2 of 
c--lass2</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypecv with arguments2
 </p></td></tr></table>
 
 <table class="first-deffn" width="100%">
-<tr class="deffn" id="index-arg2"><td align="left"> 
<strong>arg2</strong></td><td align="right">fun2</td></tr>
+<tr class="deffn" id="index-arg2"><td align="left"><code 
class="code">arg2</code></td><td align="right">fun2</td></tr>
 <tr><td colspan="2"><p>fff2
 </p></td></tr></table>
 
@@ -2993,17 +2993,17 @@ html ''
 
 <table class="first-deffn" width="100%">
 <tr class="deffn"><td align="left"></td><td align="right">fun</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-machin-2"><td align="left"> 
<strong>machin</strong><em> bidule chose and</em></td><td 
align="right">truc</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-machin-3"><td align="left"> 
<strong>machin</strong><em> bidule chose and  after</em></td><td 
align="right">truc</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-machin-4"><td align="left"> 
<strong>machin</strong><em> bidule chose and </em></td><td 
align="right">truc</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-machin-5"><td align="left"> 
<strong>machin</strong><em> bidule chose and and after</em></td><td 
align="right">truc</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-followed-1"><td align="left"> 
<strong>followed</strong><em> by a comment</em></td><td 
align="right">truc</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-machin-2"><td align="left"><code 
class="code">machin</code> <span class="r"><i class="slanted">bidule chose 
and</i></span></td><td align="right">truc</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-machin-3"><td align="left"><code 
class="code">machin</code> <span class="r"><i class="slanted">bidule chose and  
after</i></span></td><td align="right">truc</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-machin-4"><td align="left"><code 
class="code">machin</code> <span class="r"><i class="slanted">bidule chose and 
</i></span></td><td align="right">truc</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-machin-5"><td align="left"><code 
class="code">machin</code> <span class="r"><i class="slanted">bidule chose and 
and after</i></span></td><td align="right">truc</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-followed-1"><td align="left"><code 
class="code">followed</code> <span class="r"><i class="slanted">by a 
comment</i></span></td><td align="right">truc</td></tr>
 <tr><td colspan="2"><p>Various deff lines
-</p></td></tr><tr class="deffnx def-cmd-deffn" id="index-after"><td 
align="left"> <strong>after</strong><em> a deff item</em></td><td 
align="right">truc</td></tr>
+</p></td></tr><tr class="deffnx def-cmd-deffn" id="index-after"><td 
align="left"><code class="code">after</code> <span class="r"><i 
class="slanted">a deff item</i></span></td><td align="right">truc</td></tr>
 </table>
 
 <table class="first-deffn" width="100%">
-<tr class="deffn" id="index-invalid"><td align="left"> <strong><var 
class="var">invalid</var></strong><em> a g</em></td><td 
align="right">fsetinv</td></tr>
+<tr class="deffn" id="index-invalid"><td align="left"><code class="code"><var 
class="var">invalid</var></code> <span class="r"><i class="slanted">a 
g</i></span></td><td align="right">fsetinv</td></tr>
 <tr class="deffnx def-cmd-deffn"><td align="left"></td><td align="right"><b 
class="b">id &lsquo;<samp class="samp">i</samp>&rsquo; ule</b></td></tr>
 <tr class="deffnx def-cmd-deffn"><td align="left"></td><td 
align="right"></td></tr>
 <tr class="deffnx def-cmd-deffn"><td align="left"></td><td 
align="right">aaa</td></tr>
@@ -3673,258 +3673,258 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <pre class="example-preformatted">
 
 </pre><table class="first-deffn" width="100%">
-<tr class="deffn" id="index-d_002d_002deffn_005fname-1"><td align="left"> 
<strong>d--effn_name</strong><em> a--rguments...</em></td><td 
align="right">c--ategory</td></tr>
+<tr class="deffn" id="index-d_002d_002deffn_005fname-1"><td align="left"><code 
class="code">d--effn_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td 
align="right">c--ategory</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--effn
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deffn" width="100%">
-<tr class="deffn" id="index-de_002d_002dffn_005fname-1"><td align="left"> 
<strong>de--ffn_name</strong><em> ar--guments    more args 
- even more so</em></td><td align="right">cate--gory</td></tr>
+<tr class="deffn" id="index-de_002d_002dffn_005fname-1"><td align="left"><code 
class="code">de--ffn_name</code> <span class="r"><i 
class="slanted">ar&ndash;guments    more args 
+ even more so</i></span></td><td align="right">cate--gory</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">def--fn
 </pre></td></tr></table>
 <pre class="example-preformatted"> 
 </pre><table class="first-deffn" width="100%">
-<tr class="deffn" id="index-i-2"><td align="left"> <strong><var 
class="var">i</var></strong><em> a g</em></td><td align="right">fset</td></tr>
-<tr><td colspan="2"><pre class="example-preformatted"><a 
class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></td></tr><tr class="deffnx 
def-cmd-deffn" id="index-truc-2"><td align="left"> 
<strong>truc</strong></td><td align="right">cmde</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-log-trap-1"><td align="left"> 
<strong>log trap</strong></td><td align="right">Command</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-log-trap1-1"><td align="left"> 
<strong>log trap1</strong></td><td align="right">Command</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-log-trap2-1"><td align="left"> 
<strong>log trap2</strong></td><td align="right">Command</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-id-ule-1"><td align="left"> 
<strong><b class="b">id ule</b></strong><em> truc</em></td><td 
align="right">cmde</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-id-i-ule-1"><td align="left"> 
<strong><b class="b">id &lsquo;<samp class="samp">i</samp>&rsquo; 
ule</b></strong><em> truc</em></td><td align="right">cmde2</td></tr>
-<tr class="deffnx def-cmd-deffn"><td align="left"></td><td 
align="right"></td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-machin-6"><td align="left"> 
<strong>machin</strong></td><td align="right"></td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-bidule-machin-1"><td align="left"> 
<strong>bidule machin</strong></td><td align="right"></td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-machin-7"><td align="left"> 
<strong>machin</strong></td><td align="right">truc</td></tr>
-<tr class="deffnx def-cmd-deffn"><td align="left"></td><td 
align="right">truc</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-followed-2"><td align="left"> 
<strong>followed</strong><em> by a comment</em></td><td 
align="right">truc</td></tr>
-<tr class="deffnx def-cmd-deffn"><td align="left"></td><td 
align="right"></td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-a-4"><td align="left"> 
<strong>a</strong><em> b c d e <b class="b">f g</b> h i</em></td><td 
align="right">truc</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-deffnx-2"><td align="left"> 
<strong>deffnx</strong><em> before end deffn</em></td><td 
align="right">truc</td></tr>
+<tr class="deffn" id="index-i-2"><td align="left"><code class="code"><var 
class="var">i</var></code> <span class="r"><i class="slanted">a 
g</i></span></td><td align="right">fset</td></tr>
+<tr><td colspan="2"><pre class="example-preformatted"><a 
class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></td></tr><tr class="deffnx 
def-cmd-deffn" id="index-truc-2"><td align="left"><code 
class="code">truc</code></td><td align="right">cmde</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-log-trap-1"><td align="left"><code 
class="code">log trap</code></td><td align="right">Command</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-log-trap1-1"><td align="left"><code 
class="code">log trap1</code></td><td align="right">Command</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-log-trap2-1"><td align="left"><code 
class="code">log trap2</code></td><td align="right">Command</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-id-ule-1"><td align="left"><code 
class="code"><b class="b">id ule</b></code> <span class="r"><i 
class="slanted">truc</i></span></td><td align="right">cmde</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-id-i-ule-1"><td align="left"><code 
class="code"><b class="b">id &lsquo;<samp class="samp">i</samp>&rsquo; 
ule</b></code> <span class="r"><i class="slanted">truc</i></span></td><td 
align="right">cmde2</td></tr>
+<tr class="deffnx def-cmd-deffn"><td align="left"><code 
class="code"></code></td><td align="right"></td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-machin-6"><td align="left"><code 
class="code">machin</code></td><td align="right"></td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-bidule-machin-1"><td 
align="left"><code class="code">bidule machin</code></td><td 
align="right"></td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-machin-7"><td align="left"><code 
class="code">machin</code></td><td align="right">truc</td></tr>
+<tr class="deffnx def-cmd-deffn"><td align="left"><code 
class="code"></code></td><td align="right">truc</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-followed-2"><td align="left"><code 
class="code">followed</code> <span class="r"><i class="slanted">by a 
comment</i></span></td><td align="right">truc</td></tr>
+<tr class="deffnx def-cmd-deffn"><td align="left"><code 
class="code"></code></td><td align="right"></td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-a-4"><td align="left"><code 
class="code">a</code> <span class="r"><i class="slanted">b c d e <b class="b">f 
g</b> h i</i></span></td><td align="right">truc</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-deffnx-2"><td align="left"><code 
class="code">deffnx</code> <span class="r"><i class="slanted">before end 
deffn</i></span></td><td align="right">truc</td></tr>
 </table>
 <pre class="example-preformatted">
 
 
 </pre><table class="first-deffn" width="100%">
-<tr class="deffn" id="index-deffn-2"><td align="left"> 
<strong>deffn</strong></td><td align="right">empty</td></tr>
+<tr class="deffn" id="index-deffn-2"><td align="left"><code 
class="code">deffn</code></td><td align="right">empty</td></tr>
 </table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deffn" width="100%">
-<tr class="deffn" id="index-deffn-3"><td align="left"> 
<strong>deffn</strong><em> with deffnx</em></td><td 
align="right">empty</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-deffnx-3"><td align="left"> 
<strong>deffnx</strong></td><td align="right">empty</td></tr>
+<tr class="deffn" id="index-deffn-3"><td align="left"><code 
class="code">deffn</code> <span class="r"><i class="slanted">with 
deffnx</i></span></td><td align="right">empty</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-deffnx-3"><td align="left"><code 
class="code">deffnx</code></td><td align="right">empty</td></tr>
 </table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deffn" width="100%">
-<tr class="deffn" id="index-i-3"><td align="left"> <strong><var 
class="var">i</var></strong><em> a g</em></td><td align="right">fset</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-truc-3"><td align="left"> 
<strong>truc</strong></td><td align="right">cmde</td></tr>
+<tr class="deffn" id="index-i-3"><td align="left"><code class="code"><var 
class="var">i</var></code> <span class="r"><i class="slanted">a 
g</i></span></td><td align="right">fset</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-truc-3"><td align="left"><code 
class="code">truc</code></td><td align="right">cmde</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">text in def item for 
second def item
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 
 </pre><table class="first-defvr" width="100%">
-<tr class="defvr" id="index-d_002d_002defvr_005fname-1"><td align="left"> 
<strong>d--efvr_name</strong></td><td align="right">c--ategory</td></tr>
+<tr class="defvr" id="index-d_002d_002defvr_005fname-1"><td align="left"><code 
class="code">d--efvr_name</code></td><td align="right">c--ategory</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--efvr
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deffn" width="100%">
-<tr class="deffn" id="index-n_002d_002dame-2"><td align="left"> 
<strong>n--ame</strong><em> a--rguments...</em></td><td 
align="right">c--ategory</td></tr>
+<tr class="deffn" id="index-n_002d_002dame-2"><td align="left"><code 
class="code">n--ame</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td 
align="right">c--ategory</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--effn
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deffn" width="100%">
-<tr class="deffn" id="index-n_002d_002dame-3"><td align="left"> 
<strong>n--ame</strong></td><td align="right">c--ategory</td></tr>
+<tr class="deffn" id="index-n_002d_002dame-3"><td align="left"><code 
class="code">n--ame</code></td><td align="right">c--ategory</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--effn no arg
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deftypefn" width="100%">
-<tr class="deftypefn" id="index-d_002d_002deftypefn_005fname-2"><td 
align="left"> <em>t--ype</em> <strong>d--eftypefn_name</strong><em> 
a--rguments...</em></td><td align="right">c--ategory</td></tr>
+<tr class="deftypefn" id="index-d_002d_002deftypefn_005fname-2"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypefn_name</code> <code 
class="code">a--rguments...</code></td><td align="right">c--ategory</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--eftypefn
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deftypefn" width="100%">
-<tr class="deftypefn" id="index-d_002d_002deftypefn_005fname-3"><td 
align="left"> <em>t--ype</em> <strong>d--eftypefn_name</strong></td><td 
align="right">c--ategory</td></tr>
+<tr class="deftypefn" id="index-d_002d_002deftypefn_005fname-3"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypefn_name</code></td><td align="right">c--ategory</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--eftypefn no arg
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deftypeop" width="100%">
-<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname-on-c_002d_002dlass-2"><td align="left"> 
<em>t--ype</em> <strong>d--eftypeop_name</strong><em> 
a--rguments...</em></td><td align="right">c--ategory on c--lass</td></tr>
+<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname-on-c_002d_002dlass-2"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypeop_name</code> <code 
class="code">a--rguments...</code></td><td align="right">c--ategory on 
c--lass</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--eftypeop
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deftypeop" width="100%">
-<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname-on-c_002d_002dlass-3"><td align="left"> 
<em>t--ype</em> <strong>d--eftypeop_name</strong></td><td 
align="right">c--ategory on c--lass</td></tr>
+<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname-on-c_002d_002dlass-3"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypeop_name</code></td><td align="right">c--ategory on 
c--lass</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--eftypeop no arg
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deftypevr" width="100%">
-<tr class="deftypevr" id="index-d_002d_002deftypevr_005fname-1"><td 
align="left"> <em>t--ype</em> <strong>d--eftypevr_name</strong></td><td 
align="right">c--ategory</td></tr>
+<tr class="deftypevr" id="index-d_002d_002deftypevr_005fname-1"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypevr_name</code></td><td align="right">c--ategory</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--eftypevr
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-defcv" width="100%">
-<tr class="defcv" id="index-d_002d_002defcv_005fname-2"><td align="left"> 
<strong>d--efcv_name</strong></td><td align="right">c--ategory of 
c--lass</td></tr>
+<tr class="defcv" id="index-d_002d_002defcv_005fname-2"><td align="left"><code 
class="code">d--efcv_name</code></td><td align="right">c--ategory of 
c--lass</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--efcv
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-defcv" width="100%">
-<tr class="defcv" id="index-d_002d_002defcv_005fname-3"><td align="left"> 
<strong>d--efcv_name</strong><em> a--rguments...</em></td><td 
align="right">c--ategory of c--lass</td></tr>
+<tr class="defcv" id="index-d_002d_002defcv_005fname-3"><td align="left"><code 
class="code">d--efcv_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td align="right">c--ategory 
of c--lass</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--efcv with arguments
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deftypecv" width="100%">
-<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname-of-c_002d_002dlass-2"><td align="left"> 
<em>t--ype</em> <strong>d--eftypecv_name</strong></td><td 
align="right">c--ategory of c--lass</td></tr>
+<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname-of-c_002d_002dlass-2"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypecv_name</code></td><td align="right">c--ategory of 
c--lass</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--eftypecv
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deftypecv" width="100%">
-<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname-of-c_002d_002dlass-3"><td align="left"> 
<em>t--ype</em> <strong>d--eftypecv_name</strong><em> 
a--rguments...</em></td><td align="right">c--ategory of c--lass</td></tr>
+<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname-of-c_002d_002dlass-3"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypecv_name</code> <code 
class="code">a--rguments...</code></td><td align="right">c--ategory of 
c--lass</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--eftypecv with 
arguments
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-defop" width="100%">
-<tr class="defop" id="index-d_002d_002defop_005fname-on-c_002d_002dlass-2"><td 
align="left"> <strong>d--efop_name</strong><em> a--rguments...</em></td><td 
align="right">c--ategory on c--lass</td></tr>
+<tr class="defop" id="index-d_002d_002defop_005fname-on-c_002d_002dlass-2"><td 
align="left"><code class="code">d--efop_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td align="right">c--ategory 
on c--lass</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--efop
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-defop" width="100%">
-<tr class="defop" id="index-d_002d_002defop_005fname-on-c_002d_002dlass-3"><td 
align="left"> <strong>d--efop_name</strong></td><td align="right">c--ategory on 
c--lass</td></tr>
+<tr class="defop" id="index-d_002d_002defop_005fname-on-c_002d_002dlass-3"><td 
align="left"><code class="code">d--efop_name</code></td><td 
align="right">c--ategory on c--lass</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--efop no arg
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deftp" width="100%">
-<tr class="deftp" id="index-d_002d_002deftp_005fname-1"><td align="left"> 
<strong>d--eftp_name</strong><em> a--ttributes...</em></td><td 
align="right">c--ategory</td></tr>
+<tr class="deftp" id="index-d_002d_002deftp_005fname-1"><td align="left"><code 
class="code">d--eftp_name</code> <span class="r"><i 
class="slanted">a&ndash;ttributes...</i></span></td><td 
align="right">c--ategory</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--eftp
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deffn first-defun-alias-first-deffn" width="100%">
-<tr class="deffn defun-alias-deffn" id="index-d_002d_002defun_005fname-1"><td 
align="left"> <strong>d--efun_name</strong><em> a--rguments...</em></td><td 
align="right">Function</td></tr>
+<tr class="deffn defun-alias-deffn" id="index-d_002d_002defun_005fname-1"><td 
align="left"><code class="code">d--efun_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td 
align="right">Function</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--efun
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deffn first-defmac-alias-first-deffn" width="100%">
-<tr class="deffn defmac-alias-deffn" 
id="index-d_002d_002defmac_005fname-1"><td align="left"> 
<strong>d--efmac_name</strong><em> a--rguments...</em></td><td 
align="right">Macro</td></tr>
+<tr class="deffn defmac-alias-deffn" 
id="index-d_002d_002defmac_005fname-1"><td align="left"><code 
class="code">d--efmac_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td 
align="right">Macro</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--efmac
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deffn first-defspec-alias-first-deffn" width="100%">
-<tr class="deffn defspec-alias-deffn" 
id="index-d_002d_002defspec_005fname-1"><td align="left"> 
<strong>d--efspec_name</strong><em> a--rguments...</em></td><td 
align="right">Special Form</td></tr>
+<tr class="deffn defspec-alias-deffn" 
id="index-d_002d_002defspec_005fname-1"><td align="left"><code 
class="code">d--efspec_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td align="right">Special 
Form</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--efspec
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-defvr first-defvar-alias-first-defvr" width="100%">
-<tr class="defvr defvar-alias-defvr" 
id="index-d_002d_002defvar_005fname-2"><td align="left"> 
<strong>d--efvar_name</strong></td><td align="right">Variable</td></tr>
+<tr class="defvr defvar-alias-defvr" 
id="index-d_002d_002defvar_005fname-2"><td align="left"><code 
class="code">d--efvar_name</code></td><td align="right">Variable</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--efvar
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-defvr first-defvar-alias-first-defvr" width="100%">
-<tr class="defvr defvar-alias-defvr" 
id="index-d_002d_002defvar_005fname-3"><td align="left"> 
<strong>d--efvar_name</strong><em> arg--var arg--var1</em></td><td 
align="right">Variable</td></tr>
+<tr class="defvr defvar-alias-defvr" 
id="index-d_002d_002defvar_005fname-3"><td align="left"><code 
class="code">d--efvar_name</code> <span class="r"><i 
class="slanted">arg&ndash;var arg&ndash;var1</i></span></td><td 
align="right">Variable</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--efvar with args
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-defvr first-defopt-alias-first-defvr" width="100%">
-<tr class="defvr defopt-alias-defvr" 
id="index-d_002d_002defopt_005fname-1"><td align="left"> 
<strong>d--efopt_name</strong></td><td align="right">User Option</td></tr>
+<tr class="defvr defopt-alias-defvr" 
id="index-d_002d_002defopt_005fname-1"><td align="left"><code 
class="code">d--efopt_name</code></td><td align="right">User Option</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--efopt
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deftypefn first-deftypefun-alias-first-deftypefn" 
width="100%">
-<tr class="deftypefn deftypefun-alias-deftypefn" 
id="index-d_002d_002deftypefun_005fname-1"><td align="left"> <em>t--ype</em> 
<strong>d--eftypefun_name</strong><em> a--rguments...</em></td><td 
align="right">Function</td></tr>
+<tr class="deftypefn deftypefun-alias-deftypefn" 
id="index-d_002d_002deftypefun_005fname-1"><td align="left"><code 
class="code">t--ype</code> <code class="code">d--eftypefun_name</code> <code 
class="code">a--rguments...</code></td><td align="right">Function</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--eftypefun
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deftypevr first-deftypevar-alias-first-deftypevr" 
width="100%">
-<tr class="deftypevr deftypevar-alias-deftypevr" 
id="index-d_002d_002deftypevar_005fname-1"><td align="left"> <em>t--ype</em> 
<strong>d--eftypevar_name</strong></td><td align="right">Variable</td></tr>
+<tr class="deftypevr deftypevar-alias-deftypevr" 
id="index-d_002d_002deftypevar_005fname-1"><td align="left"><code 
class="code">t--ype</code> <code class="code">d--eftypevar_name</code></td><td 
align="right">Variable</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--eftypevar
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-defcv first-defivar-alias-first-defcv" width="100%">
-<tr class="defcv defivar-alias-defcv" 
id="index-d_002d_002defivar_005fname-of-c_002d_002dlass-1"><td align="left"> 
<strong>d--efivar_name</strong></td><td align="right">Instance Variable of 
c--lass</td></tr>
+<tr class="defcv defivar-alias-defcv" 
id="index-d_002d_002defivar_005fname-of-c_002d_002dlass-1"><td 
align="left"><code class="code">d--efivar_name</code></td><td 
align="right">Instance Variable of c--lass</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--efivar
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deftypecv first-deftypeivar-alias-first-deftypecv" 
width="100%">
-<tr class="deftypecv deftypeivar-alias-deftypecv" 
id="index-d_002d_002deftypeivar_005fname-of-c_002d_002dlass-1"><td 
align="left"> <em>t--ype</em> <strong>d--eftypeivar_name</strong></td><td 
align="right">Instance Variable of c--lass</td></tr>
+<tr class="deftypecv deftypeivar-alias-deftypecv" 
id="index-d_002d_002deftypeivar_005fname-of-c_002d_002dlass-1"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypeivar_name</code></td><td align="right">Instance Variable 
of c--lass</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--eftypeivar
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-defop first-defmethod-alias-first-defop" 
width="100%">
-<tr class="defop defmethod-alias-defop" 
id="index-d_002d_002defmethod_005fname-on-c_002d_002dlass-1"><td align="left"> 
<strong>d--efmethod_name</strong><em> a--rguments...</em></td><td 
align="right">Method on c--lass</td></tr>
+<tr class="defop defmethod-alias-defop" 
id="index-d_002d_002defmethod_005fname-on-c_002d_002dlass-1"><td 
align="left"><code class="code">d--efmethod_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td align="right">Method on 
c--lass</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--efmethod
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deftypeop first-deftypemethod-alias-first-deftypeop" 
width="100%">
-<tr class="deftypeop deftypemethod-alias-deftypeop" 
id="index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass-1"><td 
align="left"> <em>t--ype</em> <strong>d--eftypemethod_name</strong><em> 
a--rguments...</em></td><td align="right">Method on c--lass</td></tr>
+<tr class="deftypeop deftypemethod-alias-deftypeop" 
id="index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass-1"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypemethod_name</code> <code 
class="code">a--rguments...</code></td><td align="right">Method on 
c--lass</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--eftypemethod
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 
 </pre><table class="first-deftypefn first-deftypefun-alias-first-deftypefn" 
width="100%">
-<tr class="deftypefn deftypefun-alias-deftypefn" id="index-name2-1"><td 
align="left"> <em>data-type2</em> <strong>name2</strong><em> 
arguments2...</em></td><td align="right">Function</td></tr>
+<tr class="deftypefn deftypefun-alias-deftypefn" id="index-name2-1"><td 
align="left"><code class="code">data-type2</code><br> <code 
class="code">name2</code> <code class="code">arguments2...</code></td><td 
align="right">Function</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">aaa2
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deftypefn" width="100%">
-<tr class="deftypefn" id="index-d_002d_002deftypefn_005fname2-1"><td 
align="left"> <em>t--ype2</em> <strong>d--eftypefn_name2</strong></td><td 
align="right">c--ategory2</td></tr>
+<tr class="deftypefn" id="index-d_002d_002deftypefn_005fname2-1"><td 
align="left"><code class="code">t--ype2</code><br> <code 
class="code">d--eftypefn_name2</code></td><td 
align="right">c--ategory2</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--eftypefn no arg2
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deftypeop" width="100%">
-<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2"><td 
align="left"> <em>t--ype2</em> <strong>d--eftypeop_name2</strong><em> 
a--rguments2...</em></td><td align="right">c--ategory2 on c--lass2</td></tr>
+<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2"><td 
align="left"><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code></td><td align="right">c--ategory2 on 
c--lass2</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--eftypeop2
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deftypeop" width="100%">
-<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3"><td 
align="left"> <em>t--ype2</em> <strong>d--eftypeop_name2</strong></td><td 
align="right">c--ategory2 on c--lass2</td></tr>
+<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3"><td 
align="left"><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code></td><td align="right">c--ategory2 on 
c--lass2</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--eftypeop no arg2
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deftypecv" width="100%">
-<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><td 
align="left"> <em>t--ype2</em> <strong>d--eftypecv_name2</strong></td><td 
align="right">c--ategory2 of c--lass2</td></tr>
+<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><td 
align="left"><code class="code">t--ype2</code> <code 
class="code">d--eftypecv_name2</code></td><td align="right">c--ategory2 of 
c--lass2</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--eftypecv2
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deftypecv" width="100%">
-<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><td 
align="left"> <em>t--ype2</em> <strong>d--eftypecv_name2</strong><em> 
a--rguments2...</em></td><td align="right">c--ategory2 of c--lass2</td></tr>
+<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><td 
align="left"><code class="code">t--ype2</code> <code 
class="code">d--eftypecv_name2</code> <code 
class="code">a--rguments2...</code></td><td align="right">c--ategory2 of 
c--lass2</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--eftypecv with 
arguments2
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deffn" width="100%">
-<tr class="deffn" id="index-arg2-1"><td align="left"> 
<strong>arg2</strong></td><td align="right">fun2</td></tr>
+<tr class="deffn" id="index-arg2-1"><td align="left"><code 
class="code">arg2</code></td><td align="right">fun2</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">fff2
 </pre></td></tr></table>
 <pre class="example-preformatted">
@@ -4216,18 +4216,18 @@ Invalid use of @':
 
 </pre><table class="first-deffn" width="100%">
 <tr class="deffn"><td align="left"></td><td align="right">fun</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-machin-8"><td align="left"> 
<strong>machin</strong><em> bidule chose and</em></td><td 
align="right">truc</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-machin-9"><td align="left"> 
<strong>machin</strong><em> bidule chose and  after</em></td><td 
align="right">truc</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-machin-10"><td align="left"> 
<strong>machin</strong><em> bidule chose and </em></td><td 
align="right">truc</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-machin-11"><td align="left"> 
<strong>machin</strong><em> bidule chose and and after</em></td><td 
align="right">truc</td></tr>
-<tr class="deffnx def-cmd-deffn" id="index-followed-3"><td align="left"> 
<strong>followed</strong><em> by a comment</em></td><td 
align="right">truc</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-machin-8"><td align="left"><code 
class="code">machin</code> <span class="r"><i class="slanted">bidule chose 
and</i></span></td><td align="right">truc</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-machin-9"><td align="left"><code 
class="code">machin</code> <span class="r"><i class="slanted">bidule chose and  
after</i></span></td><td align="right">truc</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-machin-10"><td align="left"><code 
class="code">machin</code> <span class="r"><i class="slanted">bidule chose and 
</i></span></td><td align="right">truc</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-machin-11"><td align="left"><code 
class="code">machin</code> <span class="r"><i class="slanted">bidule chose and 
and after</i></span></td><td align="right">truc</td></tr>
+<tr class="deffnx def-cmd-deffn" id="index-followed-3"><td align="left"><code 
class="code">followed</code> <span class="r"><i class="slanted">by a 
comment</i></span></td><td align="right">truc</td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">Various deff lines
-</pre></td></tr><tr class="deffnx def-cmd-deffn" id="index-after-1"><td 
align="left"> <strong>after</strong><em> a deff item</em></td><td 
align="right">truc</td></tr>
+</pre></td></tr><tr class="deffnx def-cmd-deffn" id="index-after-1"><td 
align="left"><code class="code">after</code> <span class="r"><i 
class="slanted">a deff item</i></span></td><td align="right">truc</td></tr>
 </table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deffn" width="100%">
-<tr class="deffn" id="index-invalid-1"><td align="left"> <strong><var 
class="var">invalid</var></strong><em> a g</em></td><td 
align="right">fsetinv</td></tr>
+<tr class="deffn" id="index-invalid-1"><td align="left"><code 
class="code"><var class="var">invalid</var></code> <span class="r"><i 
class="slanted">a g</i></span></td><td align="right">fsetinv</td></tr>
 <tr class="deffnx def-cmd-deffn"><td align="left"></td><td align="right"><b 
class="b">id &lsquo;<samp class="samp">i</samp>&rsquo; ule</b></td></tr>
 <tr class="deffnx def-cmd-deffn"><td align="left"></td><td 
align="right"></td></tr>
 <tr class="deffnx def-cmd-deffn"><td align="left"></td><td 
align="right">aaa</td></tr>
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 b86e36af90..431c1b3c05 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -1436,10 +1436,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i"><span 
class="category-def">fset&nbsp;:</span><span><code class="code"><var 
class="var">i</var></code> <span class="r"><i class="slanted">a g</i></span><a 
class="copiable-link" href='#index-titlepage-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" 
id="index-titlepage-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde&nbsp;:</span><span><code class="code">truc</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap</code> <span class="r"><i class="slanted"></i></span><a 
class="copiable-link" href='#index-titlepage-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap1</code> <span class="r"><i class="slanted"></i></span><a 
class="copiable-link" href='#index-titlepage-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap2</code> <span class="r"><i class="slanted"></i></span><a 
class="copiable-link" href='#index-titlepage-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde&nbsp;:</span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-titlepage-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap</code><a class="copiable-link" href='#index-titlepage-log-trap'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-titlepage-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-titlepage-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-ule"><span 
class="category-def">cmde&nbsp;:</span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-titlepage-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-i-ule"><span 
class="category-def">cmde2&nbsp;:</span><span><code class="code"><b 
class="b">id &lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span 
class="r"><i class="slanted">truc</i></span><a class="copiable-link" 
href='#index-titlepage-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span 
class="category-def">&nbsp;:</span><code class="code"></code></dt>
@@ -1465,7 +1465,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i-1"><span 
class="category-def">fset&nbsp;:</span><span><code class="code"><var 
class="var">i</var></code> <span class="r"><i class="slanted">a g</i></span><a 
class="copiable-link" href='#index-titlepage-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde&nbsp;:</span><span><code class="code">truc</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde&nbsp;:</span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-titlepage-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -2514,10 +2514,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span 
class="category-def">fset&nbsp;:</span><span><code class="code"><var 
class="var">i</var></code> <span class="r"><i class="slanted">a g</i></span><a 
class="copiable-link" href='#index-copying-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde&nbsp;:</span><span><code class="code">truc</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap</code> <span class="r"><i class="slanted"></i></span><a 
class="copiable-link" href='#index-copying-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap1</code> <span class="r"><i class="slanted"></i></span><a 
class="copiable-link" href='#index-copying-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap2</code> <span class="r"><i class="slanted"></i></span><a 
class="copiable-link" href='#index-copying-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde&nbsp;:</span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap</code><a class="copiable-link" href='#index-copying-log-trap'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-copying-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-copying-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde&nbsp;:</span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-copying-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2&nbsp;:</span><span><code class="code"><b 
class="b">id &lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span 
class="r"><i class="slanted">truc</i></span><a class="copiable-link" 
href='#index-copying-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span 
class="category-def">&nbsp;:</span><code class="code"></code></dt>
@@ -2543,7 +2543,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span 
class="category-def">fset&nbsp;:</span><span><code class="code"><var 
class="var">i</var></code> <span class="r"><i class="slanted">a g</i></span><a 
class="copiable-link" href='#index-copying-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde&nbsp;:</span><span><code class="code">truc</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde&nbsp;:</span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -3648,10 +3648,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span 
class="category-def">fset&nbsp;:</span><span><code class="code"><var 
class="var">i</var></code> <span class="r"><i class="slanted">a g</i></span><a 
class="copiable-link" href='#index-copying-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde&nbsp;:</span><span><code class="code">truc</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap</code> <span class="r"><i class="slanted"></i></span><a 
class="copiable-link" href='#index-copying-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap1</code> <span class="r"><i class="slanted"></i></span><a 
class="copiable-link" href='#index-copying-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap2</code> <span class="r"><i class="slanted"></i></span><a 
class="copiable-link" href='#index-copying-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde&nbsp;:</span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap</code><a class="copiable-link" href='#index-copying-log-trap'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-copying-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-copying-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde&nbsp;:</span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-copying-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2&nbsp;:</span><span><code class="code"><b 
class="b">id &lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span 
class="r"><i class="slanted">truc</i></span><a class="copiable-link" 
href='#index-copying-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span 
class="category-def">&nbsp;:</span><code class="code"></code></dt>
@@ -3677,7 +3677,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span 
class="category-def">fset&nbsp;:</span><span><code class="code"><var 
class="var">i</var></code> <span class="r"><i class="slanted">a g</i></span><a 
class="copiable-link" href='#index-copying-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde&nbsp;:</span><span><code class="code">truc</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde&nbsp;:</span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -4724,10 +4724,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-i"><span 
class="category-def">fset&nbsp;:</span><span><code class="code"><var 
class="var">i</var></code> <span class="r"><i class="slanted">a g</i></span><a 
class="copiable-link" href='#index-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde&nbsp;:</span><span><code class="code">truc</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap</code> <span class="r"><i class="slanted"></i></span><a 
class="copiable-link" href='#index-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap1</code> <span class="r"><i class="slanted"></i></span><a 
class="copiable-link" href='#index-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap2</code> <span class="r"><i class="slanted"></i></span><a 
class="copiable-link" href='#index-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde&nbsp;:</span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap</code><a class="copiable-link" href='#index-log-trap'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule"><span 
class="category-def">cmde&nbsp;:</span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule"><span 
class="category-def">cmde2&nbsp;:</span><span><code class="code"><b 
class="b">id &lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span 
class="r"><i class="slanted">truc</i></span><a class="copiable-link" 
href='#index-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span 
class="category-def">&nbsp;:</span><code class="code"></code></dt>
@@ -4753,7 +4753,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-i-1"><span 
class="category-def">fset&nbsp;:</span><span><code class="code"><var 
class="var">i</var></code> <span class="r"><i class="slanted">a g</i></span><a 
class="copiable-link" href='#index-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde&nbsp;:</span><span><code class="code">truc</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde&nbsp;:</span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -5880,10 +5880,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <pre class="example-preformatted"> 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-2"><span 
class="category-def">fset&nbsp;:</span><span><code class="code"><var 
class="var">i</var></code> <span class="r"><i class="slanted">a g</i></span><a 
class="copiable-link" href='#index-i-2'> &para;</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span 
class="category-def">cmde&nbsp;:</span><span><code class="code">truc</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc-2'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap</code> <span class="r"><i class="slanted"></i></span><a 
class="copiable-link" href='#index-log-trap-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap1</code> <span class="r"><i class="slanted"></i></span><a 
class="copiable-link" href='#index-log-trap1-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap2</code> <span class="r"><i class="slanted"></i></span><a 
class="copiable-link" href='#index-log-trap2-1'> &para;</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span 
class="category-def">cmde&nbsp;:</span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc-2'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap</code><a class="copiable-link" href='#index-log-trap-1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-log-trap1-1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command&nbsp;:</span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-log-trap2-1'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule-1"><span 
class="category-def">cmde&nbsp;:</span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-id-ule-1'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule-1"><span 
class="category-def">cmde2&nbsp;:</span><span><code class="code"><b 
class="b">id &lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span 
class="r"><i class="slanted">truc</i></span><a class="copiable-link" 
href='#index-id-i-ule-1'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span 
class="category-def">&nbsp;:</span><code class="code"></code></dt>
@@ -5912,7 +5912,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-3"><span 
class="category-def">fset&nbsp;:</span><span><code class="code"><var 
class="var">i</var></code> <span class="r"><i class="slanted">a g</i></span><a 
class="copiable-link" href='#index-i-3'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde&nbsp;:</span><span><code class="code">truc</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc-3'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde&nbsp;:</span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc-3'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">text in def item for second def item
 </pre></dd></dl>
 <pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html 
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index f9df174e64..4733287c15 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -1436,10 +1436,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-titlepage-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" 
id="index-titlepage-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-titlepage-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-titlepage-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-titlepage-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-titlepage-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-titlepage-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-titlepage-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -1465,7 +1465,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-titlepage-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-titlepage-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -2514,10 +2514,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-copying-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-copying-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-copying-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-copying-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-copying-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -2543,7 +2543,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -3648,10 +3648,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-copying-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-copying-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-copying-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-copying-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-copying-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -3677,7 +3677,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -4724,10 +4724,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" href='#index-id-i-ule'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -4753,7 +4753,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -5880,10 +5880,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <pre class="example-preformatted"> 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-2"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-2'> &para;</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: 
</span><span><code class="code">truc</code> <span class="r"><i 
class="slanted"></i></span><a class="copiable-link" href='#index-truc-2'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap1-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap2-1'> &para;</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: 
</span><span><code class="code">truc</code><a class="copiable-link" 
href='#index-truc-2'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-log-trap-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-log-trap1-1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-log-trap2-1'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule-1"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-id-ule-1'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule-1"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-id-i-ule-1'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -5912,7 +5912,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-3"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-3'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc-3'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc-3'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">text in def item for second def item
 </pre></dd></dl>
 <pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_html32/formatting.html 
b/tp/tests/layout/res_parser/formatting_html32/formatting.html
index f9e048af79..2b09b6f3d1 100644
--- a/tp/tests/layout/res_parser/formatting_html32/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html32/formatting.html
@@ -1382,10 +1382,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl>
 <dt id="index-titlepage-i">fset: <code><var>i</var></code> <i>a g</i></dt>
 <dd><a name="index-titlepage-index-entry-within-deffn"></a>
-</dd><dt id="index-titlepage-truc">cmde: <code>truc</code> <i></i></dt>
-<dt id="index-titlepage-log-trap">Command: <code>log trap</code> <i></i></dt>
-<dt id="index-titlepage-log-trap1">Command: <code>log trap1</code> <i></i></dt>
-<dt id="index-titlepage-log-trap2">Command: <code>log trap2</code> <i></i></dt>
+</dd><dt id="index-titlepage-truc">cmde: <code>truc</code></dt>
+<dt id="index-titlepage-log-trap">Command: <code>log trap</code></dt>
+<dt id="index-titlepage-log-trap1">Command: <code>log trap1</code></dt>
+<dt id="index-titlepage-log-trap2">Command: <code>log trap2</code></dt>
 <dt id="index-titlepage-id-ule">cmde: <code><b>id ule</b></code> 
<i>truc</i></dt>
 <dt id="index-titlepage-id-i-ule">cmde2: <code><b>id `<samp>i</samp>' 
ule</b></code> <i>truc</i></dt>
 <dt>: <code></code></dt>
@@ -1411,7 +1411,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl>
 <dt id="index-titlepage-i-1">fset: <code><var>i</var></code> <i>a g</i></dt>
-<dt id="index-titlepage-truc-1">cmde: <code>truc</code> <i></i></dt>
+<dt id="index-titlepage-truc-1">cmde: <code>truc</code></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -2434,10 +2434,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl>
 <dt id="index-copying-i">fset: <code><var>i</var></code> <i>a g</i></dt>
 <dd><a name="index-copying-index-entry-within-deffn"></a>
-</dd><dt id="index-copying-truc">cmde: <code>truc</code> <i></i></dt>
-<dt id="index-copying-log-trap">Command: <code>log trap</code> <i></i></dt>
-<dt id="index-copying-log-trap1">Command: <code>log trap1</code> <i></i></dt>
-<dt id="index-copying-log-trap2">Command: <code>log trap2</code> <i></i></dt>
+</dd><dt id="index-copying-truc">cmde: <code>truc</code></dt>
+<dt id="index-copying-log-trap">Command: <code>log trap</code></dt>
+<dt id="index-copying-log-trap1">Command: <code>log trap1</code></dt>
+<dt id="index-copying-log-trap2">Command: <code>log trap2</code></dt>
 <dt id="index-copying-id-ule">cmde: <code><b>id ule</b></code> <i>truc</i></dt>
 <dt id="index-copying-id-i-ule">cmde2: <code><b>id `<samp>i</samp>' 
ule</b></code> <i>truc</i></dt>
 <dt>: <code></code></dt>
@@ -2463,7 +2463,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl>
 <dt id="index-copying-i-1">fset: <code><var>i</var></code> <i>a g</i></dt>
-<dt id="index-copying-truc-1">cmde: <code>truc</code> <i></i></dt>
+<dt id="index-copying-truc-1">cmde: <code>truc</code></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -3542,10 +3542,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl>
 <dt id="index-copying-i">fset: <code><var>i</var></code> <i>a g</i></dt>
 <dd><a name="index-copying-index-entry-within-deffn"></a>
-</dd><dt id="index-copying-truc">cmde: <code>truc</code> <i></i></dt>
-<dt id="index-copying-log-trap">Command: <code>log trap</code> <i></i></dt>
-<dt id="index-copying-log-trap1">Command: <code>log trap1</code> <i></i></dt>
-<dt id="index-copying-log-trap2">Command: <code>log trap2</code> <i></i></dt>
+</dd><dt id="index-copying-truc">cmde: <code>truc</code></dt>
+<dt id="index-copying-log-trap">Command: <code>log trap</code></dt>
+<dt id="index-copying-log-trap1">Command: <code>log trap1</code></dt>
+<dt id="index-copying-log-trap2">Command: <code>log trap2</code></dt>
 <dt id="index-copying-id-ule">cmde: <code><b>id ule</b></code> <i>truc</i></dt>
 <dt id="index-copying-id-i-ule">cmde2: <code><b>id `<samp>i</samp>' 
ule</b></code> <i>truc</i></dt>
 <dt>: <code></code></dt>
@@ -3571,7 +3571,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl>
 <dt id="index-copying-i-1">fset: <code><var>i</var></code> <i>a g</i></dt>
-<dt id="index-copying-truc-1">cmde: <code>truc</code> <i></i></dt>
+<dt id="index-copying-truc-1">cmde: <code>truc</code></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -4592,10 +4592,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl>
 <dt id="index-i">fset: <code><var>i</var></code> <i>a g</i></dt>
 <dd><a name="index-index-entry-within-deffn"></a>
-</dd><dt id="index-truc">cmde: <code>truc</code> <i></i></dt>
-<dt id="index-log-trap">Command: <code>log trap</code> <i></i></dt>
-<dt id="index-log-trap1">Command: <code>log trap1</code> <i></i></dt>
-<dt id="index-log-trap2">Command: <code>log trap2</code> <i></i></dt>
+</dd><dt id="index-truc">cmde: <code>truc</code></dt>
+<dt id="index-log-trap">Command: <code>log trap</code></dt>
+<dt id="index-log-trap1">Command: <code>log trap1</code></dt>
+<dt id="index-log-trap2">Command: <code>log trap2</code></dt>
 <dt id="index-id-ule">cmde: <code><b>id ule</b></code> <i>truc</i></dt>
 <dt id="index-id-i-ule">cmde2: <code><b>id `<samp>i</samp>' ule</b></code> 
<i>truc</i></dt>
 <dt>: <code></code></dt>
@@ -4621,7 +4621,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl>
 <dt id="index-i-1">fset: <code><var>i</var></code> <i>a g</i></dt>
-<dt id="index-truc-1">cmde: <code>truc</code> <i></i></dt>
+<dt id="index-truc-1">cmde: <code>truc</code></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -5721,10 +5721,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <pre> 
 </pre><dl>
 <dt id="index-i-2">fset: <code><var>i</var></code> <i>a g</i></dt>
-<dd><pre><a name="index-index-entry-within-deffn-1"></a></pre></dd><dt 
id="index-truc-2">cmde: <code>truc</code> <i></i></dt>
-<dt id="index-log-trap-1">Command: <code>log trap</code> <i></i></dt>
-<dt id="index-log-trap1-1">Command: <code>log trap1</code> <i></i></dt>
-<dt id="index-log-trap2-1">Command: <code>log trap2</code> <i></i></dt>
+<dd><pre><a name="index-index-entry-within-deffn-1"></a></pre></dd><dt 
id="index-truc-2">cmde: <code>truc</code></dt>
+<dt id="index-log-trap-1">Command: <code>log trap</code></dt>
+<dt id="index-log-trap1-1">Command: <code>log trap1</code></dt>
+<dt id="index-log-trap2-1">Command: <code>log trap2</code></dt>
 <dt id="index-id-ule-1">cmde: <code><b>id ule</b></code> <i>truc</i></dt>
 <dt id="index-id-i-ule-1">cmde2: <code><b>id `<samp>i</samp>' ule</b></code> 
<i>truc</i></dt>
 <dt>: <code></code></dt>
@@ -5753,7 +5753,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl>
 <dt id="index-i-3">fset: <code><var>i</var></code> <i>a g</i></dt>
-<dt id="index-truc-3">cmde: <code>truc</code> <i></i></dt>
+<dt id="index-truc-3">cmde: <code>truc</code></dt>
 <dd><pre>text in def item for second def item
 </pre></dd></dl>
 <pre>
diff --git 
a/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html 
b/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
index f01549e445..c7e635394a 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
@@ -1495,10 +1495,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-copying-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-copying-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-copying-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-copying-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-copying-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -1524,7 +1524,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -2571,10 +2571,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" href='#index-id-i-ule'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -2600,7 +2600,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -3727,10 +3727,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <pre class="example-preformatted"> 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-2"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-2'> &para;</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: 
</span><span><code class="code">truc</code> <span class="r"><i 
class="slanted"></i></span><a class="copiable-link" href='#index-truc-2'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap1-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap2-1'> &para;</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: 
</span><span><code class="code">truc</code><a class="copiable-link" 
href='#index-truc-2'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-log-trap-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-log-trap1-1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-log-trap2-1'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule-1"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-id-ule-1'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule-1"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-id-i-ule-1'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -3759,7 +3759,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-3"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-3'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc-3'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc-3'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">text in def item for second def item
 </pre></dd></dl>
 <pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
index d3577861b0..ba4e5c6257 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -1457,10 +1457,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-copying-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-copying-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-copying-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-copying-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-copying-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -1486,7 +1486,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -2533,10 +2533,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" href='#index-id-i-ule'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -2562,7 +2562,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -3689,10 +3689,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <pre class="example-preformatted"> 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-2"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-2'> &para;</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: 
</span><span><code class="code">truc</code> <span class="r"><i 
class="slanted"></i></span><a class="copiable-link" href='#index-truc-2'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap1-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap2-1'> &para;</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: 
</span><span><code class="code">truc</code><a class="copiable-link" 
href='#index-truc-2'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-log-trap-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-log-trap1-1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-log-trap2-1'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule-1"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-id-ule-1'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule-1"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-id-i-ule-1'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -3721,7 +3721,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-3"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-3'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc-3'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc-3'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">text in def item for second def item
 </pre></dd></dl>
 <pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/index.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
index eff98cb036..4df25e9a48 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
@@ -1431,10 +1431,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-titlepage-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" 
id="index-titlepage-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-titlepage-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-titlepage-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-titlepage-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-titlepage-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-titlepage-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-titlepage-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -1460,7 +1460,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-titlepage-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-titlepage-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -2509,10 +2509,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-copying-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-copying-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-copying-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-copying-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-copying-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -2538,7 +2538,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
diff --git a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html 
b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
index d1e578be29..a43f458ad3 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
@@ -1408,10 +1408,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</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-i'> 
&para;</a></span></dt>
 <dd><a class="index-entry-id" 
id="index-titlepage-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted"></i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-titlepage-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted"></i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-titlepage-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted"></i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-titlepage-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted"></i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-titlepage-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-titlepage-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-titlepage-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" style="visibility: hidden; 
text-decoration: none; line-height: 0em" href='#index-titlepage-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" style="visibility: hidden; 
text-decoration: none; line-height: 0em" href='#index-titlepage-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r" style="font-family: initial; font-weight: 
normal; font-style: normal"><i class="slanted">truc</i></span><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-titlepage-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r" 
style="font-family: initial; font-weight: normal; font-style: normal"><i 
class="slanted">truc</i></span><a class="copiable-link" style="visibility: 
hidden; text-decoration: none; line-height: 0em" 
href='#index-titlepage-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -1437,7 +1437,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</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-i-1'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted"></i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-titlepage-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-titlepage-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -2486,10 +2486,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</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-i'> 
&para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted"></i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-copying-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted"></i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-copying-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted"></i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-copying-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted"></i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-copying-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-copying-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-copying-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" style="visibility: hidden; 
text-decoration: none; line-height: 0em" href='#index-copying-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" style="visibility: hidden; 
text-decoration: none; line-height: 0em" href='#index-copying-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r" style="font-family: initial; font-weight: 
normal; font-style: normal"><i class="slanted">truc</i></span><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-copying-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r" 
style="font-family: initial; font-weight: normal; font-style: normal"><i 
class="slanted">truc</i></span><a class="copiable-link" style="visibility: 
hidden; text-decoration: none; line-height: 0em" 
href='#index-copying-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -2515,7 +2515,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</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-i-1'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted"></i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-copying-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-copying-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -3620,10 +3620,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</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-i'> 
&para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted"></i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-copying-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted"></i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-copying-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted"></i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-copying-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted"></i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-copying-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-copying-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-copying-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" style="visibility: hidden; 
text-decoration: none; line-height: 0em" href='#index-copying-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" style="visibility: hidden; 
text-decoration: none; line-height: 0em" href='#index-copying-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r" style="font-family: initial; font-weight: 
normal; font-style: normal"><i class="slanted">truc</i></span><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-copying-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r" 
style="font-family: initial; font-weight: normal; font-style: normal"><i 
class="slanted">truc</i></span><a class="copiable-link" style="visibility: 
hidden; text-decoration: none; line-height: 0em" 
href='#index-copying-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -3649,7 +3649,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</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-i-1'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted"></i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-copying-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-copying-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -4696,10 +4696,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</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-i'> 
&para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted"></i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted"></i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted"></i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted"></i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" style="visibility: hidden; 
text-decoration: none; line-height: 0em" href='#index-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" style="visibility: hidden; 
text-decoration: none; line-height: 0em" href='#index-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r" style="font-family: initial; font-weight: 
normal; font-style: normal"><i class="slanted">truc</i></span><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r" 
style="font-family: initial; font-weight: normal; font-style: normal"><i 
class="slanted">truc</i></span><a class="copiable-link" style="visibility: 
hidden; text-decoration: none; line-height: 0em" href='#index-id-i-ule'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -4725,7 +4725,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</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-i-1'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted"></i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -5852,10 +5852,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <pre class="example-preformatted"> 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-2"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</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-i-2'> 
&para;</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: 
</span><span><code class="code">truc</code> <span class="r" style="font-family: 
initial; font-weight: normal; font-style: normal"><i 
class="slanted"></i></span><a class="copiable-link" style="visibility: hidden; 
text-decoration: none; line-height: 0em" href='#index-truc-2'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted"></i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-log-trap-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted"></i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-log-trap1-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted"></i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-log-trap2-1'> &para;</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: 
</span><span><code class="code">truc</code><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-truc-2'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-log-trap-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" style="visibility: hidden; 
text-decoration: none; line-height: 0em" href='#index-log-trap1-1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" style="visibility: hidden; 
text-decoration: none; line-height: 0em" href='#index-log-trap2-1'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule-1"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r" style="font-family: initial; font-weight: 
normal; font-style: normal"><i class="slanted">truc</i></span><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-id-ule-1'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule-1"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r" 
style="font-family: initial; font-weight: normal; font-style: normal"><i 
class="slanted">truc</i></span><a class="copiable-link" style="visibility: 
hidden; text-decoration: none; line-height: 0em" href='#index-id-i-ule-1'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -5884,7 +5884,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-3"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</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-i-3'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r" style="font-family: initial; font-weight: normal; font-style: 
normal"><i class="slanted"></i></span><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-truc-3'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-truc-3'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">text in def item for second def item
 </pre></dd></dl>
 <pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html 
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index 1f557873de..2f3b547496 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -1444,10 +1444,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-titlepage-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" 
id="index-titlepage-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-titlepage-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-titlepage-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-titlepage-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-titlepage-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-titlepage-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-titlepage-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -1473,7 +1473,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-titlepage-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-titlepage-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -2520,10 +2520,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-copying-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-copying-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-copying-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-copying-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-copying-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -2549,7 +2549,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -3652,10 +3652,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-copying-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-copying-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-copying-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-copying-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-copying-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -3681,7 +3681,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -4726,10 +4726,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" href='#index-id-i-ule'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -4755,7 +4755,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -5880,10 +5880,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <pre class="example-preformatted"> 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-2"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-2'> &para;</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: 
</span><span><code class="code">truc</code> <span class="r"><i 
class="slanted"></i></span><a class="copiable-link" href='#index-truc-2'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap1-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap2-1'> &para;</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: 
</span><span><code class="code">truc</code><a class="copiable-link" 
href='#index-truc-2'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-log-trap-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-log-trap1-1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-log-trap2-1'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule-1"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-id-ule-1'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule-1"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-id-i-ule-1'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -5912,7 +5912,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-3"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-3'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc-3'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc-3'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">text in def item for second def item
 </pre></dd></dl>
 <pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter.html 
b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
index d3577861b0..ba4e5c6257 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -1457,10 +1457,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-copying-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-copying-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-copying-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-copying-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-copying-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -1486,7 +1486,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -2533,10 +2533,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" href='#index-id-i-ule'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -2562,7 +2562,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -3689,10 +3689,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <pre class="example-preformatted"> 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-2"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-2'> &para;</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: 
</span><span><code class="code">truc</code> <span class="r"><i 
class="slanted"></i></span><a class="copiable-link" href='#index-truc-2'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap1-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap2-1'> &para;</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: 
</span><span><code class="code">truc</code><a class="copiable-link" 
href='#index-truc-2'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-log-trap-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-log-trap1-1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-log-trap2-1'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule-1"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-id-ule-1'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule-1"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-id-i-ule-1'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -3721,7 +3721,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-3"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-3'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc-3'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc-3'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">text in def item for second def item
 </pre></dd></dl>
 <pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_nodes/index.html 
b/tp/tests/layout/res_parser/formatting_nodes/index.html
index eff98cb036..4df25e9a48 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/index.html
@@ -1431,10 +1431,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-titlepage-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" 
id="index-titlepage-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-titlepage-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-titlepage-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-titlepage-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-titlepage-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-titlepage-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-titlepage-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -1460,7 +1460,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-titlepage-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-titlepage-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -2509,10 +2509,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-copying-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-copying-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-copying-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-copying-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-copying-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -2538,7 +2538,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
diff --git 
a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html 
b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
index 05ae0d2306..7463d68d5f 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
@@ -1436,10 +1436,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-titlepage-i'> &#182;</a></span></dt>
 <dd><a class="index-entry-id" 
id="index-titlepage-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-truc'> &#182;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap'> &#182;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap1'> &#182;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap2'> &#182;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-titlepage-truc'> &#182;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-titlepage-log-trap'> &#182;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-titlepage-log-trap1'> 
&#182;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-titlepage-log-trap2'> 
&#182;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-titlepage-id-ule'> &#182;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-titlepage-id-i-ule'> &#182;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -1465,7 +1465,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-titlepage-i-1'> &#182;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-truc-1'> &#182;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-titlepage-truc-1'> &#182;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -2514,10 +2514,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i'> &#182;</a></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc'> &#182;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap'> &#182;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap1'> &#182;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap2'> &#182;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc'> &#182;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-copying-log-trap'> &#182;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-copying-log-trap1'> 
&#182;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-copying-log-trap2'> 
&#182;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-copying-id-ule'> &#182;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-copying-id-i-ule'> &#182;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -2543,7 +2543,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i-1'> &#182;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc-1'> &#182;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc-1'> &#182;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -3648,10 +3648,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i'> &#182;</a></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc'> &#182;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap'> &#182;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap1'> &#182;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap2'> &#182;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc'> &#182;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-copying-log-trap'> &#182;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-copying-log-trap1'> 
&#182;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-copying-log-trap2'> 
&#182;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-copying-id-ule'> &#182;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-copying-id-i-ule'> &#182;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -3677,7 +3677,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i-1'> &#182;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc-1'> &#182;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc-1'> &#182;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -4724,10 +4724,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i'> &#182;</a></span></dt>
 <dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc'> &#182;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap'> &#182;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap1'> &#182;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap2'> &#182;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc'> &#182;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-log-trap'> &#182;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-log-trap1'> 
&#182;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-log-trap2'> 
&#182;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-id-ule'> &#182;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" href='#index-id-i-ule'> 
&#182;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -4753,7 +4753,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-1'> &#182;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc-1'> &#182;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc-1'> &#182;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -5880,10 +5880,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <pre class="example-preformatted"> 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-2"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-2'> &#182;</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: 
</span><span><code class="code">truc</code> <span class="r"><i 
class="slanted"></i></span><a class="copiable-link" href='#index-truc-2'> 
&#182;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap-1'> &#182;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap1-1'> &#182;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap2-1'> &#182;</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: 
</span><span><code class="code">truc</code><a class="copiable-link" 
href='#index-truc-2'> &#182;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-log-trap-1'> &#182;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-log-trap1-1'> 
&#182;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-log-trap2-1'> 
&#182;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule-1"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-id-ule-1'> &#182;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule-1"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&#8216;<samp class="samp">i</samp>&#8217; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-id-i-ule-1'> &#182;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -5912,7 +5912,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-3"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-3'> &#182;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc-3'> &#182;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc-3'> &#182;</a></span></dt>
 <dd><pre class="example-preformatted">text in def item for second def item
 </pre></dd></dl>
 <pre class="example-preformatted">
diff --git 
a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html 
b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
index fb1da93c8c..c288efa3b2 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -1436,10 +1436,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-titlepage-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" 
id="index-titlepage-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-titlepage-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-titlepage-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-titlepage-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-titlepage-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-titlepage-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-titlepage-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -1465,7 +1465,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-titlepage-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-titlepage-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -2513,10 +2513,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-copying-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-copying-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-copying-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-copying-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-copying-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -2542,7 +2542,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -3623,10 +3623,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" href='#index-id-i-ule'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -3652,7 +3652,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -4778,10 +4778,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <pre class="example-preformatted"> 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-2"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-2'> &para;</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: 
</span><span><code class="code">truc</code> <span class="r"><i 
class="slanted"></i></span><a class="copiable-link" href='#index-truc-2'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap1-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap2-1'> &para;</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: 
</span><span><code class="code">truc</code><a class="copiable-link" 
href='#index-truc-2'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-log-trap-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-log-trap1-1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-log-trap2-1'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule-1"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-id-ule-1'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule-1"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-id-i-ule-1'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -4810,7 +4810,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-3"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-3'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc-3'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc-3'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">text in def item for second def item
 </pre></dd></dl>
 <pre class="example-preformatted">
@@ -5929,10 +5929,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-copying-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-copying-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-copying-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-copying-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-copying-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -5958,7 +5958,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
diff --git a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html 
b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
index c2b7b28246..6918bdb930 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -1436,10 +1436,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-titlepage-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" 
id="index-titlepage-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-titlepage-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-titlepage-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-titlepage-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-titlepage-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-titlepage-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
@<samp class="samp">i</samp>'&lsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-titlepage-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -1465,7 +1465,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-titlepage-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-titlepage-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -2514,10 +2514,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-copying-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-copying-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-copying-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-copying-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
@<samp class="samp">i</samp>'&lsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-copying-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -2543,7 +2543,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -3648,10 +3648,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-copying-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-copying-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-copying-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-copying-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
@<samp class="samp">i</samp>'&lsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-copying-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -3677,7 +3677,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -4724,10 +4724,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
@<samp class="samp">i</samp>'&lsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" href='#index-id-i-ule'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -4753,7 +4753,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -5880,10 +5880,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <pre class="example-preformatted"> 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-2"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-2'> &para;</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: 
</span><span><code class="code">truc</code> <span class="r"><i 
class="slanted"></i></span><a class="copiable-link" href='#index-truc-2'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap1-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap2-1'> &para;</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: 
</span><span><code class="code">truc</code><a class="copiable-link" 
href='#index-truc-2'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-log-trap-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-log-trap1-1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-log-trap2-1'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule-1"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-id-ule-1'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule-1"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
@<samp class="samp">i</samp>'&lsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-id-i-ule-1'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -5912,7 +5912,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-3"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-3'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc-3'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc-3'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">text in def item for second def item
 </pre></dd></dl>
 <pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html 
b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
index e90c582a0a..975d119856 100644
--- a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
@@ -1436,10 +1436,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-titlepage-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" 
id="index-titlepage-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-titlepage-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-titlepage-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-titlepage-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-titlepage-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-titlepage-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-titlepage-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-titlepage-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-titlepage-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -1465,7 +1465,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-titlepage-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-titlepage-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-titlepage-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-titlepage-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-titlepage-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -2514,10 +2514,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-copying-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-copying-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-copying-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-copying-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-copying-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -2543,7 +2543,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -3648,10 +3648,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-copying-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-copying-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-copying-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-copying-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-copying-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -3677,7 +3677,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -4724,10 +4724,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" href='#index-id-i-ule'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -4753,7 +4753,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -5880,10 +5880,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <pre class="example-preformatted"> 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-2"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-2'> &para;</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: 
</span><span><code class="code">truc</code> <span class="r"><i 
class="slanted"></i></span><a class="copiable-link" href='#index-truc-2'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap1-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap2-1'> &para;</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: 
</span><span><code class="code">truc</code><a class="copiable-link" 
href='#index-truc-2'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-log-trap-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-log-trap1-1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-log-trap2-1'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule-1"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-id-ule-1'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule-1"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-id-i-ule-1'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -5912,7 +5912,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-3"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-3'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc-3'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc-3'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">text in def item for second def item
 </pre></dd></dl>
 <pre class="example-preformatted">
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html 
b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
index 180b37b5be..ea728c63c3 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
@@ -1566,10 +1566,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-copying-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-copying-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-copying-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-copying-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-copying-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-copying-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-copying-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-copying-id-i-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -1595,7 +1595,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-copying-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-copying-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-copying-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-copying-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-copying-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -2779,10 +2779,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <dl class="first-deffn">
 <dt class="deffn" id="index-i"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i'> &para;</a></span></dt>
 <dd><a class="index-entry-id" id="index-index-entry-within-deffn"></a>
-</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap2'> &para;</a></span></dt>
+</dd><dt class="deffnx def-cmd-deffn" id="index-truc"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-log-trap'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-log-trap1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-log-trap2'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-id-ule'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" href='#index-id-i-ule'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -2808,7 +2808,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 <dl class="first-deffn">
 <dt class="deffn" id="index-i-1"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-1"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc-1'> &para;</a></span></dt>
 <dd><p>text in def item for second def item
 </p></dd></dl>
 
@@ -4072,10 +4072,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <pre class="example-preformatted"> 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-2"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-2'> &para;</a></span></dt>
-<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: 
</span><span><code class="code">truc</code> <span class="r"><i 
class="slanted"></i></span><a class="copiable-link" href='#index-truc-2'> 
&para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><span><code class="code">log trap</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><span><code class="code">log trap1</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap1-1'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><span><code class="code">log trap2</code> 
<span class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-log-trap2-1'> &para;</a></span></dt>
+<dd><pre class="example-preformatted"><a class="index-entry-id" 
id="index-index-entry-within-deffn-1"></a></pre></dd><dt class="deffnx 
def-cmd-deffn" id="index-truc-2"><span class="category-def">cmde: 
</span><span><code class="code">truc</code><a class="copiable-link" 
href='#index-truc-2'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap-1"><span 
class="category-def">Command: </span><span><code class="code">log trap</code><a 
class="copiable-link" href='#index-log-trap-1'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap1-1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap1</code><a class="copiable-link" href='#index-log-trap1-1'> 
&para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-log-trap2-1"><span 
class="category-def">Command: </span><span><code class="code">log 
trap2</code><a class="copiable-link" href='#index-log-trap2-1'> 
&para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-ule-1"><span 
class="category-def">cmde: </span><span><code class="code"><b class="b">id 
ule</b></code> <span class="r"><i class="slanted">truc</i></span><a 
class="copiable-link" href='#index-id-ule-1'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn" id="index-id-i-ule-1"><span 
class="category-def">cmde2: </span><span><code class="code"><b class="b">id 
&lsquo;<samp class="samp">i</samp>&rsquo; ule</b></code> <span class="r"><i 
class="slanted">truc</i></span><a class="copiable-link" 
href='#index-id-i-ule-1'> &para;</a></span></dt>
 <dt class="deffnx def-cmd-deffn"><span class="category-def">: </span><code 
class="code"></code></dt>
@@ -4104,7 +4104,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 </pre><dl class="first-deffn">
 <dt class="deffn" id="index-i-3"><span class="category-def">fset: 
</span><span><code class="code"><var class="var">i</var></code> <span 
class="r"><i class="slanted">a g</i></span><a class="copiable-link" 
href='#index-i-3'> &para;</a></span></dt>
-<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><span><code class="code">truc</code> <span 
class="r"><i class="slanted"></i></span><a class="copiable-link" 
href='#index-truc-3'> &para;</a></span></dt>
+<dt class="deffnx def-cmd-deffn" id="index-truc-3"><span 
class="category-def">cmde: </span><span><code class="code">truc</code><a 
class="copiable-link" href='#index-truc-3'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">text in def item for second def item
 </pre></dd></dl>
 <pre class="example-preformatted">