branch master updated: * tp/Texinfo/Common.pm (%regular_font_style_commands): only @r as regular_font_style_commands stopping code context.

[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 88606888bf * tp/Texinfo/Common.pm (%regular_font_style_commands): only 
@r as regular_font_style_commands stopping code context.
88606888bf is described below

commit 88606888bfc21cc86783840e595b534d2808895c
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Aug 22 21:50:38 2022 +0200

    * tp/Texinfo/Common.pm (%regular_font_style_commands): only @r
    as regular_font_style_commands stopping code context.
---
 ChangeLog                                          |  5 ++
 tp/Texinfo/Common.pm                               |  9 ++--
 .../combined_fonts/res_docbook/combined_fonts.xml  |  4 +-
 .../combined_fonts/res_html/chapter.html           |  4 +-
 .../combined_fonts/res_info/combined_fonts.info    |  4 +-
 .../combined_fonts/res_xml/combined_fonts.xml      |  4 +-
 .../converters_tests/definition_commands.pl        | 62 +++++++++++-----------
 .../definition_commands/res_html/chapter.html      | 14 ++---
 .../documentation_examples/res_html/index.html     |  4 +-
 .../layout/res_parser/formatting/formatting.html   |  8 +--
 .../layout/res_parser/formatting_chm/chapter.html  |  8 +--
 .../res_parser/formatting_docbook/formatting.xml   |  8 +--
 .../formatting_enable_encoding/formatting.html     |  8 +--
 .../EPUB/xhtml/chapter.xhtml                       |  8 +--
 .../EPUB/xhtml/chapter.xhtml                       |  8 +--
 .../res_parser/formatting_exotic/chapter.html      |  8 +--
 .../res_parser/formatting_fr_icons/formatting.html |  8 +--
 .../res_parser/formatting_html/formatting.html     |  8 +--
 .../res_parser/formatting_html32/formatting.html   |  8 +--
 .../formatting_html_no_texi2html/formatting.html   |  8 +--
 .../res_parser/formatting_html_nodes/chapter.html  |  8 +--
 .../res_parser/formatting_info/formatting.info     | 36 ++++++-------
 .../formatting_inline_css/formatting.html          |  8 +--
 .../res_parser/formatting_mathjax/formatting.html  |  8 +--
 .../res_parser/formatting_nodes/chapter.html       |  8 +--
 .../formatting_numerical_entities/formatting.html  |  8 +--
 .../res_parser/formatting_plaintext/formatting.txt |  8 +--
 .../formatting_regions/formatting_regions.html     |  8 +--
 .../formatting_weird_quotes/formatting.html        |  8 +--
 .../res_parser/formatting_xhtml/formatting.html    |  8 +--
 .../res_parser/formatting_xml/formatting.xml       |  8 +--
 .../res_parser/formatting_singular/chapter.html    |  8 +--
 32 files changed, 163 insertions(+), 159 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 99be1058fb..368a2bd6b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-08-22  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Common.pm (%regular_font_style_commands): only @r
+       as regular_font_style_commands stopping code context.
+
 2022-08-22  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Common.pm, tp/Texinfo/XS/parsetexi/command_data.txt:
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 5002463d34..7f933aa219 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -707,16 +707,15 @@ foreach my $accent_command ('"','~','^','`',"'",',','=',
 }
 
 our %style_commands;
-foreach my $style_command ('asis','cite','clicksequence',
-  'dfn', 'emph',
-  'sc', 'var',
-  'headitemfont', 'strong', 'sub', 'sup') {
+foreach my $style_command ('asis', 'cite', 'clicksequence',
+  'dfn', 'emph', 'sc', 'var', 'headitemfont', 'strong', 'sub', 'sup',
+  'i', 'b', 'sansserif', 'slanted') {
   $brace_commands{$style_command} = 'style';
   $style_commands{$style_command} = 1;
 }
 
 our %regular_font_style_commands;
-foreach my $command ('r', 'i', 'b', 'sansserif', 'slanted') {
+foreach my $command ('r') {
   $regular_font_style_commands{$command} = 1;
   $brace_commands{$command} = 'style';
   $style_commands{$command} = 1;
diff --git 
a/tp/t/results/converters_tests/combined_fonts/res_docbook/combined_fonts.xml 
b/tp/t/results/converters_tests/combined_fonts/res_docbook/combined_fonts.xml
index 1feec008ca..555068c4a8 100644
--- 
a/tp/t/results/converters_tests/combined_fonts/res_docbook/combined_fonts.xml
+++ 
b/tp/t/results/converters_tests/combined_fonts/res_docbook/combined_fonts.xml
@@ -23,11 +23,11 @@
 </para>
 <para><literal>c--ode</literal> s&#8211;lanted <emphasis 
role="bold">b&#8211;</emphasis> <literal>t--</literal>
 </para>
-<para><literal>s&#8211;lanted in code</literal>
+<para><literal>s--lanted in code</literal>
 <literal>c--ode in slanted</literal>
 <emphasis role="bold">s&#8211;lanted in b</emphasis>
 <emphasis role="bold">b&#8211; in slanted</emphasis>
-<literal>s&#8211;lanted in t</literal>
+<literal>s--lanted in t</literal>
 <literal>t-- in slanted</literal>
 <literal><replaceable>v--ar in t</replaceable></literal>
 <replaceable><literal>t-- in var</literal></replaceable>
diff --git a/tp/t/results/converters_tests/combined_fonts/res_html/chapter.html 
b/tp/t/results/converters_tests/combined_fonts/res_html/chapter.html
index ef66983415..5ff2e1a874 100644
--- a/tp/t/results/converters_tests/combined_fonts/res_html/chapter.html
+++ b/tp/t/results/converters_tests/combined_fonts/res_html/chapter.html
@@ -49,11 +49,11 @@ Previous: <a href="index.html" accesskey="p" rel="prev">top 
section</a>, Up: <a
 </p>
 <p><code class="code">c--ode</code> <i class="slanted">s&ndash;lanted</i> <b 
class="b">b&ndash;</b> <code class="t">t--</code>
 </p>
-<p><code class="code"><i class="slanted">s&ndash;lanted in code</i></code>
+<p><code class="code"><i class="slanted">s--lanted in code</i></code>
 <i class="slanted"><code class="code">c--ode in slanted</code></i>
 <b class="b"><i class="slanted">s&ndash;lanted in b</i></b>
 <i class="slanted"><b class="b">b&ndash; in slanted</b></i>
-<code class="t"><i class="slanted">s&ndash;lanted in t</i></code>
+<code class="t"><i class="slanted">s--lanted in t</i></code>
 <i class="slanted"><code class="t">t-- in slanted</code></i>
 <code class="t"><var class="var">v--ar in t</var></code>
 <var class="var"><code class="t">t-- in var</code></var>
diff --git 
a/tp/t/results/converters_tests/combined_fonts/res_info/combined_fonts.info 
b/tp/t/results/converters_tests/combined_fonts/res_info/combined_fonts.info
index d8bfb91387..1f9382fa9e 100644
--- a/tp/t/results/converters_tests/combined_fonts/res_info/combined_fonts.info
+++ b/tp/t/results/converters_tests/combined_fonts/res_info/combined_fonts.info
@@ -27,8 +27,8 @@ File: combined_fonts.info,  Node: chapter,  Prev: Top,  Up: 
Top
 
    ‘c--ode’ s–lanted b– t--
 
-   ‘s–lanted in code’ ‘c--ode in slanted’ s–lanted in b b– in slanted
-s–lanted in t t-- in slanted V--AR IN T T-- IN VAR
+   ‘s--lanted in code’ ‘c--ode in slanted’ s–lanted in b b– in slanted
+s--lanted in t t-- in slanted V--AR IN T T-- IN VAR
 
      V--AR IN EXAMPLE
      ‘c--ite in example’
diff --git 
a/tp/t/results/converters_tests/combined_fonts/res_xml/combined_fonts.xml 
b/tp/t/results/converters_tests/combined_fonts/res_xml/combined_fonts.xml
index fe4520cfa4..ed30be1524 100644
--- a/tp/t/results/converters_tests/combined_fonts/res_xml/combined_fonts.xml
+++ b/tp/t/results/converters_tests/combined_fonts/res_xml/combined_fonts.xml
@@ -27,11 +27,11 @@
 </para>
 <para><code>c--ode</code> <slanted>s&textndash;lanted</slanted> 
<b>b&textndash;</b> <t>t--</t>
 </para>
-<para><code><slanted>s&textndash;lanted in code</slanted></code>
+<para><code><slanted>s--lanted in code</slanted></code>
 <slanted><code>c--ode in slanted</code></slanted>
 <b><slanted>s&textndash;lanted in b</slanted></b>
 <slanted><b>b&textndash; in slanted</b></slanted>
-<t><slanted>s&textndash;lanted in t</slanted></t>
+<t><slanted>s--lanted in t</slanted></t>
 <slanted><t>t-- in slanted</t></slanted>
 <t><var>v--ar in t</var></t>
 <var><t>t-- in var</t></var>
diff --git a/tp/t/results/converters_tests/definition_commands.pl 
b/tp/t/results/converters_tests/definition_commands.pl
index a62814756e..55a4f8969a 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -25084,18 +25084,18 @@ 
$result_converted{'plaintext'}->{'definition_commands'} = 'top section
  -- Special Form: foobar va---riable default
  -- Special Form: foobar VA---RIABLE var
  -- Special Form: foobar va—riable r
- -- Special Form: foobar va—riable slanted
+ -- Special Form: foobar va---riable slanted
  -- Special Form: foobar va---riable code
  -- Special Form: foobar va---riable t
- -- Special Form: foobar va—riable t:b
+ -- Special Form: foobar va---riable t:b
  -- Special Form: foobar VA—RIABLE r:var
  -- Special Form: foobar va—riable r:slanted
  -- Special Form: foobar va---riable r:code
  -- Special Form: foobar va---riable r:t
  -- Special Form: foobar VA---RIABLE code:var
  -- Special Form: foobar VA---RIABLE t:var
- -- Special Form: foobar va—riable code:slanted
- -- Special Form: foobar va—riable t:slanted
+ -- Special Form: foobar va---riable code:slanted
+ -- Special Form: foobar va---riable t:slanted
      name
 
  -- Request: .ft [font]
@@ -25158,19 +25158,19 @@ produces:
  -- Library Function: int foobar (i--nt F---OO[, float B--AR]) default
  -- Library Function: int foobar (i–nt F---OO[, float B--AR]) r
  -- Library Function: int foobar (I--NT F---OO[, float B--AR]) var
- -- Library Function: int foobar (i–nt F---OO[, float B--AR]) slanted
+ -- Library Function: int foobar (i--nt F---OO[, float B--AR]) slanted
  -- Library Function: int foobar (i--nt F---OO[, float B--AR]) code
  -- Library Function: int foobar (i--nt F---OO[, float B--AR]) t
- -- Library Function: int foobar (i–nt F---OO[, float B--AR]) t:b
+ -- Library Function: int foobar (i--nt F---OO[, float B--AR]) t:b
  -- Library Function: int foobar (I–NT F---OO[, float B--AR]) r:var
  -- Library Function: int foobar (i–nt F---OO[, float B--AR]) r:slanted
  -- Library Function: int foobar (i--nt F---OO[, float B--AR]) r:code
  -- Library Function: int foobar (i--nt F---OO[, float B--AR]) r:t
  -- Library Function: int foobar (I--NT F---OO[, float B--AR]) code:var
  -- Library Function: int foobar (I--NT F---OO[, float B--AR]) t:var
- -- Library Function: int foobar (i–nt F---OO[, float B--AR])
+ -- Library Function: int foobar (i--nt F---OO[, float B--AR])
           code:slanted
- -- Library Function: int foobar (i–nt F---OO[, float B--AR]) t:slanted
+ -- Library Function: int foobar (i--nt F---OO[, float B--AR]) t:slanted
      name
 
 ';
@@ -25236,15 +25236,15 @@ 
$result_converted{'html_text'}->{'definition_commands'} = '
 <dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-18"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><i class="slanted">va&mdash;riable</i> 
slanted</var><a class="copiable-link" href=\'#index-foobar-18\'> 
&para;</a></span></dt>
 <dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-19"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="code">va---riable</code> code</var><a 
class="copiable-link" href=\'#index-foobar-19\'> &para;</a></span></dt>
 <dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-20"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="t">va---riable</code> t</var><a 
class="copiable-link" href=\'#index-foobar-20\'> &para;</a></span></dt>
-<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-21"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="t"><b 
class="b">va&mdash;riable</b></code> t:b</var><a class="copiable-link" 
href=\'#index-foobar-21\'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-21"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="t"><b class="b">va---riable</b></code> 
t:b</var><a class="copiable-link" href=\'#index-foobar-21\'> 
&para;</a></span></dt>
 <dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-22"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><span class="r"><var 
class="var">va&mdash;riable</var></span> r:var</var><a class="copiable-link" 
href=\'#index-foobar-22\'> &para;</a></span></dt>
 <dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-23"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><span class="r"><i 
class="slanted">va&mdash;riable</i></span> r:slanted</var><a 
class="copiable-link" href=\'#index-foobar-23\'> &para;</a></span></dt>
 <dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-24"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><span class="r"><code 
class="code">va---riable</code></span> r:code</var><a class="copiable-link" 
href=\'#index-foobar-24\'> &para;</a></span></dt>
 <dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-25"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><span class="r"><code 
class="t">va---riable</code></span> r:t</var><a class="copiable-link" 
href=\'#index-foobar-25\'> &para;</a></span></dt>
 <dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-26"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="code"><var 
class="var">va---riable</var></code> code:var</var><a class="copiable-link" 
href=\'#index-foobar-26\'> &para;</a></span></dt>
 <dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-27"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="t"><var 
class="var">va---riable</var></code> t:var</var><a class="copiable-link" 
href=\'#index-foobar-27\'> &para;</a></span></dt>
-<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-28"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="code"><i 
class="slanted">va&mdash;riable</i></code> code:slanted</var><a 
class="copiable-link" href=\'#index-foobar-28\'> &para;</a></span></dt>
-<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-29"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="t"><i 
class="slanted">va&mdash;riable</i></code> t:slanted</var><a 
class="copiable-link" href=\'#index-foobar-29\'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-28"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="code"><i 
class="slanted">va---riable</i></code> code:slanted</var><a 
class="copiable-link" href=\'#index-foobar-28\'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-29"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="t"><i 
class="slanted">va---riable</i></code> t:slanted</var><a class="copiable-link" 
href=\'#index-foobar-29\'> &para;</a></span></dt>
 <dd><p>name
 </p></dd></dl>
 
@@ -25331,18 +25331,18 @@ to <var class="var">font</var> (one-character 
name&nbsp;<var class="var">f</var>
 <dt class="deftypefn" id="index-foobar-50"><span class="category-def">Library 
Function: </span><span><code class="def-type">int</code> <strong 
class="def-name">foobar</strong> <code class="def-code-arguments">(i--nt <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) 
default</code><a class="copiable-link" href=\'#index-foobar-50\'> 
&para;</a></span></dt>
 <dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-51"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<span class="r">i&ndash;nt</span> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) r</code><a 
class="copiable-link" href=\'#index-foobar-51\'> &para;</a></span></dt>
 <dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-52"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<var class="var">i--nt</var> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) var</code><a 
class="copiable-link" href=\'#index-foobar-52\'> &para;</a></span></dt>
-<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-53"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<i class="slanted">i&ndash;nt</i> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) 
slanted</code><a class="copiable-link" href=\'#index-foobar-53\'> 
&para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-53"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<i class="slanted">i--nt</i> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) 
slanted</code><a class="copiable-link" href=\'#index-foobar-53\'> 
&para;</a></span></dt>
 <dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-54"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<code class="code">i--nt</code> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) code</code><a 
class="copiable-link" href=\'#index-foobar-54\'> &para;</a></span></dt>
 <dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-55"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<code class="t">i--nt</code> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) t</code><a 
class="copiable-link" href=\'#index-foobar-55\'> &para;</a></span></dt>
-<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-56"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<code class="t"><b class="b">i&ndash;nt</b></code> 
<var class="var">f---oo</var>[, float <var class="var">b--ar</var>]) 
t:b</code><a class="copiable-link" href=\'#index-foobar-56\'> 
&para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-56"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<code class="t"><b class="b">i--nt</b></code> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) t:b</code><a 
class="copiable-link" href=\'#index-foobar-56\'> &para;</a></span></dt>
 <dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-57"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<span class="r"><var 
class="var">i&ndash;nt</var></span> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) r:var</code><a class="copiable-link" 
href=\'#index-foobar-57\'> &para;</a></span></dt>
 <dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-58"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<span class="r"><i 
class="slanted">i&ndash;nt</i></span> <var class="var">f---oo</var>[, float 
<var class="var">b--ar</var>]) r:slanted</code><a class="copiable-link" 
href=\'#index-foobar-58\'> &para;</a></span></dt>
 <dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-59"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<span class="r"><code 
class="code">i--nt</code></span> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) r:code</code><a class="copiable-link" 
href=\'#index-foobar-59\'> &para;</a></span></dt>
 <dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-60"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<span class="r"><code class="t">i--nt</code></span> 
<var class="var">f---oo</var>[, float <var class="var">b--ar</var>]) 
r:t</code><a class="copiable-link" href=\'#index-foobar-60\'> 
&para;</a></span></dt>
 <dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-61"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<code class="code"><var 
class="var">i--nt</var></code> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) code:var</code><a class="copiable-link" 
href=\'#index-foobar-61\'> &para;</a></span></dt>
 <dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-62"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<code class="t"><var class="var">i--nt</var></code> 
<var class="var">f---oo</var>[, float <var class="var">b--ar</var>]) 
t:var</code><a class="copiable-link" href=\'#index-foobar-62\'> 
&para;</a></span></dt>
-<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-63"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<code class="code"><i 
class="slanted">i&ndash;nt</i></code> <var class="var">f---oo</var>[, float 
<var class="var">b--ar</var>]) code:slanted</code><a class="copiable-link" 
href=\'#index-foobar-63\'> &para;</a></span></dt>
-<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-64"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<code class="t"><i 
class="slanted">i&ndash;nt</i></code> <var class="var">f---oo</var>[, float 
<var class="var">b--ar</var>]) t:slanted</code><a class="copiable-link" 
href=\'#index-foobar-64\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-63"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<code class="code"><i 
class="slanted">i--nt</i></code> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) code:slanted</code><a class="copiable-link" 
href=\'#index-foobar-63\'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-64"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<code class="t"><i class="slanted">i--nt</i></code> 
<var class="var">f---oo</var>[, float <var class="var">b--ar</var>]) 
t:slanted</code><a class="copiable-link" href=\'#index-foobar-64\'> 
&para;</a></span></dt>
 <dd><p>name
 </p></dd></dl>
 
@@ -25393,18 +25393,18 @@ $result_converted{'xml'}->{'definition_commands'} = 
'<setfilename file="definiti
 <defspec spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="19">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam>va---riable</defparam> <defparam>default</defparam></definitionterm>
 <defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="20">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><var>va---riable</var></defparam> 
<defparam>var</defparam></definitionterm></defspecx>
 <defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="21">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><r>va&textmdash;riable</r></defparam> 
<defparam>r</defparam></definitionterm></defspecx>
-<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="22">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><slanted>va&textmdash;riable</slanted></defparam> 
<defparam>slanted</defparam></definitionterm></defspecx>
+<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="22">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><slanted>va---riable</slanted></defparam> 
<defparam>slanted</defparam></definitionterm></defspecx>
 <defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="23">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><code>va---riable</code></defparam> 
<defparam>code</defparam></definitionterm></defspecx>
 <defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="24">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><t>va---riable</t></defparam> 
<defparam>t</defparam></definitionterm></defspecx>
-<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="25">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><t><b>va&textmdash;riable</b></t></defparam> 
<defparam>t:b</defparam></definitionterm></defspecx>
+<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="25">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><t><b>va---riable</b></t></defparam> 
<defparam>t:b</defparam></definitionterm></defspecx>
 <defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="26">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><r><var>va&textmdash;riable</var></r></defparam> 
<defparam>r:var</defparam></definitionterm></defspecx>
 <defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="27">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><r><slanted>va&textmdash;riable</slanted></r></defparam> 
<defparam>r:slanted</defparam></definitionterm></defspecx>
 <defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="28">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><r><code>va---riable</code></r></defparam> 
<defparam>r:code</defparam></definitionterm></defspecx>
 <defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="29">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><r><t>va---riable</t></r></defparam> 
<defparam>r:t</defparam></definitionterm></defspecx>
 <defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="30">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><code><var>va---riable</var></code></defparam> 
<defparam>code:var</defparam></definitionterm></defspecx>
 <defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="31">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><t><var>va---riable</var></t></defparam> 
<defparam>t:var</defparam></definitionterm></defspecx>
-<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="32">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><code><slanted>va&textmdash;riable</slanted></code></defparam> 
<defparam>code:slanted</defparam></definitionterm></defspecx>
-<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="33">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><t><slanted>va&textmdash;riable</slanted></t></defparam> 
<defparam>t:slanted</defparam></definitionterm></defspecx>
+<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="32">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><code><slanted>va---riable</slanted></code></defparam> 
<defparam>code:slanted</defparam></definitionterm></defspecx>
+<defspecx spaces=" "><definitionterm><indexterm index="fn" 
number="33">foobar</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> <deffunction>foobar</deffunction> 
<defparam><t><slanted>va---riable</slanted></t></defparam> 
<defparam>t:slanted</defparam></definitionterm></defspecx>
 <definitionitem><para>name
 </para></definitionitem></defspec>
 
@@ -25479,18 +25479,18 @@ to <var>font</var> (one-character 
name&nbsp;<var>f</var>, two-character name
 <deftypefn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="62">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparamtype>i--nt</defparamtype> 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter><defd [...]
 <deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="63">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparam><r>i&textndash;nt</r></defparam> 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter><defdelimi 
[...]
 <deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="64">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparam><var>i--nt</var></defparam> 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter><defdelimiter>)
 [...]
-<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="65">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 
<defdelimiter>(</defdelimiter><defparam><slanted>i&textndash;nt</slanted></defparam>
 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimite [...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="65">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparam><slanted>i--nt</slanted></defparam> 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter><defdel [...]
 <deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="66">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparamtype><code>i--nt</code></defparamtype> 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter><defd [...]
 <deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="67">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparam><t>i--nt</t></defparam> 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter><defdelimiter>)</de
 [...]
-<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="68">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 
<defdelimiter>(</defdelimiter><defparam><t><b>i&textndash;nt</b></t></defparam> 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter><de [...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="68">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparam><t><b>i--nt</b></t></defparam> 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter><defdelimite 
[...]
 <deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="69">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 
<defdelimiter>(</defdelimiter><defparam><r><var>i&textndash;nt</var></r></defparam>
 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter [...]
 <deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="70">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 
<defdelimiter>(</defdelimiter><defparam><r><slanted>i&textndash;nt</slanted></r></defparam>
 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defd [...]
 <deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="71">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparam><r><code>i--nt</code></r></defparam> 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter><defde [...]
 <deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="72">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparam><r><t>i--nt</t></r></defparam> 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter><defdelimite 
[...]
 <deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="73">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 
<defdelimiter>(</defdelimiter><defparamtype><code><var>i--nt</var></code></defparamtype>
 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdeli [...]
 <deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="74">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 <defdelimiter>(</defdelimiter><defparam><t><var>i--nt</var></t></defparam> 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter><defdeli 
[...]
-<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="75">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 
<defdelimiter>(</defdelimiter><defparamtype><code><slanted>i&textndash;nt</slanted></code></defparamtype>
 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdel [...]
-<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="76">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 
<defdelimiter>(</defdelimiter><defparam><t><slanted>i&textndash;nt</slanted></t></defparam>
 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defd [...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="75">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 
<defdelimiter>(</defdelimiter><defparamtype><code><slanted>i--nt</slanted></code></defparamtype>
 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]< [...]
+<deftypefnx spaces=" "><definitionterm><indexterm index="fn" 
number="76">foobar</indexterm><defcategory bracketed="on">Library 
Function</defcategory> <deftype>int</deftype> <deffunction>foobar</deffunction> 
 
<defdelimiter>(</defdelimiter><defparam><t><slanted>i--nt</slanted></t></defparam>
 
<defparam><var>f---oo</var></defparam><defdelimiter>[</defdelimiter><defdelimiter>,</defdelimiter>
 <defparamtype>float</defparamtype> 
<defparam><var>b--ar</var></defparam><defdelimiter>]</defdelimiter> [...]
 <definitionitem><para>name
 </para></definitionitem></deftypefn>
 
@@ -25530,18 +25530,18 @@ $result_converted{'docbook'}->{'definition_commands'} 
= '<chapter label="1" id="
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg">va---riable</emphasis> 
<emphasis role="arg">default</emphasis></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis 
role="arg"><replaceable>va---riable</replaceable></emphasis> <emphasis 
role="arg">var</emphasis></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg">va&#8212;riable</emphasis> 
<emphasis role="arg">r</emphasis></synopsis>
-<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg">va&#8212;riable</emphasis> 
<emphasis role="arg">slanted</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg">va---riable</emphasis> 
<emphasis role="arg">slanted</emphasis></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg">va---riable</emphasis> 
<emphasis role="arg">code</emphasis></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg">va---riable</emphasis> 
<emphasis role="arg">t</emphasis></synopsis>
-<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg"><emphasis 
role="bold">va&#8212;riable</emphasis></emphasis> <emphasis 
role="arg">t:b</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg"><emphasis 
role="bold">va---riable</emphasis></emphasis> <emphasis 
role="arg">t:b</emphasis></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis 
role="arg"><replaceable>va&#8212;riable</replaceable></emphasis> <emphasis 
role="arg">r:var</emphasis></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg">va&#8212;riable</emphasis> 
<emphasis role="arg">r:slanted</emphasis></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg">va---riable</emphasis> 
<emphasis role="arg">r:code</emphasis></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg">va---riable</emphasis> 
<emphasis role="arg">r:t</emphasis></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis 
role="arg"><replaceable>va---riable</replaceable></emphasis> <emphasis 
role="arg">code:var</emphasis></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis 
role="arg"><replaceable>va---riable</replaceable></emphasis> <emphasis 
role="arg">t:var</emphasis></synopsis>
-<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg">va&#8212;riable</emphasis> 
<emphasis role="arg">code:slanted</emphasis></synopsis>
-<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg">va&#8212;riable</emphasis> 
<emphasis role="arg">t:slanted</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg">va---riable</emphasis> 
<emphasis role="arg">code:slanted</emphasis></synopsis>
+<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>foobar</function> <emphasis role="arg">va---riable</emphasis> 
<emphasis role="arg">t:slanted</emphasis></synopsis>
 <blockquote><para>name
 </para></blockquote>
 <synopsis><indexterm 
role="fn"><primary><literal>.ft</literal></primary></indexterm><phrase 
role="category"><emphasis role="bold">Request</emphasis>:</phrase> 
<function>.ft</function> [<emphasis role="arg">font</emphasis>]</synopsis>
@@ -25602,18 +25602,18 @@ to <replaceable>font</replaceable> (one-character 
name&#160;<replaceable>f</repl
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<type>i--nt</type> 
<emphasis role="arg"><replaceable>f---oo</replaceable></emphasis>[, 
<type>float</type> <emphasis 
role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>default</type></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<emphasis 
role="arg">i&#8211;nt</emphasis> <emphasis 
role="arg"><replaceable>f---oo</replaceable></emphasis>[, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>r</type></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<emphasis 
role="arg"><replaceable>i--nt</replaceable></emphasis> <emphasis 
role="arg"><replaceable>f---oo</replaceable></emphasis>[, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>var</type></synopsis>
-<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<emphasis 
role="arg">i&#8211;nt</emphasis> <emphasis 
role="arg"><replaceable>f---oo</replaceable></emphasis>[, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>slanted</type></synopsis>
+<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<emphasis 
role="arg">i--nt</emphasis> <emphasis 
role="arg"><replaceable>f---oo</replaceable></emphasis>[, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>slanted</type></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<type>i--nt</type> 
<emphasis role="arg"><replaceable>f---oo</replaceable></emphasis>[, 
<type>float</type> <emphasis 
role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>code</type></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<emphasis 
role="arg">i--nt</emphasis> <emphasis 
role="arg"><replaceable>f---oo</replaceable></emphasis>[, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>t</type></synopsis>
-<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<emphasis 
role="arg"><emphasis role="bold">i&#8211;nt</emphasis></emphasis> <emphasis 
role="arg"><replaceable>f---oo</replaceable></emphasis>[, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>t:b</type></synopsis>
+<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<emphasis 
role="arg"><emphasis role="bold">i--nt</emphasis></emphasis> <emphasis 
role="arg"><replaceable>f---oo</replaceable></emphasis>[, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>t:b</type></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<emphasis 
role="arg"><replaceable>i&#8211;nt</replaceable></emphasis> <emphasis 
role="arg"><replaceable>f---oo</replaceable></emphasis>[, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>r:var</type></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<emphasis 
role="arg">i&#8211;nt</emphasis> <emphasis 
role="arg"><replaceable>f---oo</replaceable></emphasis>[, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>r:slanted</type></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<emphasis 
role="arg">i--nt</emphasis> <emphasis 
role="arg"><replaceable>f---oo</replaceable></emphasis>[, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>r:code</type></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<emphasis 
role="arg">i--nt</emphasis> <emphasis 
role="arg"><replaceable>f---oo</replaceable></emphasis>[, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>r:t</type></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  
(<type><replaceable>i--nt</replaceable></type> <emphasis 
role="arg"><replaceable>f---oo</replaceable></emphasis>[, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>code:var</type></synopsis>
 <synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<emphasis 
role="arg"><replaceable>i--nt</replaceable></emphasis> <emphasis 
role="arg"><replaceable>f---oo</replaceable></emphasis>[, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>t:var</type></synopsis>
-<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  
(<type>i&#8211;nt</type> <emphasis 
role="arg"><replaceable>f---oo</replaceable></emphasis>[, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>code:slanted</type></synopsis>
-<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<emphasis 
role="arg">i&#8211;nt</emphasis> <emphasis 
role="arg"><replaceable>f---oo</replaceable></emphasis>[, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>t:slanted</type></synopsis>
+<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<type>i--nt</type> 
<emphasis role="arg"><replaceable>f---oo</replaceable></emphasis>[, 
<type>float</type> <emphasis 
role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>code:slanted</type></synopsis>
+<synopsis><indexterm role="fn"><primary>foobar</primary></indexterm><phrase 
role="category"><emphasis role="bold">Library Function</emphasis>:</phrase> 
<returnvalue>int</returnvalue> <function>foobar</function>  (<emphasis 
role="arg">i--nt</emphasis> <emphasis 
role="arg"><replaceable>f---oo</replaceable></emphasis>[, <type>float</type> 
<emphasis role="arg"><replaceable>b--ar</replaceable></emphasis>]) 
<type>t:slanted</type></synopsis>
 <blockquote><para>name
 </para></blockquote>
 </chapter>
diff --git 
a/tp/t/results/converters_tests/definition_commands/res_html/chapter.html 
b/tp/t/results/converters_tests/definition_commands/res_html/chapter.html
index 36caef546b..8d0a8c1cae 100644
--- a/tp/t/results/converters_tests/definition_commands/res_html/chapter.html
+++ b/tp/t/results/converters_tests/definition_commands/res_html/chapter.html
@@ -76,15 +76,15 @@ Previous: <a href="index.html" accesskey="p" rel="prev">top 
section</a>, Up: <a
 <dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-18"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><i class="slanted">va&mdash;riable</i> 
slanted</var><a class="copiable-link" href='#index-foobar-18'> 
&para;</a></span></dt>
 <dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-19"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="code">va---riable</code> code</var><a 
class="copiable-link" href='#index-foobar-19'> &para;</a></span></dt>
 <dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-20"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="t">va---riable</code> t</var><a 
class="copiable-link" href='#index-foobar-20'> &para;</a></span></dt>
-<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-21"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="t"><b 
class="b">va&mdash;riable</b></code> t:b</var><a class="copiable-link" 
href='#index-foobar-21'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-21"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="t"><b class="b">va---riable</b></code> 
t:b</var><a class="copiable-link" href='#index-foobar-21'> 
&para;</a></span></dt>
 <dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-22"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><span class="r"><var 
class="var">va&mdash;riable</var></span> r:var</var><a class="copiable-link" 
href='#index-foobar-22'> &para;</a></span></dt>
 <dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-23"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><span class="r"><i 
class="slanted">va&mdash;riable</i></span> r:slanted</var><a 
class="copiable-link" href='#index-foobar-23'> &para;</a></span></dt>
 <dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-24"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><span class="r"><code 
class="code">va---riable</code></span> r:code</var><a class="copiable-link" 
href='#index-foobar-24'> &para;</a></span></dt>
 <dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-25"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><span class="r"><code 
class="t">va---riable</code></span> r:t</var><a class="copiable-link" 
href='#index-foobar-25'> &para;</a></span></dt>
 <dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-26"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="code"><var 
class="var">va---riable</var></code> code:var</var><a class="copiable-link" 
href='#index-foobar-26'> &para;</a></span></dt>
 <dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-27"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="t"><var 
class="var">va---riable</var></code> t:var</var><a class="copiable-link" 
href='#index-foobar-27'> &para;</a></span></dt>
-<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-28"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="code"><i 
class="slanted">va&mdash;riable</i></code> code:slanted</var><a 
class="copiable-link" href='#index-foobar-28'> &para;</a></span></dt>
-<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-29"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="t"><i 
class="slanted">va&mdash;riable</i></code> t:slanted</var><a 
class="copiable-link" href='#index-foobar-29'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-28"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="code"><i 
class="slanted">va---riable</i></code> code:slanted</var><a 
class="copiable-link" href='#index-foobar-28'> &para;</a></span></dt>
+<dt class="deffnx defspecx-alias-deffnx def-cmd-deffn" 
id="index-foobar-29"><span class="category-def">Special Form: 
</span><span><strong class="def-name">foobar</strong> <var 
class="def-var-arguments"><code class="t"><i 
class="slanted">va---riable</i></code> t:slanted</var><a class="copiable-link" 
href='#index-foobar-29'> &para;</a></span></dt>
 <dd><p>name
 </p></dd></dl>
 
@@ -171,18 +171,18 @@ to <var class="var">font</var> (one-character 
name&nbsp;<var class="var">f</var>
 <dt class="deftypefn" id="index-foobar-50"><span class="category-def">Library 
Function: </span><span><code class="def-type">int</code> <strong 
class="def-name">foobar</strong> <code class="def-code-arguments">(i--nt <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) 
default</code><a class="copiable-link" href='#index-foobar-50'> 
&para;</a></span></dt>
 <dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-51"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<span class="r">i&ndash;nt</span> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) r</code><a 
class="copiable-link" href='#index-foobar-51'> &para;</a></span></dt>
 <dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-52"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<var class="var">i--nt</var> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) var</code><a 
class="copiable-link" href='#index-foobar-52'> &para;</a></span></dt>
-<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-53"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<i class="slanted">i&ndash;nt</i> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) 
slanted</code><a class="copiable-link" href='#index-foobar-53'> 
&para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-53"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<i class="slanted">i--nt</i> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) 
slanted</code><a class="copiable-link" href='#index-foobar-53'> 
&para;</a></span></dt>
 <dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-54"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<code class="code">i--nt</code> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) code</code><a 
class="copiable-link" href='#index-foobar-54'> &para;</a></span></dt>
 <dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-55"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<code class="t">i--nt</code> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) t</code><a 
class="copiable-link" href='#index-foobar-55'> &para;</a></span></dt>
-<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-56"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<code class="t"><b class="b">i&ndash;nt</b></code> 
<var class="var">f---oo</var>[, float <var class="var">b--ar</var>]) 
t:b</code><a class="copiable-link" href='#index-foobar-56'> 
&para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-56"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<code class="t"><b class="b">i--nt</b></code> <var 
class="var">f---oo</var>[, float <var class="var">b--ar</var>]) t:b</code><a 
class="copiable-link" href='#index-foobar-56'> &para;</a></span></dt>
 <dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-57"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<span class="r"><var 
class="var">i&ndash;nt</var></span> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) r:var</code><a class="copiable-link" 
href='#index-foobar-57'> &para;</a></span></dt>
 <dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-58"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<span class="r"><i 
class="slanted">i&ndash;nt</i></span> <var class="var">f---oo</var>[, float 
<var class="var">b--ar</var>]) r:slanted</code><a class="copiable-link" 
href='#index-foobar-58'> &para;</a></span></dt>
 <dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-59"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<span class="r"><code 
class="code">i--nt</code></span> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) r:code</code><a class="copiable-link" 
href='#index-foobar-59'> &para;</a></span></dt>
 <dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-60"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<span class="r"><code class="t">i--nt</code></span> 
<var class="var">f---oo</var>[, float <var class="var">b--ar</var>]) 
r:t</code><a class="copiable-link" href='#index-foobar-60'> 
&para;</a></span></dt>
 <dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-61"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<code class="code"><var 
class="var">i--nt</var></code> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) code:var</code><a class="copiable-link" 
href='#index-foobar-61'> &para;</a></span></dt>
 <dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-62"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<code class="t"><var class="var">i--nt</var></code> 
<var class="var">f---oo</var>[, float <var class="var">b--ar</var>]) 
t:var</code><a class="copiable-link" href='#index-foobar-62'> 
&para;</a></span></dt>
-<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-63"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<code class="code"><i 
class="slanted">i&ndash;nt</i></code> <var class="var">f---oo</var>[, float 
<var class="var">b--ar</var>]) code:slanted</code><a class="copiable-link" 
href='#index-foobar-63'> &para;</a></span></dt>
-<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-64"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<code class="t"><i 
class="slanted">i&ndash;nt</i></code> <var class="var">f---oo</var>[, float 
<var class="var">b--ar</var>]) t:slanted</code><a class="copiable-link" 
href='#index-foobar-64'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-63"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<code class="code"><i 
class="slanted">i--nt</i></code> <var class="var">f---oo</var>[, float <var 
class="var">b--ar</var>]) code:slanted</code><a class="copiable-link" 
href='#index-foobar-63'> &para;</a></span></dt>
+<dt class="deftypefnx def-cmd-deftypefn" id="index-foobar-64"><span 
class="category-def">Library Function: </span><span><code 
class="def-type">int</code> <strong class="def-name">foobar</strong> <code 
class="def-code-arguments">(<code class="t"><i class="slanted">i--nt</i></code> 
<var class="var">f---oo</var>[, float <var class="var">b--ar</var>]) 
t:slanted</code><a class="copiable-link" href='#index-foobar-64'> 
&para;</a></span></dt>
 <dd><p>name
 </p></dd></dl>
 
diff --git 
a/tp/t/results/init_files_tests/documentation_examples/res_html/index.html 
b/tp/t/results/init_files_tests/documentation_examples/res_html/index.html
index b874129497..e8d8685afd 100644
--- a/tp/t/results/init_files_tests/documentation_examples/res_html/index.html
+++ b/tp/t/results/init_files_tests/documentation_examples/res_html/index.html
@@ -33,7 +33,7 @@ Next: <a href="prepended_to_filenames-my-node.html" 
accesskey="n" rel="next">my
 <hr>
 <h1 class="node">Top</h1>
 
-<p><code class="sansserif">in&ndash;text</code> &shy; p--n. error--&gt;
+<p><code class="sansserif">in--text</code> &shy; p--n. error--&gt;
 See <a class="xref" href="prepended_to_filenames-my-node.html">my node</a><a 
class="footnote" id="DOCF1_2" 
href="documentation_examples_fot.html#FOOT1_2"><sup>2</sup></a>.
  <code>HTML</code> text </p><h1 class="titlefont">in titlefont</h1>
 <p><a class="email" href="mailto:a@b.c";>someone</a> [undefined 
text-align:center, is undef|end|separate]
@@ -41,7 +41,7 @@ See <a class="xref" 
href="prepended_to_filenames-my-node.html">my node</a><a cla
 <p><em class="math"><code class="sansserif">in--math</code> &shy; a=b 
error--&gt;</em>
  <code>HTML</code> text </p>
 <div class="example">
-<pre class="example-preformatted"><code 
class="sansserif">in&ndash;example</code> &shy; c. error--&gt;
+<pre class="example-preformatted"><code class="sansserif">in--example</code> 
&shy; c. error--&gt;
 </pre></div>
 
 
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html 
b/tp/tests/layout/res_parser/formatting/formatting.html
index bcb61c617b..8aff66fecf 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -5389,7 +5389,7 @@ but , ,
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr 
class="abbr" title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr> (&Eacute;tude 
Autonome)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr>
 <code class="code">@asis{--a}</code> --a
-<code class="code">@b{--a}</code> <b class="b">&ndash;a</b>
+<code class="code">@b{--a}</code> <b class="b">--a</b>
 <code class="code">@cite{--a}</code> <cite class="cite">--a</cite>
 <code class="code">@code{--a}</code> <code class="code">--a</code>
 <code class="code">@command{--a}</code> <code class="command">--a</code>
@@ -5401,7 +5401,7 @@ but , ,
 <code class="code">@emph{--a}</code> <em class="emph">--a</em>
 <code class="code">@env{--a}</code> <code class="env">--a</code>
 <code class="code">@file{--a}</code> <samp class="file">--a</samp>
-<code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
+<code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
 <code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
@@ -5411,8 +5411,8 @@ but , ,
 <code class="code">@sc{--a}</code> <span class="sc">--A</span>
 <code class="code">@strong{--a}</code> <strong class="strong">--a</strong>
 <code class="code">@t{--a}</code> <code class="t">--a</code>
-<code class="code">@sansserif{--a}</code> <span 
class="sansserif">&ndash;a</span>
-<code class="code">@slanted{--a}</code> <i class="slanted">&ndash;a</i>
+<code class="code">@sansserif{--a}</code> <span class="sansserif">--a</span>
+<code class="code">@slanted{--a}</code> <i class="slanted">--a</i>
 <code class="code">@titlefont{--a}</code> </pre><h1 
class="titlefont">--a</h1><pre class="example-preformatted">
 
 <code class="code">@indicateurl{--a}</code> &lsquo;<code 
class="indicateurl">--a</code>&rsquo;
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter.html 
b/tp/tests/layout/res_parser/formatting_chm/chapter.html
index 2a46991938..1da67c5d03 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter.html
@@ -3173,7 +3173,7 @@ but , ,
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr 
class="abbr" title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr> (&Eacute;tude 
Autonome)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr>
 <code class="code">@asis{--a}</code> --a
-<code class="code">@b{--a}</code> <b class="b">&ndash;a</b>
+<code class="code">@b{--a}</code> <b class="b">--a</b>
 <code class="code">@cite{--a}</code> <cite class="cite">--a</cite>
 <code class="code">@code{--a}</code> <code class="code">--a</code>
 <code class="code">@command{--a}</code> <code class="command">--a</code>
@@ -3185,7 +3185,7 @@ but , ,
 <code class="code">@emph{--a}</code> <em class="emph">--a</em>
 <code class="code">@env{--a}</code> <code class="env">--a</code>
 <code class="code">@file{--a}</code> <samp class="file">--a</samp>
-<code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
+<code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
 <code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
@@ -3195,8 +3195,8 @@ but , ,
 <code class="code">@sc{--a}</code> <span class="sc">--A</span>
 <code class="code">@strong{--a}</code> <strong class="strong">--a</strong>
 <code class="code">@t{--a}</code> <code class="t">--a</code>
-<code class="code">@sansserif{--a}</code> <span 
class="sansserif">&ndash;a</span>
-<code class="code">@slanted{--a}</code> <i class="slanted">&ndash;a</i>
+<code class="code">@sansserif{--a}</code> <span class="sansserif">--a</span>
+<code class="code">@slanted{--a}</code> <i class="slanted">--a</i>
 <code class="code">@titlefont{--a}</code> </pre><h1 
class="titlefont">--a</h1><pre class="example-preformatted">
 
 <code class="code">@indicateurl{--a}</code> &lsquo;<code 
class="indicateurl">--a</code>&rsquo;
diff --git a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml 
b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
index 5eaf15ccfb..b661bf39bf 100644
--- a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
@@ -2869,7 +2869,7 @@ but , ,
 <literal>@abbr{@'E--. @comma{}A., @'Etude Autonome }</literal> 
<abbrev>&#201;--. &#44;A.</abbrev> (&#201;tude Autonome)
 <literal>@abbr{@'E--. @comma{}A.}</literal> <abbrev>&#201;--. &#44;A.</abbrev>
 <literal>@asis{--a}</literal> --a
-<literal>@b{--a}</literal> <emphasis role="bold">&#8211;a</emphasis>
+<literal>@b{--a}</literal> <emphasis role="bold">--a</emphasis>
 <literal>@cite{--a}</literal> <citetitle>--a</citetitle>
 <literal>@code{--a}</literal> <literal>--a</literal>
 <literal>@command{--a}</literal> <command>--a</command>
@@ -2881,7 +2881,7 @@ but , ,
 <literal>@emph{--a}</literal> <emphasis>--a</emphasis>
 <literal>@env{--a}</literal> <envar>--a</envar>
 <literal>@file{--a}</literal> <filename>--a</filename>
-<literal>@i{--a}</literal> <emphasis>&#8211;a</emphasis>
+<literal>@i{--a}</literal> <emphasis>--a</emphasis>
 <literal>@kbd{--a}</literal> <userinput>--a</userinput>
 <literal>@key{--a}</literal> <keycap>--a</keycap>
 <literal>@math{--a {\frac{1}{2}} @minus{}}</literal> 
<inlineequation><mathphrase>--a {\frac{1}{2}} 
&#8722;</mathphrase></inlineequation>
@@ -2891,8 +2891,8 @@ but , ,
 <literal>@sc{--a}</literal> --A
 <literal>@strong{--a}</literal> <emphasis role="bold">--a</emphasis>
 <literal>@t{--a}</literal> <literal>--a</literal>
-<literal>@sansserif{--a}</literal> &#8211;a
-<literal>@slanted{--a}</literal> &#8211;a
+<literal>@sansserif{--a}</literal> --a
+<literal>@slanted{--a}</literal> --a
 <literal>@titlefont{--a}</literal> </screen>--a<screen>
 <literal>@indicateurl{--a}</literal> <literal>--a</literal>
 <literal>@uref{--a,--b}</literal> <ulink url="--a">--b</ulink>
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 73ba5512e4..5c67d06290 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
@@ -5389,7 +5389,7 @@ but , ,
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr 
class="abbr" title="Étude Autonome">É--. ,A.</abbr> (Étude Autonome)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="Étude Autonome">É--. ,A.</abbr>
 <code class="code">@asis{--a}</code> --a
-<code class="code">@b{--a}</code> <b class="b">–a</b>
+<code class="code">@b{--a}</code> <b class="b">--a</b>
 <code class="code">@cite{--a}</code> <cite class="cite">--a</cite>
 <code class="code">@code{--a}</code> <code class="code">--a</code>
 <code class="code">@command{--a}</code> <code class="command">--a</code>
@@ -5401,7 +5401,7 @@ but , ,
 <code class="code">@emph{--a}</code> <em class="emph">--a</em>
 <code class="code">@env{--a}</code> <code class="env">--a</code>
 <code class="code">@file{--a}</code> <samp class="file">--a</samp>
-<code class="code">@i{--a}</code> <i class="i">–a</i>
+<code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
 <code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} −</em>
@@ -5411,8 +5411,8 @@ but , ,
 <code class="code">@sc{--a}</code> <span class="sc">--A</span>
 <code class="code">@strong{--a}</code> <strong class="strong">--a</strong>
 <code class="code">@t{--a}</code> <code class="t">--a</code>
-<code class="code">@sansserif{--a}</code> <span class="sansserif">–a</span>
-<code class="code">@slanted{--a}</code> <i class="slanted">–a</i>
+<code class="code">@sansserif{--a}</code> <span class="sansserif">--a</span>
+<code class="code">@slanted{--a}</code> <i class="slanted">--a</i>
 <code class="code">@titlefont{--a}</code> </pre><h1 
class="titlefont">--a</h1><pre class="example-preformatted">
 
 <code class="code">@indicateurl{--a}</code> ‘<code 
class="indicateurl">--a</code>’
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
index 059ac22299..de6690bdb7 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
@@ -3173,7 +3173,7 @@ but , ,
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr 
class="abbr" title="&#201;tude Autonome">&#201;--. &#44;A.</abbr> (&#201;tude 
Autonome)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&#201;tude Autonome">&#201;--. &#44;A.</abbr>
 <code class="code">@asis{--a}</code> --a
-<code class="code">@b{--a}</code> <b class="b">&#8211;a</b>
+<code class="code">@b{--a}</code> <b class="b">--a</b>
 <code class="code">@cite{--a}</code> <cite class="cite">--a</cite>
 <code class="code">@code{--a}</code> <code class="code">--a</code>
 <code class="code">@command{--a}</code> <code class="command">--a</code>
@@ -3185,7 +3185,7 @@ but , ,
 <code class="code">@emph{--a}</code> <em class="emph">--a</em>
 <code class="code">@env{--a}</code> <code class="env">--a</code>
 <code class="code">@file{--a}</code> <samp class="file">--a</samp>
-<code class="code">@i{--a}</code> <i class="i">&#8211;a</i>
+<code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
 <code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &#8722;</em>
@@ -3195,8 +3195,8 @@ but , ,
 <code class="code">@sc{--a}</code> <span class="sc">--A</span>
 <code class="code">@strong{--a}</code> <strong class="strong">--a</strong>
 <code class="code">@t{--a}</code> <code class="t">--a</code>
-<code class="code">@sansserif{--a}</code> <span 
class="sansserif">&#8211;a</span>
-<code class="code">@slanted{--a}</code> <i class="slanted">&#8211;a</i>
+<code class="code">@sansserif{--a}</code> <span class="sansserif">--a</span>
+<code class="code">@slanted{--a}</code> <i class="slanted">--a</i>
 <code class="code">@titlefont{--a}</code> </pre><h1 
class="titlefont">--a</h1><pre class="example-preformatted">
 
 <code class="code">@indicateurl{--a}</code> &#8216;<code 
class="indicateurl">--a</code>&#8217;
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 bc43c3aaf3..825ad69e4a 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
@@ -3174,7 +3174,7 @@ but , ,
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr 
class="abbr" title="&#201;tude Autonome">&#201;--. &#44;A.</abbr> (&#201;tude 
Autonome)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&#201;tude Autonome">&#201;--. &#44;A.</abbr>
 <code class="code">@asis{--a}</code> --a
-<code class="code">@b{--a}</code> <b class="b">&#8211;a</b>
+<code class="code">@b{--a}</code> <b class="b">--a</b>
 <code class="code">@cite{--a}</code> <cite class="cite">--a</cite>
 <code class="code">@code{--a}</code> <code class="code">--a</code>
 <code class="code">@command{--a}</code> <code class="command">--a</code>
@@ -3186,7 +3186,7 @@ but , ,
 <code class="code">@emph{--a}</code> <em class="emph">--a</em>
 <code class="code">@env{--a}</code> <code class="env">--a</code>
 <code class="code">@file{--a}</code> <samp class="file">--a</samp>
-<code class="code">@i{--a}</code> <i class="i">&#8211;a</i>
+<code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
 <code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &#8722;</em>
@@ -3196,8 +3196,8 @@ but , ,
 <code class="code">@sc{--a}</code> <span class="sc">--A</span>
 <code class="code">@strong{--a}</code> <strong class="strong">--a</strong>
 <code class="code">@t{--a}</code> <code class="t">--a</code>
-<code class="code">@sansserif{--a}</code> <span 
class="sansserif">&#8211;a</span>
-<code class="code">@slanted{--a}</code> <i class="slanted">&#8211;a</i>
+<code class="code">@sansserif{--a}</code> <span class="sansserif">--a</span>
+<code class="code">@slanted{--a}</code> <i class="slanted">--a</i>
 <code class="code">@titlefont{--a}</code> </pre><h1 
class="titlefont">--a</h1><pre class="example-preformatted">
 
 <code class="code">@indicateurl{--a}</code> &#8216;<code 
class="indicateurl">--a</code>&#8217;
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter.html 
b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index 923c5d10eb..11e7596f60 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
@@ -3192,7 +3192,7 @@ but , ,
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr 
class="abbr" title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr> (&Eacute;tude 
Autonome)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr>
 <code class="code">@asis{--a}</code> --a
-<code class="code">@b{--a}</code> <b class="b">&ndash;a</b>
+<code class="code">@b{--a}</code> <b class="b">--a</b>
 <code class="code">@cite{--a}</code> <cite class="cite">--a</cite>
 <code class="code">@code{--a}</code> <code class="code">--a</code>
 <code class="code">@command{--a}</code> <code class="command">--a</code>
@@ -3204,7 +3204,7 @@ but , ,
 <code class="code">@emph{--a}</code> <em class="emph">--a</em>
 <code class="code">@env{--a}</code> <code class="env">--a</code>
 <code class="code">@file{--a}</code> <samp class="file">--a</samp>
-<code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
+<code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
 <code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
@@ -3214,8 +3214,8 @@ but , ,
 <code class="code">@sc{--a}</code> <span class="sc">--A</span>
 <code class="code">@strong{--a}</code> <strong class="strong">--a</strong>
 <code class="code">@t{--a}</code> <code class="t">--a</code>
-<code class="code">@sansserif{--a}</code> <span 
class="sansserif">&ndash;a</span>
-<code class="code">@slanted{--a}</code> <i class="slanted">&ndash;a</i>
+<code class="code">@sansserif{--a}</code> <span class="sansserif">--a</span>
+<code class="code">@slanted{--a}</code> <i class="slanted">--a</i>
 <code class="code">@titlefont{--a}</code> </pre><h1 
class="titlefont">--a</h1><pre class="example-preformatted">
 
 <code class="code">@indicateurl{--a}</code> &lsquo;<code 
class="indicateurl">--a</code>&rsquo;
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 8c6badd457..f862f17f3c 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -5389,7 +5389,7 @@ but , ,
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr 
class="abbr" title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr> (&Eacute;tude 
Autonome)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr>
 <code class="code">@asis{--a}</code> --a
-<code class="code">@b{--a}</code> <b class="b">&ndash;a</b>
+<code class="code">@b{--a}</code> <b class="b">--a</b>
 <code class="code">@cite{--a}</code> <cite class="cite">--a</cite>
 <code class="code">@code{--a}</code> <code class="code">--a</code>
 <code class="code">@command{--a}</code> <code class="command">--a</code>
@@ -5401,7 +5401,7 @@ but , ,
 <code class="code">@emph{--a}</code> <em class="emph">--a</em>
 <code class="code">@env{--a}</code> <code class="env">--a</code>
 <code class="code">@file{--a}</code> <samp class="file">--a</samp>
-<code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
+<code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
 <code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
@@ -5411,8 +5411,8 @@ but , ,
 <code class="code">@sc{--a}</code> <span class="sc">--A</span>
 <code class="code">@strong{--a}</code> <strong class="strong">--a</strong>
 <code class="code">@t{--a}</code> <code class="t">--a</code>
-<code class="code">@sansserif{--a}</code> <span 
class="sansserif">&ndash;a</span>
-<code class="code">@slanted{--a}</code> <i class="slanted">&ndash;a</i>
+<code class="code">@sansserif{--a}</code> <span class="sansserif">--a</span>
+<code class="code">@slanted{--a}</code> <i class="slanted">--a</i>
 <code class="code">@titlefont{--a}</code> </pre><h1 
class="titlefont">--a</h1><pre class="example-preformatted">
 
 <code class="code">@indicateurl{--a}</code> &lsquo;<code 
class="indicateurl">--a</code>&rsquo;
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html 
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index bcb61c617b..8aff66fecf 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -5389,7 +5389,7 @@ but , ,
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr 
class="abbr" title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr> (&Eacute;tude 
Autonome)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr>
 <code class="code">@asis{--a}</code> --a
-<code class="code">@b{--a}</code> <b class="b">&ndash;a</b>
+<code class="code">@b{--a}</code> <b class="b">--a</b>
 <code class="code">@cite{--a}</code> <cite class="cite">--a</cite>
 <code class="code">@code{--a}</code> <code class="code">--a</code>
 <code class="code">@command{--a}</code> <code class="command">--a</code>
@@ -5401,7 +5401,7 @@ but , ,
 <code class="code">@emph{--a}</code> <em class="emph">--a</em>
 <code class="code">@env{--a}</code> <code class="env">--a</code>
 <code class="code">@file{--a}</code> <samp class="file">--a</samp>
-<code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
+<code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
 <code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
@@ -5411,8 +5411,8 @@ but , ,
 <code class="code">@sc{--a}</code> <span class="sc">--A</span>
 <code class="code">@strong{--a}</code> <strong class="strong">--a</strong>
 <code class="code">@t{--a}</code> <code class="t">--a</code>
-<code class="code">@sansserif{--a}</code> <span 
class="sansserif">&ndash;a</span>
-<code class="code">@slanted{--a}</code> <i class="slanted">&ndash;a</i>
+<code class="code">@sansserif{--a}</code> <span class="sansserif">--a</span>
+<code class="code">@slanted{--a}</code> <i class="slanted">--a</i>
 <code class="code">@titlefont{--a}</code> </pre><h1 
class="titlefont">--a</h1><pre class="example-preformatted">
 
 <code class="code">@indicateurl{--a}</code> &lsquo;<code 
class="indicateurl">--a</code>&rsquo;
diff --git a/tp/tests/layout/res_parser/formatting_html32/formatting.html 
b/tp/tests/layout/res_parser/formatting_html32/formatting.html
index 6fc0083ef1..5411d55f5f 100644
--- a/tp/tests/layout/res_parser/formatting_html32/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html32/formatting.html
@@ -5246,7 +5246,7 @@ but , ,
 <code>@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> &Eacute;--. ,A. 
(&Eacute;tude Autonome)
 <code>@abbr{@'E--. @comma{}A.}</code> &Eacute;--. ,A.
 <code>@asis{--a}</code> --a
-<code>@b{--a}</code> <b>-a</b>
+<code>@b{--a}</code> <b>--a</b>
 <code>@cite{--a}</code> <cite>--a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
@@ -5258,7 +5258,7 @@ but , ,
 <code>@emph{--a}</code> <em>--a</em>
 <code>@env{--a}</code> <code>--a</code>
 <code>@file{--a}</code> <samp>--a</samp>
-<code>@i{--a}</code> <i>-a</i>
+<code>@i{--a}</code> <i>--a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
 <code>@key{--a}</code> <kbd>--a</kbd>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
@@ -5268,8 +5268,8 @@ but , ,
 <code>@sc{--a}</code> --A
 <code>@strong{--a}</code> <strong>--a</strong>
 <code>@t{--a}</code> <tt>--a</tt>
-<code>@sansserif{--a}</code> -a
-<code>@slanted{--a}</code> <i>-a</i>
+<code>@sansserif{--a}</code> --a
+<code>@slanted{--a}</code> <i>--a</i>
 <code>@titlefont{--a}</code> </pre><h1>--a</h1><pre>
 
 <code>@indicateurl{--a}</code> `<code>--a</code>'
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 fa1574e044..177ae029c7 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
@@ -3231,7 +3231,7 @@ but , ,
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr 
class="abbr" title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr> (&Eacute;tude 
Autonome)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr>
 <code class="code">@asis{--a}</code> --a
-<code class="code">@b{--a}</code> <b class="b">&ndash;a</b>
+<code class="code">@b{--a}</code> <b class="b">--a</b>
 <code class="code">@cite{--a}</code> <cite class="cite">--a</cite>
 <code class="code">@code{--a}</code> <code class="code">--a</code>
 <code class="code">@command{--a}</code> <code class="command">--a</code>
@@ -3243,7 +3243,7 @@ but , ,
 <code class="code">@emph{--a}</code> <em class="emph">--a</em>
 <code class="code">@env{--a}</code> <code class="env">--a</code>
 <code class="code">@file{--a}</code> <samp class="file">--a</samp>
-<code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
+<code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
 <code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
@@ -3253,8 +3253,8 @@ but , ,
 <code class="code">@sc{--a}</code> <span class="sc">--A</span>
 <code class="code">@strong{--a}</code> <strong class="strong">--a</strong>
 <code class="code">@t{--a}</code> <code class="t">--a</code>
-<code class="code">@sansserif{--a}</code> <span 
class="sansserif">&ndash;a</span>
-<code class="code">@slanted{--a}</code> <i class="slanted">&ndash;a</i>
+<code class="code">@sansserif{--a}</code> <span class="sansserif">--a</span>
+<code class="code">@slanted{--a}</code> <i class="slanted">--a</i>
 <code class="code">@titlefont{--a}</code> </pre><h1 
class="titlefont">--a</h1><pre class="example-preformatted">
 
 <code class="code">@indicateurl{--a}</code> &lsquo;<code 
class="indicateurl">--a</code>&rsquo;
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 6e9025bbcf..3da664e225 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -3193,7 +3193,7 @@ but , ,
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr 
class="abbr" title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr> (&Eacute;tude 
Autonome)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr>
 <code class="code">@asis{--a}</code> --a
-<code class="code">@b{--a}</code> <b class="b">&ndash;a</b>
+<code class="code">@b{--a}</code> <b class="b">--a</b>
 <code class="code">@cite{--a}</code> <cite class="cite">--a</cite>
 <code class="code">@code{--a}</code> <code class="code">--a</code>
 <code class="code">@command{--a}</code> <code class="command">--a</code>
@@ -3205,7 +3205,7 @@ but , ,
 <code class="code">@emph{--a}</code> <em class="emph">--a</em>
 <code class="code">@env{--a}</code> <code class="env">--a</code>
 <code class="code">@file{--a}</code> <samp class="file">--a</samp>
-<code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
+<code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
 <code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
@@ -3215,8 +3215,8 @@ but , ,
 <code class="code">@sc{--a}</code> <span class="sc">--A</span>
 <code class="code">@strong{--a}</code> <strong class="strong">--a</strong>
 <code class="code">@t{--a}</code> <code class="t">--a</code>
-<code class="code">@sansserif{--a}</code> <span 
class="sansserif">&ndash;a</span>
-<code class="code">@slanted{--a}</code> <i class="slanted">&ndash;a</i>
+<code class="code">@sansserif{--a}</code> <span class="sansserif">--a</span>
+<code class="code">@slanted{--a}</code> <i class="slanted">--a</i>
 <code class="code">@titlefont{--a}</code> </pre><h1 
class="titlefont">--a</h1><pre class="example-preformatted">
 
 <code class="code">@indicateurl{--a}</code> &lsquo;<code 
class="indicateurl">--a</code>&rsquo;
diff --git a/tp/tests/layout/res_parser/formatting_info/formatting.info 
b/tp/tests/layout/res_parser/formatting_info/formatting.info
index 415ef06dd8..6488a38061 100644
--- a/tp/tests/layout/res_parser/formatting_info/formatting.info
+++ b/tp/tests/layout/res_parser/formatting_info/formatting.info
@@ -2176,7 +2176,7 @@ cross ref name: (file name). '@inforef{}' *note ::
      @abbr{@'E--. @comma{}A., @'Etude Autonome } É--. ,A. (Étude Autonome)
      @abbr{@'E--. @comma{}A.} É--. ,A.
      @asis{--a} --a
-     @b{--a} -a
+     @b{--a} --a
      @cite{--a} '--a'
      @code{--a} --a
      @command{--a} --a
@@ -2188,7 +2188,7 @@ cross ref name: (file name). '@inforef{}' *note ::
      @emph{--a} _--a_
      @env{--a} --a
      @file{--a} --a
-     @i{--a} -a
+     @i{--a} --a
      @kbd{--a} --a
      @key{--a} <--a>
      @math{--a {\frac{1}{2}} @minus{}} --a {\frac{1}{2}} -
@@ -2198,8 +2198,8 @@ cross ref name: (file name). '@inforef{}' *note ::
      @sc{--a} --A
      @strong{--a} *--a*
      @t{--a} --a
-     @sansserif{--a} -a
-     @slanted{--a} -a
+     @sansserif{--a} --a
+     @slanted{--a} --a
      @titlefont{--a}
      -a
      **
@@ -3576,20 +3576,20 @@ chapter 2
 Tag Table:
 Node: Top18467
 Node: chapter18652
-Ref: chapter-Footnote-196765
-Ref: chapter-Footnote-296785
-Ref: chapter-Footnote-396806
-Ref: chapter-Footnote-496826
-Ref: chapter-Footnote-596847
-Ref: chapter-Footnote-696867
-Ref: chapter-Footnote-796888
-Ref: chapter-Footnote-896926
-Node: s--ect,ion96946
-Node: subsection97149
-Ref: anchor97330
-Node: subsubsection ``simple-double--97330
-Node: subsubsection three---four----''97530
-Node: chapter297702
+Ref: chapter-Footnote-196769
+Ref: chapter-Footnote-296789
+Ref: chapter-Footnote-396810
+Ref: chapter-Footnote-496830
+Ref: chapter-Footnote-596851
+Ref: chapter-Footnote-696871
+Ref: chapter-Footnote-796892
+Ref: chapter-Footnote-896930
+Node: s--ect,ion96950
+Node: subsection97153
+Ref: anchor97334
+Node: subsubsection ``simple-double--97334
+Node: subsubsection three---four----''97534
+Node: chapter297706
 
 End Tag Table
 
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 86823c5be2..13f70ae76b 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
@@ -5351,7 +5351,7 @@ but , ,
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr 
class="abbr" title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr> (&Eacute;tude 
Autonome)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr>
 <code class="code">@asis{--a}</code> --a
-<code class="code">@b{--a}</code> <b class="b">&ndash;a</b>
+<code class="code">@b{--a}</code> <b class="b">--a</b>
 <code class="code">@cite{--a}</code> <cite class="cite">--a</cite>
 <code class="code">@code{--a}</code> <code class="code">--a</code>
 <code class="code">@command{--a}</code> <code class="command">--a</code>
@@ -5363,7 +5363,7 @@ but , ,
 <code class="code">@emph{--a}</code> <em class="emph">--a</em>
 <code class="code">@env{--a}</code> <code class="env">--a</code>
 <code class="code">@file{--a}</code> <samp class="file">--a</samp>
-<code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
+<code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd" style="font-style: 
oblique">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key" style="font-style: 
normal">--a</kbd>
 <code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
@@ -5373,8 +5373,8 @@ but , ,
 <code class="code">@sc{--a}</code> <span class="sc">--A</span>
 <code class="code">@strong{--a}</code> <strong class="strong">--a</strong>
 <code class="code">@t{--a}</code> <code class="t">--a</code>
-<code class="code">@sansserif{--a}</code> <span class="sansserif" 
style="font-family: sans-serif; font-weight: normal">&ndash;a</span>
-<code class="code">@slanted{--a}</code> <i class="slanted">&ndash;a</i>
+<code class="code">@sansserif{--a}</code> <span class="sansserif" 
style="font-family: sans-serif; font-weight: normal">--a</span>
+<code class="code">@slanted{--a}</code> <i class="slanted">--a</i>
 <code class="code">@titlefont{--a}</code> </pre><h1 
class="titlefont">--a</h1><pre class="example-preformatted">
 
 <code class="code">@indicateurl{--a}</code> &lsquo;<code 
class="indicateurl">--a</code>&rsquo;
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html 
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index fc4d85a79d..04bc5a74f4 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -5391,7 +5391,7 @@ but , ,
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr 
class="abbr" title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr> (&Eacute;tude 
Autonome)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr>
 <code class="code">@asis{--a}</code> --a
-<code class="code">@b{--a}</code> <b class="b">&ndash;a</b>
+<code class="code">@b{--a}</code> <b class="b">--a</b>
 <code class="code">@cite{--a}</code> <cite class="cite">--a</cite>
 <code class="code">@code{--a}</code> <code class="code">--a</code>
 <code class="code">@command{--a}</code> <code class="command">--a</code>
@@ -5403,7 +5403,7 @@ but , ,
 <code class="code">@emph{--a}</code> <em class="emph">--a</em>
 <code class="code">@env{--a}</code> <code class="env">--a</code>
 <code class="code">@file{--a}</code> <samp class="file">--a</samp>
-<code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
+<code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
 <code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em class="math 
tex2jax_process">\(--a {\frac{1}{2}} -\)</em>
@@ -5413,8 +5413,8 @@ but , ,
 <code class="code">@sc{--a}</code> <span class="sc">--A</span>
 <code class="code">@strong{--a}</code> <strong class="strong">--a</strong>
 <code class="code">@t{--a}</code> <code class="t">--a</code>
-<code class="code">@sansserif{--a}</code> <span 
class="sansserif">&ndash;a</span>
-<code class="code">@slanted{--a}</code> <i class="slanted">&ndash;a</i>
+<code class="code">@sansserif{--a}</code> <span class="sansserif">--a</span>
+<code class="code">@slanted{--a}</code> <i class="slanted">--a</i>
 <code class="code">@titlefont{--a}</code> </pre><h1 
class="titlefont">--a</h1><pre class="example-preformatted">
 
 <code class="code">@indicateurl{--a}</code> &lsquo;<code 
class="indicateurl">--a</code>&rsquo;
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter.html 
b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
index 6e9025bbcf..3da664e225 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -3193,7 +3193,7 @@ but , ,
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr 
class="abbr" title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr> (&Eacute;tude 
Autonome)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr>
 <code class="code">@asis{--a}</code> --a
-<code class="code">@b{--a}</code> <b class="b">&ndash;a</b>
+<code class="code">@b{--a}</code> <b class="b">--a</b>
 <code class="code">@cite{--a}</code> <cite class="cite">--a</cite>
 <code class="code">@code{--a}</code> <code class="code">--a</code>
 <code class="code">@command{--a}</code> <code class="command">--a</code>
@@ -3205,7 +3205,7 @@ but , ,
 <code class="code">@emph{--a}</code> <em class="emph">--a</em>
 <code class="code">@env{--a}</code> <code class="env">--a</code>
 <code class="code">@file{--a}</code> <samp class="file">--a</samp>
-<code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
+<code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
 <code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
@@ -3215,8 +3215,8 @@ but , ,
 <code class="code">@sc{--a}</code> <span class="sc">--A</span>
 <code class="code">@strong{--a}</code> <strong class="strong">--a</strong>
 <code class="code">@t{--a}</code> <code class="t">--a</code>
-<code class="code">@sansserif{--a}</code> <span 
class="sansserif">&ndash;a</span>
-<code class="code">@slanted{--a}</code> <i class="slanted">&ndash;a</i>
+<code class="code">@sansserif{--a}</code> <span class="sansserif">--a</span>
+<code class="code">@slanted{--a}</code> <i class="slanted">--a</i>
 <code class="code">@titlefont{--a}</code> </pre><h1 
class="titlefont">--a</h1><pre class="example-preformatted">
 
 <code class="code">@indicateurl{--a}</code> &lsquo;<code 
class="indicateurl">--a</code>&rsquo;
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 9be2997204..1586c44fc9 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
@@ -5389,7 +5389,7 @@ but , ,
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr 
class="abbr" title="&#201;tude Autonome">&#201;--. &#44;A.</abbr> (&#201;tude 
Autonome)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&#201;tude Autonome">&#201;--. &#44;A.</abbr>
 <code class="code">@asis{--a}</code> --a
-<code class="code">@b{--a}</code> <b class="b">&#8211;a</b>
+<code class="code">@b{--a}</code> <b class="b">--a</b>
 <code class="code">@cite{--a}</code> <cite class="cite">--a</cite>
 <code class="code">@code{--a}</code> <code class="code">--a</code>
 <code class="code">@command{--a}</code> <code class="command">--a</code>
@@ -5401,7 +5401,7 @@ but , ,
 <code class="code">@emph{--a}</code> <em class="emph">--a</em>
 <code class="code">@env{--a}</code> <code class="env">--a</code>
 <code class="code">@file{--a}</code> <samp class="file">--a</samp>
-<code class="code">@i{--a}</code> <i class="i">&#8211;a</i>
+<code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
 <code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} &#8722;</em>
@@ -5411,8 +5411,8 @@ but , ,
 <code class="code">@sc{--a}</code> <span class="sc">--A</span>
 <code class="code">@strong{--a}</code> <strong class="strong">--a</strong>
 <code class="code">@t{--a}</code> <code class="t">--a</code>
-<code class="code">@sansserif{--a}</code> <span 
class="sansserif">&#8211;a</span>
-<code class="code">@slanted{--a}</code> <i class="slanted">&#8211;a</i>
+<code class="code">@sansserif{--a}</code> <span class="sansserif">--a</span>
+<code class="code">@slanted{--a}</code> <i class="slanted">--a</i>
 <code class="code">@titlefont{--a}</code> </pre><h1 
class="titlefont">--a</h1><pre class="example-preformatted">
 
 <code class="code">@indicateurl{--a}</code> &#8216;<code 
class="indicateurl">--a</code>&#8217;
diff --git a/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt 
b/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
index c646944ff4..541541c38e 100644
--- a/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
+++ b/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
@@ -1479,7 +1479,7 @@ cross ref name: (file name). '@inforef{}' *note ::
      @abbr{@'E--. @comma{}A., @'Etude Autonome } É--. ,A. (Étude Autonome)
      @abbr{@'E--. @comma{}A.} É--. ,A.
      @asis{--a} --a
-     @b{--a} -a
+     @b{--a} --a
      @cite{--a} '--a'
      @code{--a} --a
      @command{--a} --a
@@ -1491,7 +1491,7 @@ cross ref name: (file name). '@inforef{}' *note ::
      @emph{--a} _--a_
      @env{--a} --a
      @file{--a} --a
-     @i{--a} -a
+     @i{--a} --a
      @kbd{--a} --a
      @key{--a} <--a>
      @math{--a {\frac{1}{2}} @minus{}} --a {\frac{1}{2}} -
@@ -1501,8 +1501,8 @@ cross ref name: (file name). '@inforef{}' *note ::
      @sc{--a} --A
      @strong{--a} *--a*
      @t{--a} --a
-     @sansserif{--a} -a
-     @slanted{--a} -a
+     @sansserif{--a} --a
+     @slanted{--a} --a
      @titlefont{--a}
      -a
      **
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 7f18e2538a..98d89fb0a8 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -4286,7 +4286,7 @@ but , ,
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr 
class="abbr" title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr> (&Eacute;tude 
Autonome)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr>
 <code class="code">@asis{--a}</code> --a
-<code class="code">@b{--a}</code> <b class="b">&ndash;a</b>
+<code class="code">@b{--a}</code> <b class="b">--a</b>
 <code class="code">@cite{--a}</code> <cite class="cite">--a</cite>
 <code class="code">@code{--a}</code> <code class="code">--a</code>
 <code class="code">@command{--a}</code> <code class="command">--a</code>
@@ -4298,7 +4298,7 @@ but , ,
 <code class="code">@emph{--a}</code> <em class="emph">--a</em>
 <code class="code">@env{--a}</code> <code class="env">--a</code>
 <code class="code">@file{--a}</code> <samp class="file">--a</samp>
-<code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
+<code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
 <code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
@@ -4308,8 +4308,8 @@ but , ,
 <code class="code">@sc{--a}</code> <span class="sc">--A</span>
 <code class="code">@strong{--a}</code> <strong class="strong">--a</strong>
 <code class="code">@t{--a}</code> <code class="t">--a</code>
-<code class="code">@sansserif{--a}</code> <span 
class="sansserif">&ndash;a</span>
-<code class="code">@slanted{--a}</code> <i class="slanted">&ndash;a</i>
+<code class="code">@sansserif{--a}</code> <span class="sansserif">--a</span>
+<code class="code">@slanted{--a}</code> <i class="slanted">--a</i>
 <code class="code">@titlefont{--a}</code> </pre><h1 
class="titlefont">--a</h1><pre class="example-preformatted">
 
 <code class="code">@indicateurl{--a}</code> &lsquo;<code 
class="indicateurl">--a</code>&rsquo;
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 02d9800693..cc2be219bb 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -5389,7 +5389,7 @@ but , ,
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr 
class="abbr" title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr> (&Eacute;tude 
Autonome)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr>
 <code class="code">@asis{--a}</code> --a
-<code class="code">@b{--a}</code> <b class="b">&ndash;a</b>
+<code class="code">@b{--a}</code> <b class="b">--a</b>
 <code class="code">@cite{--a}</code> <cite class="cite">--a</cite>
 <code class="code">@code{--a}</code> <code class="code">--a</code>
 <code class="code">@command{--a}</code> <code class="command">--a</code>
@@ -5401,7 +5401,7 @@ but , ,
 <code class="code">@emph{--a}</code> <em class="emph">--a</em>
 <code class="code">@env{--a}</code> <code class="env">--a</code>
 <code class="code">@file{--a}</code> <samp class="file">--a</samp>
-<code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
+<code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
 <code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
@@ -5411,8 +5411,8 @@ but , ,
 <code class="code">@sc{--a}</code> <span class="sc">--A</span>
 <code class="code">@strong{--a}</code> <strong class="strong">--a</strong>
 <code class="code">@t{--a}</code> <code class="t">--a</code>
-<code class="code">@sansserif{--a}</code> <span 
class="sansserif">&ndash;a</span>
-<code class="code">@slanted{--a}</code> <i class="slanted">&ndash;a</i>
+<code class="code">@sansserif{--a}</code> <span class="sansserif">--a</span>
+<code class="code">@slanted{--a}</code> <i class="slanted">--a</i>
 <code class="code">@titlefont{--a}</code> </pre><h1 
class="titlefont">--a</h1><pre class="example-preformatted">
 
 <code class="code">@indicateurl{--a}</code> @<code 
class="indicateurl">--a</code>'&lsquo;
diff --git a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html 
b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
index c8fe59441f..3376df8abc 100644
--- a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
@@ -5389,7 +5389,7 @@ but , ,
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr 
class="abbr" title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr> (&Eacute;tude 
Autonome)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr>
 <code class="code">@asis{--a}</code> --a
-<code class="code">@b{--a}</code> <b class="b">&ndash;a</b>
+<code class="code">@b{--a}</code> <b class="b">--a</b>
 <code class="code">@cite{--a}</code> <cite class="cite">--a</cite>
 <code class="code">@code{--a}</code> <code class="code">--a</code>
 <code class="code">@command{--a}</code> <code class="command">--a</code>
@@ -5401,7 +5401,7 @@ but , ,
 <code class="code">@emph{--a}</code> <em class="emph">--a</em>
 <code class="code">@env{--a}</code> <code class="env">--a</code>
 <code class="code">@file{--a}</code> <samp class="file">--a</samp>
-<code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
+<code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
 <code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <em 
class="math">--a {\frac{1}{2}} -</em>
@@ -5411,8 +5411,8 @@ but , ,
 <code class="code">@sc{--a}</code> <span class="sc">--A</span>
 <code class="code">@strong{--a}</code> <strong class="strong">--a</strong>
 <code class="code">@t{--a}</code> <code class="t">--a</code>
-<code class="code">@sansserif{--a}</code> <span 
class="sansserif">&ndash;a</span>
-<code class="code">@slanted{--a}</code> <i class="slanted">&ndash;a</i>
+<code class="code">@sansserif{--a}</code> <span class="sansserif">--a</span>
+<code class="code">@slanted{--a}</code> <i class="slanted">--a</i>
 <code class="code">@titlefont{--a}</code> </pre><h1 
class="titlefont">--a</h1><pre class="example-preformatted">
 
 <code class="code">@indicateurl{--a}</code> &lsquo;<code 
class="indicateurl">--a</code>&rsquo;
diff --git a/tp/tests/layout/res_parser/formatting_xml/formatting.xml 
b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
index c329e7c39b..42279dd39d 100644
--- a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
@@ -4779,7 +4779,7 @@ but , ,&noeos;
 <code>&arobase;abbr&lbrace;&arobase;'E--. &arobase;comma&lbrace;&rbrace;A., 
&arobase;'Etude Autonome &rbrace;</code> <abbr><abbrword><accent type="acute" 
bracketed="off">E</accent>--. &comma;A.</abbrword><abbrdesc spaces=" "><accent 
type="acute" bracketed="off">E</accent>tude Autonome </abbrdesc></abbr>
 <code>&arobase;abbr&lbrace;&arobase;'E--. 
&arobase;comma&lbrace;&rbrace;A.&rbrace;</code> <abbr><abbrword><accent 
type="acute" bracketed="off">E</accent>--. &comma;A.</abbrword></abbr>
 <code>&arobase;asis&lbrace;--a&rbrace;</code> <asis>--a</asis>
-<code>&arobase;b&lbrace;--a&rbrace;</code> <b>&textndash;a</b>
+<code>&arobase;b&lbrace;--a&rbrace;</code> <b>--a</b>
 <code>&arobase;cite&lbrace;--a&rbrace;</code> <cite>--a</cite>
 <code>&arobase;code&lbrace;--a&rbrace;</code> <code>--a</code>
 <code>&arobase;command&lbrace;--a&rbrace;</code> <command>--a</command>
@@ -4791,7 +4791,7 @@ but , ,&noeos;
 <code>&arobase;emph&lbrace;--a&rbrace;</code> <emph>--a</emph>
 <code>&arobase;env&lbrace;--a&rbrace;</code> <env>--a</env>
 <code>&arobase;file&lbrace;--a&rbrace;</code> <file>--a</file>
-<code>&arobase;i&lbrace;--a&rbrace;</code> <i>&textndash;a</i>
+<code>&arobase;i&lbrace;--a&rbrace;</code> <i>--a</i>
 <code>&arobase;kbd&lbrace;--a&rbrace;</code> <kbd>--a</kbd>
 <code>&arobase;key&lbrace;--a&rbrace;</code> <key>--a</key>
 <code>&arobase;math&lbrace;--a 
&lbrace;\frac&lbrace;1&rbrace;&lbrace;2&rbrace;&rbrace; 
&arobase;minus&lbrace;&rbrace;&rbrace;</code> <math>--a {\frac{1}{2}} 
&minus;</math>
@@ -4801,8 +4801,8 @@ but , ,&noeos;
 <code>&arobase;sc&lbrace;--a&rbrace;</code> <sc>--a</sc>
 <code>&arobase;strong&lbrace;--a&rbrace;</code> <strong>--a</strong>
 <code>&arobase;t&lbrace;--a&rbrace;</code> <t>--a</t>
-<code>&arobase;sansserif&lbrace;--a&rbrace;</code> 
<sansserif>&textndash;a</sansserif>
-<code>&arobase;slanted&lbrace;--a&rbrace;</code> 
<slanted>&textndash;a</slanted>
+<code>&arobase;sansserif&lbrace;--a&rbrace;</code> <sansserif>--a</sansserif>
+<code>&arobase;slanted&lbrace;--a&rbrace;</code> <slanted>--a</slanted>
 <code>&arobase;titlefont&lbrace;--a&rbrace;</code> 
</pre><titlefont>--a</titlefont><pre xml:space="preserve">
 <code>&arobase;indicateurl&lbrace;--a&rbrace;</code> 
<indicateurl>--a</indicateurl>
 <code>&arobase;uref&lbrace;--a,--b&rbrace;</code> 
<uref><urefurl>--a</urefurl><urefdesc>--b</urefdesc></uref>
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 2e6f7418ad..b9fdb54765 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
@@ -3492,7 +3492,7 @@ but , ,
 <code class="code">@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr 
class="abbr" title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr> (&Eacute;tude 
Autonome)
 <code class="code">@abbr{@'E--. @comma{}A.}</code> <abbr class="abbr" 
title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr>
 <code class="code">@asis{--a}</code> --a
-<code class="code">@b{--a}</code> <b class="b">&ndash;a</b>
+<code class="code">@b{--a}</code> <b class="b">--a</b>
 <code class="code">@cite{--a}</code> <cite class="cite">--a</cite>
 <code class="code">@code{--a}</code> <code class="code">--a</code>
 <code class="code">@command{--a}</code> <code class="command">--a</code>
@@ -3504,7 +3504,7 @@ but , ,
 <code class="code">@emph{--a}</code> <em class="emph">--a</em>
 <code class="code">@env{--a}</code> <code class="env">--a</code>
 <code class="code">@file{--a}</code> <samp class="file">--a</samp>
-<code class="code">@i{--a}</code> <i class="i">&ndash;a</i>
+<code class="code">@i{--a}</code> <i class="i">--a</i>
 <code class="code">@kbd{--a}</code> <kbd class="kbd">--a</kbd>
 <code class="code">@key{--a}</code> <kbd class="key">--a</kbd>
 <code class="code">@math{--a {\frac{1}{2}} @minus{}}</code> <!-- MATH
@@ -3519,8 +3519,8 @@ but , ,
 <code class="code">@sc{--a}</code> <span class="sc">--A</span>
 <code class="code">@strong{--a}</code> <strong class="strong">--a</strong>
 <code class="code">@t{--a}</code> <code class="t">--a</code>
-<code class="code">@sansserif{--a}</code> <span 
class="sansserif">&ndash;a</span>
-<code class="code">@slanted{--a}</code> <i class="slanted">&ndash;a</i>
+<code class="code">@sansserif{--a}</code> <span class="sansserif">--a</span>
+<code class="code">@slanted{--a}</code> <i class="slanted">--a</i>
 <code class="code">@titlefont{--a}</code> </pre><h1 
class="titlefont">--a</h1><pre class="example-preformatted">
 
 <code class="code">@indicateurl{--a}</code> &lsquo;<code 
class="indicateurl">--a</code>&rsquo;