texinfo-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: <code> for @verb

From: Gavin D. Smith
Subject: branch master updated: <code> for @verb
Date: Sun, 10 Apr 2022 07:20:59 -0400 
This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new df7e29c799 <code> for @verb
df7e29c799 is described below

commit df7e29c799812cb8b924817718e49bb2b9992544
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Apr 10 12:20:47 2022 +0100

    <code> for @verb
    
    * tp/Texinfo/Convert/HTML.pm (%style_attribute_commands):
    Output @verb with <code> instead of <tt>.
    * NEWS: Mention.
    
    @verb is a rarely used command and this was one of the last uses
    of non-HTML5 tags.
---
 ChangeLog                                            | 11 +++++++++++
 NEWS                                                 |  2 +-
 tp/Texinfo/Convert/HTML.pm                           |  2 +-
 .../converters_tests/spaces_in_empty_node_names.pl   |  2 +-
 .../results/converters_tests/spaces_in_node_names.pl |  4 ++--
 tp/t/results/coverage_braces/empty_commands.pl       |  2 +-
 tp/t/results/coverage_braces/nested_in_sc.pl         |  2 +-
 tp/t/results/coverage_braces/verb_in_xref.pl         |  4 ++--
 tp/t/results/float/complex_float.pl                  | 10 +++++-----
 .../results/formats_encodings/at_commands_in_refs.pl | 10 +++++-----
 .../res_html/-_0040-_007b_007d-_002e-.html           |  2 +-
 ...ite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html |  2 +-
 .../res_html/f_002d_002dile1-f_002d_002dile.html     |  2 +-
 ...re_005faaa-url-_002fman_002ecgi_002f1_002fls.html |  2 +-
 .../at_commands_in_refs_latin1/res_html/index.html   |  2 +-
 .../res_html/-_0040-_007b_007d-_002e-.html           |  2 +-
 ...ite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html |  2 +-
 .../res_html/f_002d_002dile1-f_002d_002dile.html     |  2 +-
 ...re_005faaa-url-_002fman_002ecgi_002f1_002fls.html |  2 +-
 .../at_commands_in_refs_utf8/res_html/index.html     |  2 +-
 tp/t/results/html_tests/xml_protected_in_verb.pl     |  2 +-
 .../htmlxref/htmlxref/res_html/test_refs.html        | 20 ++++++++++----------
 .../htmlxref/htmlxref_nodes/res_html/index.html      | 18 +++++++++---------
 .../htmlxref_nodes/res_html/other-nodes.html         |  2 +-
 .../htmlxref_only_mono/res_html/test_refs.html       | 20 ++++++++++----------
 .../htmlxref_only_mono_nodes/res_html/index.html     | 18 +++++++++---------
 .../res_html/other-nodes.html                        |  2 +-
 .../htmlxref_only_split/res_html/test_refs.html      | 20 ++++++++++----------
 .../htmlxref_only_split_nodes/res_html/index.html    | 18 +++++++++---------
 .../res_html/other-nodes.html                        |  2 +-
 tp/t/results/menu/verb_in_menu_description.pl        |  4 ++--
 .../formatting/res_parser/cpp_lines/cpp_lines.html   |  4 ++--
 .../layout/res_parser/formatting/formatting.html     | 20 ++++++++++----------
 .../layout/res_parser/formatting_chm/chapter.html    | 12 ++++++------
 .../layout/res_parser/formatting_chm/formatting.html |  8 ++++----
 .../formatting_enable_encoding/formatting.html       | 20 ++++++++++----------
 .../EPUB/xhtml/formatting.xhtml                      | 20 ++++++++++----------
 .../formatting_epub_package/EPUB/xhtml/chapter.xhtml | 12 ++++++------
 .../EPUB/xhtml/formatting.xhtml                      |  8 ++++----
 .../layout/res_parser/formatting_exotic/chapter.html | 12 ++++++------
 .../res_parser/formatting_fr_icons/formatting.html   | 20 ++++++++++----------
 .../res_parser/formatting_html/formatting.html       | 20 ++++++++++----------
 .../res_parser/formatting_html32/formatting.html     | 20 ++++++++++----------
 .../formatting_html_no_texi2html/formatting.html     | 12 ++++++------
 .../res_parser/formatting_html_nodes/chapter.html    | 12 ++++++------
 .../res_parser/formatting_html_nodes/index.html      |  8 ++++----
 .../res_parser/formatting_inline_css/formatting.html | 20 ++++++++++----------
 .../res_parser/formatting_mathjax/formatting.html    | 20 ++++++++++----------
 .../layout/res_parser/formatting_nodes/chapter.html  | 12 ++++++------
 .../layout/res_parser/formatting_nodes/index.html    |  8 ++++----
 .../formatting_numerical_entities/formatting.html    | 20 ++++++++++----------
 .../formatting_regions/formatting_regions.html       | 20 ++++++++++----------
 .../formatting_weird_quotes/formatting.html          | 20 ++++++++++----------
 .../res_parser/formatting_xhtml/formatting.html      | 20 ++++++++++----------
 54 files changed, 277 insertions(+), 266 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7388dd5475..aa3fc52e54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2022-04-10  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       <code> for @verb
+
+       * tp/Texinfo/Convert/HTML.pm (%style_attribute_commands):
+       Output @verb with <code> instead of <tt>.
+       * NEWS: Mention.
+
+       @verb is a rarely used command and this was one of the last uses
+       of non-HTML5 tags.
+
 2022-04-10  Gavin Smith  <gavinsmith0123@gmail.com>
 
        * doc/texinfo.texi (Fonts): More on possible uses for @t.
diff --git a/NEWS b/NEWS
index 64209f10e5..bb997cf91a 100644
--- a/NEWS
+++ b/NEWS
@@ -33,7 +33,7 @@ See the manual for detailed information.
      . output only the CSS rules that are needed in an output file
      . remove CSS_LINES variable and add SHOW_BUILTIN_CSS_RULES.
        (custom CSS can still be output using EXTRA_HEAD.)
-     . use <code> tag for the output of @t instead of <tt>
+     . use <code> tag for the output of @t and @verb instead of <tt>
      . systematic addition of classes attribute in HTML elements based on the
        Texinfo @-command names.  Renaming of class attributes to avoid
        confusion with @-commands formatting and describe the role in the
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 949075a918..7f30a8eafa 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -2437,7 +2437,7 @@ $style_commands_element{'normal'} = {
       'sup'         => 'sup',
       't'           => 'code',
       'var'         => 'var',
-      'verb'        => 'tt',
+      'verb'        => 'code',
 };
 
 my %style_commands_formatting;
diff --git a/tp/t/results/converters_tests/spaces_in_empty_node_names.pl 
b/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
index 621e06a9a4..e188378127 100644
--- a/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
@@ -973,7 +973,7 @@ 
$result_converted{'html_text'}->{'spaces_in_empty_node_names'} = '<a class="node
 
 <p>&lsquo;&nbsp;&nbsp;&rsquo;
 </p>
-<p>&lsquo;<tt class="verb">  </tt>&rsquo;
+<p>&lsquo;<code class="verb">  </code>&rsquo;
 </p>
 <p>&lsquo;&nbsp;&nbsp;<!-- /@w -->&rsquo;
 </p>';
diff --git a/tp/t/results/converters_tests/spaces_in_node_names.pl 
b/tp/t/results/converters_tests/spaces_in_node_names.pl
index ae5fca994d..f9edc908ac 100644
--- a/tp/t/results/converters_tests/spaces_in_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_node_names.pl
@@ -1070,7 +1070,7 @@ $result_converted{'html_text'}->{'spaces_in_node_names'} 
= '<a class="node-id" i
 <p>
  &nbsp; </p>
 </div>
-<h4 class="node">b<tt class="verb">  </tt></h4>
+<h4 class="node">b<code class="verb">  </code></h4>
 
 <hr>
 <a class="node-id" id="c-"></a><div class="nav-panel">
@@ -1081,7 +1081,7 @@ $result_converted{'html_text'}->{'spaces_in_node_names'} 
= '<a class="node-id" i
 
 <p><a class="ref" href="#a--">a&nbsp;&nbsp;</a>
 </p>
-<p><a class="ref" href="#b-">b<tt class="verb">  </tt></a>
+<p><a class="ref" href="#b-">b<code class="verb">  </code></a>
 </p>
 <p><a class="ref" href="#c-">c&nbsp;&nbsp;<!-- /@w --></a>
 </p>';
diff --git a/tp/t/results/coverage_braces/empty_commands.pl 
b/tp/t/results/coverage_braces/empty_commands.pl
index ef00fea384..9b9558fa96 100644
--- a/tp/t/results/coverage_braces/empty_commands.pl
+++ b/tp/t/results/coverage_braces/empty_commands.pl
@@ -287,7 +287,7 @@ $result_converted{'plaintext'}->{'empty_commands'} = '
 
 $result_converted{'html_text'}->{'empty_commands'} = '
 
-<p> <abbr class="abbr"></abbr>  <code class="code"></code><a class="footnote" 
id="DOCF1" href="#FOOT1"><sup>1</sup></a> &#771;  <tt class="verb"></tt>
+<p> <abbr class="abbr"></abbr>  <code class="code"></code><a class="footnote" 
id="DOCF1" href="#FOOT1"><sup>1</sup></a> &#771;  <code class="verb"></code>
 </p><div class="footnotes-segment">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
diff --git a/tp/t/results/coverage_braces/nested_in_sc.pl 
b/tp/t/results/coverage_braces/nested_in_sc.pl
index 94a394f09e..924204957f 100644
--- a/tp/t/results/coverage_braces/nested_in_sc.pl
+++ b/tp/t/results/coverage_braces/nested_in_sc.pl
@@ -341,7 +341,7 @@ $result_converted{'plaintext'}->{'nested_in_sc'} = 'AAA Ñ Å 
TeX Å̃ (1), ABR
 
 
 $result_converted{'html_text'}->{'nested_in_sc'} = '<p><small 
class="sc"><small class="sc">AAA &Ntilde; &Aring; TeX &Aring;&#771; <a 
class="footnote" id="DOCF1" href="#FOOT1"><sup>1</sup></a>, <abbr class="abbr" 
title="expl">ABR</abbr> (EXPL), 
-<tt class="verb">in verb</tt></small></small>
+<code class="verb">in verb</code></small></small>
 </p><div class="footnotes-segment">
 <hr>
 <h4 class="footnotes-heading">Footnotes</h4>
diff --git a/tp/t/results/coverage_braces/verb_in_xref.pl 
b/tp/t/results/coverage_braces/verb_in_xref.pl
index 5fa68a763e..d108b396d9 100644
--- a/tp/t/results/coverage_braces/verb_in_xref.pl
+++ b/tp/t/results/coverage_braces/verb_in_xref.pl
@@ -233,10 +233,10 @@ ggg : Top.
 
 $result_converted{'html_text'}->{'verb_in_xref'} = '<h1 class="node" 
id="Top">Top</h1>
 
-<p>See <a class="xref" href="#Top"><tt class="verb">with
+<p>See <a class="xref" href="#Top"><code class="verb">with
 verb
 
-ggg </tt></a>.
+ggg </code></a>.
 </p>';
 
 1;
diff --git a/tp/t/results/float/complex_float.pl 
b/tp/t/results/float/complex_float.pl
index d48b86274b..b735a1ba1a 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -4888,7 +4888,7 @@ Next: <a href="#chapter" accesskey="n" rel="next">A 
chapter</a> &nbsp; </p>
 
 <p>A list of floats at the beginning.
 </p><dl class="listoffloats">
-<dt><a href="#text-with-a-lot-of-features">Text 1</a></dt><dd 
class="shortcaption-in-listoffloats"><p>TeX and <em class="emph"><b 
class="b">t&eacute;&icirc;</b><a class="url" href="an_url">an_url</a></em> 
<small class="sc">AND</small> <tt class="verb">it is @verb</tt> &nbsp;a word !@ 
&AElig;.</p></dd>
+<dt><a href="#text-with-a-lot-of-features">Text 1</a></dt><dd 
class="shortcaption-in-listoffloats"><p>TeX and <em class="emph"><b 
class="b">t&eacute;&icirc;</b><a class="url" href="an_url">an_url</a></em> 
<small class="sc">AND</small> <code class="verb">it is @verb</code> &nbsp;a 
word !@ &AElig;.</p></dd>
 <dt><a href="#float-with-a-lot-of-features-and-no-shortcaption">Text 
1.1</a></dt><dd class="caption-in-listoffloats"><p>An example of float 
caption<small class="enddots">...</small> 2
 An example 2.
 </p><div class="example">
@@ -4922,7 +4922,7 @@ See <a class="xref" href="#Top">xref Text with features 
caption</a>.
 A footnote 2.
 <a class="footnote" id="t_flistoffloats_DOCF3_1" 
href="#t_flistoffloats_FOOT3_1"><sup>1</sup></a>.
 </p>
-<p>TeX and <em class="emph"><b class="b">t&eacute;&icirc;</b><a class="url" 
href="an_url">an_url</a></em> <small class="sc">AND</small> <tt class="verb">it 
is @verb</tt> &nbsp;a word !@ &AElig;.
+<p>TeX and <em class="emph"><b class="b">t&eacute;&icirc;</b><a class="url" 
href="an_url">an_url</a></em> <small class="sc">AND</small> <code 
class="verb">it is @verb</code> &nbsp;a word !@ &AElig;.
 </p></dd>
 </dl>
 
@@ -4953,7 +4953,7 @@ See <a class="xref" href="#Top">xref Text with 
features</a>.
 A footnote.
 <a class="footnote" id="DOCF1" href="#FOOT1"><sup>2</sup></a>.
 </p>
-<p>TeX and <em class="emph"><b class="b">t&eacute;&icirc;</b><a class="url" 
href="an_url">an_url</a></em> <small class="sc">AND</small> <tt class="verb">it 
is @verb</tt> &nbsp;a word !@ &AElig;.
+<p>TeX and <em class="emph"><b class="b">t&eacute;&icirc;</b><a class="url" 
href="an_url">an_url</a></em> <small class="sc">AND</small> <code 
class="verb">it is @verb</code> &nbsp;a word !@ &AElig;.
 </p>
 
 
@@ -4993,7 +4993,7 @@ See <a class="xref" href="#Top">xref Text with features 
caption</a>.
 A footnote.
 <a class="footnote" id="DOCF2" href="#FOOT2"><sup>3</sup></a>.
 </p>
-<p>TeX and <em class="emph"><b class="b">t&eacute;&icirc;</b><a class="url" 
href="an_url">an_url</a></em> <small class="sc">AND</small> <tt class="verb">it 
is @verb</tt> &nbsp;a word !@ &AElig;.
+<p>TeX and <em class="emph"><b class="b">t&eacute;&icirc;</b><a class="url" 
href="an_url">an_url</a></em> <small class="sc">AND</small> <code 
class="verb">it is @verb</code> &nbsp;a word !@ &AElig;.
 </p></div></div>
 <ul class="mini-toc">
 <li><a href="#chapter" accesskey="1">A chapter</a></li>
@@ -5046,7 +5046,7 @@ See <a class="xref" href="#Top">xref Text with features 
caption</a>.
 A footnote 2.
 <a class="footnote" id="DOCF3" href="#FOOT3"><sup>4</sup></a>.
 </p>
-<p>TeX and <em class="emph"><b class="b">t&eacute;&icirc;</b><a class="url" 
href="an_url">an_url</a></em> <small class="sc">AND</small> <tt class="verb">it 
is @verb</tt> &nbsp;a word !@ &AElig;.
+<p>TeX and <em class="emph"><b class="b">t&eacute;&icirc;</b><a class="url" 
href="an_url">an_url</a></em> <small class="sc">AND</small> <code 
class="verb">it is @verb</code> &nbsp;a word !@ &AElig;.
 </p></div></div>
 <p>See <a class="xref" href="#text-with-a-lot-of-features">Text 1</a>.
 </p>
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs.pl 
b/tp/t/results/formats_encodings/at_commands_in_refs.pl
index 1165790d21..e8ec6862b2 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -22870,7 +22870,7 @@ Next: <a href="#-_007b-_007d" accesskey="n" rel="next"> 
{ }</a> &nbsp; </p>
 <li><a href="#CCC-CCC-DDD"><abbr class="abbr" title="rrr">CCC</abbr> (rrr) 
<abbr class="abbr" title="rrr">CCC</abbr> <abbr class="abbr">DDD</abbr></a></li>
 <li><a href="#someone_0040somewher-no_005fexplain_0040there"><a class="email" 
href="mailto:someone@somewher";>the someone</a> <a class="email" 
href="mailto:no_explain@there";>no_explain@there</a></a></li>
 <li><a href="#f_002d_002dile1-f_002d_002dile"><img class="image" 
src="f--ile1.jpg" alt="f--ile1">  <img class="image" src="f--ile.png" 
alt="alt"></a></li>
-<li><a href="#-_0040-_007b_007d-_002e-"><tt class="verb"> @ {} . </tt></a></li>
+<li><a href="#-_0040-_007b_007d-_002e-"><code class="verb"> @ {} . 
</code></a></li>
 <li><a href="#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"><cite 
class="cite">cite asis</cite> in&nbsp;@w&nbsp;<b class="b">b</b><!-- /@w --> 
<span class="r">in r</span> <small class="sc">SC</small> <strong 
class="strong">str</strong> <code class="t">t</code> <var class="var">var</var> 
<em class="dfn">dfn</em> <i class="i">i</i></a></li>
 <li><a href="#env-code-option-samp-command-file-C_002dx-ESC"><code 
class="env">env</code> <code class="code">code</code> <samp 
class="option">option</samp> &lsquo;<samp class="samp">samp</samp>&rsquo; <code 
class="command">command</code> <samp class="file">file</samp> <kbd 
class="kbd">C-x <kbd class="key">ESC</kbd></kbd></a></li>
 <li><a href="#g_t8_002e27in">8.27<span class="dmn">in</span></a></li>
@@ -23045,7 +23045,7 @@ Next: <a href="#f_002d_002dile1-f_002d_002dile" 
accesskey="n" rel="next"><img cl
 <div class="chapter-level-extent" id="f_002d_002dile1-f_002d_002dile">
 <div class="nav-panel">
 <p>
-Next: <a href="#-_0040-_007b_007d-_002e-" accesskey="n" rel="next"><tt 
class="verb"> @ {} . </tt></a>, Previous: <a 
href="#someone_0040somewher-no_005fexplain_0040there" accesskey="p" 
rel="prev"><a class="email" href="mailto:someone@somewher";>the someone</a> <a 
class="email" href="mailto:no_explain@there";>no_explain@there</a></a>, Up: <a 
href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="#-_0040-_007b_007d-_002e-" accesskey="n" rel="next"><code 
class="verb"> @ {} . </code></a>, Previous: <a 
href="#someone_0040somewher-no_005fexplain_0040there" accesskey="p" 
rel="prev"><a class="email" href="mailto:someone@somewher";>the someone</a> <a 
class="email" href="mailto:no_explain@there";>no_explain@there</a></a>, Up: <a 
href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <h2 class="chapter" id="f_002d_002dile1-f_002d_002dile-1">19 <img 
class="image" src="f--ile1.jpg" alt="f--ile1">  <img class="image" 
src="f--ile.png" alt="alt"></h2>
 
@@ -23056,14 +23056,14 @@ Next: <a href="#-_0040-_007b_007d-_002e-" 
accesskey="n" rel="next"><tt class="ve
 <p>
 Next: <a href="#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i" accesskey="n" 
rel="next"><cite class="cite">cite asis</cite> in&nbsp;@w&nbsp;<b 
class="b">b</b><!-- /@w --> <span class="r">in r</span> <small 
class="sc">SC</small> <strong class="strong">str</strong> <code 
class="t">t</code> <var class="var">var</var> <em class="dfn">dfn</em> <i 
class="i">i</i></a>, Previous: <a href="#f_002d_002dile1-f_002d_002dile" 
accesskey="p" rel="prev"><img class="image" src="f--ile1.jpg" alt="f--ile1" 
[...]
 </div>
-<h2 class="chapter" id="-_0040-_007b_007d-_002e--1">20 <tt class="verb"> @ {} 
. </tt></h2>
+<h2 class="chapter" id="-_0040-_007b_007d-_002e--1">20 <code class="verb"> @ 
{} . </code></h2>
 
 <hr>
 </div>
 <div class="chapter-level-extent" 
id="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i">
 <div class="nav-panel">
 <p>
-Next: <a href="#env-code-option-samp-command-file-C_002dx-ESC" accesskey="n" 
rel="next"><code class="env">env</code> <code class="code">code</code> <samp 
class="option">option</samp> &lsquo;<samp class="samp">samp</samp>&rsquo; <code 
class="command">command</code> <samp class="file">file</samp> <kbd 
class="kbd">C-x <kbd class="key">ESC</kbd></kbd></a>, Previous: <a 
href="#-_0040-_007b_007d-_002e-" accesskey="p" rel="prev"><tt class="verb"> @ 
{} . </tt></a>, Up: <a href="#Top" accesskey=" [...]
+Next: <a href="#env-code-option-samp-command-file-C_002dx-ESC" accesskey="n" 
rel="next"><code class="env">env</code> <code class="code">code</code> <samp 
class="option">option</samp> &lsquo;<samp class="samp">samp</samp>&rsquo; <code 
class="command">command</code> <samp class="file">file</samp> <kbd 
class="kbd">C-x <kbd class="key">ESC</kbd></kbd></a>, Previous: <a 
href="#-_0040-_007b_007d-_002e-" accesskey="p" rel="prev"><code class="verb"> @ 
{} . </code></a>, Up: <a href="#Top" accessk [...]
 </div>
 <h2 class="chapter" id="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i-1">21 
<cite class="cite">cite asis</cite> in&nbsp;@w&nbsp;<b class="b">b</b><!-- /@w 
--> <span class="r">in r</span> <small class="sc">SC</small> <strong 
class="strong">str</strong> <code class="t">t</code> <var class="var">var</var> 
<em class="dfn">dfn</em> <i class="i">i</i></h2>
 
@@ -23159,7 +23159,7 @@ Previous: <a href="#gH-3rd" accesskey="p" 
rel="prev"><sub class="sub">g</sub>H 3
 </p>
 <p><a class="ref" href="#f_002d_002dile1-f_002d_002dile"><img class="image" 
src="f--ile1.jpg" alt="f--ile1">  <img class="image" src="f--ile.png" 
alt="alt"></a>
 </p>
-<p><a class="ref" href="#-_0040-_007b_007d-_002e-"><tt class="verb"> @ {} . 
</tt></a>
+<p><a class="ref" href="#-_0040-_007b_007d-_002e-"><code class="verb"> @ {} . 
</code></a>
 </p>
 <p><a class="ref" href="#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"><cite 
class="cite">cite asis</cite> in&nbsp;@w&nbsp;<b class="b">b</b><!-- /@w --> 
<span class="r">in r</span> <small class="sc">SC</small> <strong 
class="strong">str</strong> <code class="t">t</code> <var class="var">var</var> 
<em class="dfn">dfn</em> <i class="i">i</i></a>
 </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/-_0040-_007b_007d-_002e-.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/-_0040-_007b_007d-_002e-.html
index c8db770af6..f7f8bfc17a 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/-_0040-_007b_007d-_002e-.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/-_0040-_007b_007d-_002e-.html
@@ -31,7 +31,7 @@ span.r {font-family: initial; font-weight: normal}
 Next: <a href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html" 
accesskey="n" rel="next"><cite class="cite">cite asis</cite> in&nbsp;@w&nbsp;<b 
class="b">b</b><!-- /@w --> <span class="r">in r</span> <small 
class="sc">SC</small> <strong class="strong">str</strong> <code 
class="t">t</code> <var class="var">var</var> <em class="dfn">dfn</em> <i 
class="i">i</i></a>, Previous: <a href="f_002d_002dile1-f_002d_002dile.html" 
accesskey="p" rel="prev"><img class="image" src="f--ile1.jpg" alt=" [...]
 </div>
 <hr>
-<h2 class="chapter" id="-_0040-_007b_007d-_002e--1">20 <tt class="verb"> @ {} 
. </tt></h2>
+<h2 class="chapter" id="-_0040-_007b_007d-_002e--1">20 <code class="verb"> @ 
{} . </code></h2>
 
 </div>
 
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
index ff5751513c..8b4f1e365e 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
@@ -30,7 +30,7 @@ span.r {font-family: initial; font-weight: normal}
 <div class="chapter-level-extent" 
id="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i">
 <div class="nav-panel">
 <p>
-Next: <a href="env-code-option-samp-command-file-C_002dx-ESC.html" 
accesskey="n" rel="next"><code class="env">env</code> <code 
class="code">code</code> <samp class="option">option</samp> &lsquo;<samp 
class="samp">samp</samp>&rsquo; <code class="command">command</code> <samp 
class="file">file</samp> <kbd class="kbd">C-x <kbd 
class="key">ESC</kbd></kbd></a>, Previous: <a 
href="-_0040-_007b_007d-_002e-.html" accesskey="p" rel="prev"><tt class="verb"> 
@ {} . </tt></a>, Up: <a href="index.htm [...]
+Next: <a href="env-code-option-samp-command-file-C_002dx-ESC.html" 
accesskey="n" rel="next"><code class="env">env</code> <code 
class="code">code</code> <samp class="option">option</samp> &lsquo;<samp 
class="samp">samp</samp>&rsquo; <code class="command">command</code> <samp 
class="file">file</samp> <kbd class="kbd">C-x <kbd 
class="key">ESC</kbd></kbd></a>, Previous: <a 
href="-_0040-_007b_007d-_002e-.html" accesskey="p" rel="prev"><code 
class="verb"> @ {} . </code></a>, Up: <a href="index [...]
 </div>
 <hr>
 <h2 class="chapter" id="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i-1">21 
<cite class="cite">cite asis</cite> in&nbsp;@w&nbsp;<b class="b">b</b><!-- /@w 
--> <span class="r">in r</span> <small class="sc">SC</small> <strong 
class="strong">str</strong> <code class="t">t</code> <var class="var">var</var> 
<em class="dfn">dfn</em> <i class="i">i</i></h2>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/f_002d_002dile1-f_002d_002dile.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/f_002d_002dile1-f_002d_002dile.html
index b04be993c5..f4aa29df9a 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/f_002d_002dile1-f_002d_002dile.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/f_002d_002dile1-f_002d_002dile.html
@@ -23,7 +23,7 @@
 <div class="chapter-level-extent" id="f_002d_002dile1-f_002d_002dile">
 <div class="nav-panel">
 <p>
-Next: <a href="-_0040-_007b_007d-_002e-.html" accesskey="n" rel="next"><tt 
class="verb"> @ {} . </tt></a>, Previous: <a 
href="someone_0040somewher-no_005fexplain_0040there.html" accesskey="p" 
rel="prev"><a class="email" href="mailto:someone@somewher";>the someone</a> <a 
class="email" href="mailto:no_explain@there";>no_explain@there</a></a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="-_0040-_007b_007d-_002e-.html" accesskey="n" rel="next"><code 
class="verb"> @ {} . </code></a>, Previous: <a 
href="someone_0040somewher-no_005fexplain_0040there.html" accesskey="p" 
rel="prev"><a class="email" href="mailto:someone@somewher";>the someone</a> <a 
class="email" href="mailto:no_explain@there";>no_explain@there</a></a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
 <h2 class="chapter" id="f_002d_002dile1-f_002d_002dile-1">19 <img 
class="image" src="f--ile1.jpg" alt="f--ile1">  <img class="image" 
src="f--ile.png" alt="alt"></h2>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
index aa024909d1..3337db77b6 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
@@ -73,7 +73,7 @@ Previous: <a href="gH-3rd.html" accesskey="p" rel="prev"><sub 
class="sub">g</sub
 </p>
 <p><a class="ref" href="f_002d_002dile1-f_002d_002dile.html"><img 
class="image" src="f--ile1.jpg" alt="f--ile1">  <img class="image" 
src="f--ile.png" alt="alt"></a>
 </p>
-<p><a class="ref" href="-_0040-_007b_007d-_002e-.html"><tt class="verb"> @ {} 
. </tt></a>
+<p><a class="ref" href="-_0040-_007b_007d-_002e-.html"><code class="verb"> @ 
{} . </code></a>
 </p>
 <p><a class="ref" 
href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html"><cite 
class="cite">cite asis</cite> in&nbsp;@w&nbsp;<b class="b">b</b><!-- /@w --> 
<span class="r">in r</span> <small class="sc">SC</small> <strong 
class="strong">str</strong> <code class="t">t</code> <var class="var">var</var> 
<em class="dfn">dfn</em> <i class="i">i</i></a>
 </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/index.html 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/index.html
index 159befefbc..8ab1e7afdd 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/index.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_html/index.html
@@ -56,7 +56,7 @@ Next: <a href="-_007b-_007d.html" accesskey="n" rel="next"> { 
}</a> &nbsp; </p>
 <li><a href="CCC-CCC-DDD.html"><abbr class="abbr" title="rrr">CCC</abbr> (rrr) 
<abbr class="abbr" title="rrr">CCC</abbr> <abbr class="abbr">DDD</abbr></a></li>
 <li><a href="someone_0040somewher-no_005fexplain_0040there.html"><a 
class="email" href="mailto:someone@somewher";>the someone</a> <a class="email" 
href="mailto:no_explain@there";>no_explain@there</a></a></li>
 <li><a href="f_002d_002dile1-f_002d_002dile.html"><img class="image" 
src="f--ile1.jpg" alt="f--ile1">  <img class="image" src="f--ile.png" 
alt="alt"></a></li>
-<li><a href="-_0040-_007b_007d-_002e-.html"><tt class="verb"> @ {} . 
</tt></a></li>
+<li><a href="-_0040-_007b_007d-_002e-.html"><code class="verb"> @ {} . 
</code></a></li>
 <li><a href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html"><cite 
class="cite">cite asis</cite> in&nbsp;@w&nbsp;<b class="b">b</b><!-- /@w --> 
<span class="r">in r</span> <small class="sc">SC</small> <strong 
class="strong">str</strong> <code class="t">t</code> <var class="var">var</var> 
<em class="dfn">dfn</em> <i class="i">i</i></a></li>
 <li><a href="env-code-option-samp-command-file-C_002dx-ESC.html"><code 
class="env">env</code> <code class="code">code</code> <samp 
class="option">option</samp> &lsquo;<samp class="samp">samp</samp>&rsquo; <code 
class="command">command</code> <samp class="file">file</samp> <kbd 
class="kbd">C-x <kbd class="key">ESC</kbd></kbd></a></li>
 <li><a href="8_002e27in.html">8.27<span class="dmn">in</span></a></li>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/-_0040-_007b_007d-_002e-.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/-_0040-_007b_007d-_002e-.html
index bab0ac0832..2698b81f85 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/-_0040-_007b_007d-_002e-.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/-_0040-_007b_007d-_002e-.html
@@ -31,7 +31,7 @@ span.r {font-family: initial; font-weight: normal}
 Next: <a href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html" 
accesskey="n" rel="next"><cite class="cite">cite asis</cite> in&nbsp;@w&nbsp;<b 
class="b">b</b><!-- /@w --> <span class="r">in r</span> <small 
class="sc">SC</small> <strong class="strong">str</strong> <code 
class="t">t</code> <var class="var">var</var> <em class="dfn">dfn</em> <i 
class="i">i</i></a>, Previous: <a href="f_002d_002dile1-f_002d_002dile.html" 
accesskey="p" rel="prev"><img class="image" src="f--ile1.jpg" alt=" [...]
 </div>
 <hr>
-<h2 class="chapter" id="-_0040-_007b_007d-_002e--1">20 <tt class="verb"> @ {} 
. </tt></h2>
+<h2 class="chapter" id="-_0040-_007b_007d-_002e--1">20 <code class="verb"> @ 
{} . </code></h2>
 
 </div>
 
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
index 836657c4e2..93260fb410 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
@@ -30,7 +30,7 @@ span.r {font-family: initial; font-weight: normal}
 <div class="chapter-level-extent" 
id="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i">
 <div class="nav-panel">
 <p>
-Next: <a href="env-code-option-samp-command-file-C_002dx-ESC.html" 
accesskey="n" rel="next"><code class="env">env</code> <code 
class="code">code</code> <samp class="option">option</samp> &lsquo;<samp 
class="samp">samp</samp>&rsquo; <code class="command">command</code> <samp 
class="file">file</samp> <kbd class="kbd">C-x <kbd 
class="key">ESC</kbd></kbd></a>, Previous: <a 
href="-_0040-_007b_007d-_002e-.html" accesskey="p" rel="prev"><tt class="verb"> 
@ {} . </tt></a>, Up: <a href="index.htm [...]
+Next: <a href="env-code-option-samp-command-file-C_002dx-ESC.html" 
accesskey="n" rel="next"><code class="env">env</code> <code 
class="code">code</code> <samp class="option">option</samp> &lsquo;<samp 
class="samp">samp</samp>&rsquo; <code class="command">command</code> <samp 
class="file">file</samp> <kbd class="kbd">C-x <kbd 
class="key">ESC</kbd></kbd></a>, Previous: <a 
href="-_0040-_007b_007d-_002e-.html" accesskey="p" rel="prev"><code 
class="verb"> @ {} . </code></a>, Up: <a href="index [...]
 </div>
 <hr>
 <h2 class="chapter" id="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i-1">21 
<cite class="cite">cite asis</cite> in&nbsp;@w&nbsp;<b class="b">b</b><!-- /@w 
--> <span class="r">in r</span> <small class="sc">SC</small> <strong 
class="strong">str</strong> <code class="t">t</code> <var class="var">var</var> 
<em class="dfn">dfn</em> <i class="i">i</i></h2>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/f_002d_002dile1-f_002d_002dile.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/f_002d_002dile1-f_002d_002dile.html
index 418b51099b..6241cf6a1c 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/f_002d_002dile1-f_002d_002dile.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/f_002d_002dile1-f_002d_002dile.html
@@ -23,7 +23,7 @@
 <div class="chapter-level-extent" id="f_002d_002dile1-f_002d_002dile">
 <div class="nav-panel">
 <p>
-Next: <a href="-_0040-_007b_007d-_002e-.html" accesskey="n" rel="next"><tt 
class="verb"> @ {} . </tt></a>, Previous: <a 
href="someone_0040somewher-no_005fexplain_0040there.html" accesskey="p" 
rel="prev"><a class="email" href="mailto:someone@somewher";>the someone</a> <a 
class="email" href="mailto:no_explain@there";>no_explain@there</a></a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="-_0040-_007b_007d-_002e-.html" accesskey="n" rel="next"><code 
class="verb"> @ {} . </code></a>, Previous: <a 
href="someone_0040somewher-no_005fexplain_0040there.html" accesskey="p" 
rel="prev"><a class="email" href="mailto:someone@somewher";>the someone</a> <a 
class="email" href="mailto:no_explain@there";>no_explain@there</a></a>, Up: <a 
href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
 <h2 class="chapter" id="f_002d_002dile1-f_002d_002dile-1">19 <img 
class="image" src="f--ile1.jpg" alt="f--ile1">  <img class="image" 
src="f--ile.png" alt="alt"></h2>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
index 1342833ada..aab879b6d5 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
@@ -73,7 +73,7 @@ Previous: <a href="gH-3rd.html" accesskey="p" rel="prev"><sub 
class="sub">g</sub
 </p>
 <p><a class="ref" href="f_002d_002dile1-f_002d_002dile.html"><img 
class="image" src="f--ile1.jpg" alt="f--ile1">  <img class="image" 
src="f--ile.png" alt="alt"></a>
 </p>
-<p><a class="ref" href="-_0040-_007b_007d-_002e-.html"><tt class="verb"> @ {} 
. </tt></a>
+<p><a class="ref" href="-_0040-_007b_007d-_002e-.html"><code class="verb"> @ 
{} . </code></a>
 </p>
 <p><a class="ref" 
href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html"><cite 
class="cite">cite asis</cite> in&nbsp;@w&nbsp;<b class="b">b</b><!-- /@w --> 
<span class="r">in r</span> <small class="sc">SC</small> <strong 
class="strong">str</strong> <code class="t">t</code> <var class="var">var</var> 
<em class="dfn">dfn</em> <i class="i">i</i></a>
 </p>
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/index.html 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/index.html
index 5a7cd9959f..4a4bd1c7ca 100644
--- 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/index.html
+++ 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_html/index.html
@@ -56,7 +56,7 @@ Next: <a href="-_007b-_007d.html" accesskey="n" rel="next"> { 
}</a> &nbsp; </p>
 <li><a href="CCC-CCC-DDD.html"><abbr class="abbr" title="rrr">CCC</abbr> (rrr) 
<abbr class="abbr" title="rrr">CCC</abbr> <abbr class="abbr">DDD</abbr></a></li>
 <li><a href="someone_0040somewher-no_005fexplain_0040there.html"><a 
class="email" href="mailto:someone@somewher";>the someone</a> <a class="email" 
href="mailto:no_explain@there";>no_explain@there</a></a></li>
 <li><a href="f_002d_002dile1-f_002d_002dile.html"><img class="image" 
src="f--ile1.jpg" alt="f--ile1">  <img class="image" src="f--ile.png" 
alt="alt"></a></li>
-<li><a href="-_0040-_007b_007d-_002e-.html"><tt class="verb"> @ {} . 
</tt></a></li>
+<li><a href="-_0040-_007b_007d-_002e-.html"><code class="verb"> @ {} . 
</code></a></li>
 <li><a href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html"><cite 
class="cite">cite asis</cite> in&nbsp;@w&nbsp;<b class="b">b</b><!-- /@w --> 
<span class="r">in r</span> <small class="sc">SC</small> <strong 
class="strong">str</strong> <code class="t">t</code> <var class="var">var</var> 
<em class="dfn">dfn</em> <i class="i">i</i></a></li>
 <li><a href="env-code-option-samp-command-file-C_002dx-ESC.html"><code 
class="env">env</code> <code class="code">code</code> <samp 
class="option">option</samp> &lsquo;<samp class="samp">samp</samp>&rsquo; <code 
class="command">command</code> <samp class="file">file</samp> <kbd 
class="kbd">C-x <kbd class="key">ESC</kbd></kbd></a></li>
 <li><a href="8_002e27in.html">8.27<span class="dmn">in</span></a></li>
diff --git a/tp/t/results/html_tests/xml_protected_in_verb.pl 
b/tp/t/results/html_tests/xml_protected_in_verb.pl
index f79a589149..739f9b6bd0 100644
--- a/tp/t/results/html_tests/xml_protected_in_verb.pl
+++ b/tp/t/results/html_tests/xml_protected_in_verb.pl
@@ -187,7 +187,7 @@ $result_converted{'html'}->{'xml_protected_in_verb'} = 
'<!DOCTYPE html>
 <body lang="en">
 <pre class="verbatim">&lt;a&gt;
 </pre>
-<p><tt class="verb"> &lt;i&gt; </tt>.
+<p><code class="verb"> &lt;i&gt; </code>.
 </p>
 <pre class="verbatim">&lt;bidule truc=&quot;ff &amp;amp;&quot;&gt; &amp; 
&lt;/bidule&gt;
 </pre>
diff --git a/tp/t/results/htmlxref/htmlxref/res_html/test_refs.html 
b/tp/t/results/htmlxref/htmlxref/res_html/test_refs.html
index d9c5e9cc85..a3b9351486 100644
--- a/tp/t/results/htmlxref/htmlxref/res_html/test_refs.html
+++ b/tp/t/results/htmlxref/htmlxref/res_html/test_refs.html
@@ -41,25 +41,25 @@ span.program-in-footer {font-size: smaller}
 
 <h3 class="subheading" id="Testing-distant-nodes">Testing distant nodes</h3>
 
-<p><tt class="verb"> a  node </tt> <a data-manual="manual" 
href="mono-manual.html#a-node">(manual)a  node</a><br>
+<p><code class="verb"> a  node </code> <a data-manual="manual" 
href="mono-manual.html#a-node">(manual)a  node</a><br>
 </p><div class="example">
 <pre class="example-preformatted">mono : manual.html#a-node
 split: ../manual/a-node.html#a-node
 </pre></div>
 
-<p><tt class="verb">:</tt> <a data-manual="manual" 
href="mono-manual.html#g_t_003a">(manual):</a>
+<p><code class="verb">:</code> <a data-manual="manual" 
href="mono-manual.html#g_t_003a">(manual):</a>
 </p><div class="example">
 <pre class="example-preformatted">mono : manual.html#_003a
 split: ../manual/_003a.html#_003a
 </pre></div>
 
-<p><tt class="verb">Top</tt> <a data-manual="manual" 
href="mono-manual.html#Top">(manual)top</a><br> 
+<p><code class="verb">Top</code> <a data-manual="manual" 
href="mono-manual.html#Top">(manual)top</a><br> 
 </p><div class="example">
 <pre class="example-preformatted">mono : manual.html#Top
 split: ../manual/index.html#Top
 </pre></div>
 
-<p><tt class="verb">(mtexinfo)Cross References</tt> <a data-manual="mtexinfo" 
href="mtexinfo.html#Cross-References">(mtexinfo)Cross References</a>
+<p><code class="verb">(mtexinfo)Cross References</code> <a 
data-manual="mtexinfo" href="mtexinfo.html#Cross-References">(mtexinfo)Cross 
References</a>
 </p><div class="example">
 <pre class="example-preformatted">mono: mtexinfo.html#Cross-References
 split: ../mtexinfo/Cross-References.html#Cross-References
@@ -67,7 +67,7 @@ split: ../mtexinfo/Cross-References.html#Cross-References
 
 <h3 class="subheading" id="Testing-manual-name">Testing manual name</h3>
 
-<p><tt class="verb">../manual/doc.texi</tt> <a data-manual="../manual/doc" 
href="doc.html#node">(../manual/doc)node</a><br>
+<p><code class="verb">../manual/doc.texi</code> <a data-manual="../manual/doc" 
href="doc.html#node">(../manual/doc)node</a><br>
 </p><div class="example">
 <pre class="example-preformatted">mono : doc.html#node
 split: ../doc/node.html#node
@@ -75,22 +75,22 @@ split: ../doc/node.html#node
 
 <h3 class="subheading" id="Testing-local-nodes">Testing local nodes</h3>
 
-<p><tt class="verb">!_&quot;#$%&amp;'()*+-.</tt> <a class="ref" 
href="#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">!_&quot;#$%&amp;'()*+-.</a>
+<p><code class="verb">!_&quot;#$%&amp;'()*+-.</code> <a class="ref" 
href="#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">!_&quot;#$%&amp;'()*+-.</a>
 </p><div class="example">
 <pre class="example-preformatted">target: 
#_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
 </pre></div>
 
-<p><tt class="verb">/;&lt;=&gt;?[\]^_`|~</tt> <a class="ref" 
href="#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e">/;&lt;=&gt;?[\]^_`|~</a><br>
+<p><code class="verb">/;&lt;=&gt;?[\]^_`|~</code> <a class="ref" 
href="#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e">/;&lt;=&gt;?[\]^_`|~</a><br>
 </p><div class="example">
 <pre class="example-preformatted">target: 
#_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e
 </pre></div>
 
-<p><tt class="verb">Top</tt> <a class="ref" href="#Top">Test refs</a>
+<p><code class="verb">Top</code> <a class="ref" href="#Top">Test refs</a>
 </p><div class="example">
 <pre class="example-preformatted">target: #Top
 </pre></div>
 
-<p><tt class="verb"> local   node</tt> <a class="ref" href="#local-node">local 
  node</a>
+<p><code class="verb"> local   node</code> <a class="ref" 
href="#local-node">local   node</a>
 </p><div class="example">
 <pre class="example-preformatted">target: #local-node
 </pre></div>
@@ -118,7 +118,7 @@ split: ../doc/node.html#node
 <pre class="example-preformatted">id: other-nodes
 </pre></div>
 
-<p><tt class="verb">Top</tt> <a class="ref" href="#Top">Test refs</a>
+<p><code class="verb">Top</code> <a class="ref" href="#Top">Test refs</a>
 </p><div class="example">
 <pre class="example-preformatted">target: #Top
 </pre></div>
diff --git a/tp/t/results/htmlxref/htmlxref_nodes/res_html/index.html 
b/tp/t/results/htmlxref/htmlxref_nodes/res_html/index.html
index f7fcbd5a5a..160cf816ba 100644
--- a/tp/t/results/htmlxref/htmlxref_nodes/res_html/index.html
+++ b/tp/t/results/htmlxref/htmlxref_nodes/res_html/index.html
@@ -42,25 +42,25 @@ span.program-in-footer {font-size: smaller}
 
 <h3 class="subheading" id="Testing-distant-nodes">Testing distant nodes</h3>
 
-<p><tt class="verb"> a  node </tt> <a data-manual="manual" 
href="split-dir-manual/a-node.html#a-node">(manual)a  node</a><br>
+<p><code class="verb"> a  node </code> <a data-manual="manual" 
href="split-dir-manual/a-node.html#a-node">(manual)a  node</a><br>
 </p><div class="example">
 <pre class="example-preformatted">mono : manual.html#a-node
 split: ../manual/a-node.html#a-node
 </pre></div>
 
-<p><tt class="verb">:</tt> <a data-manual="manual" 
href="split-dir-manual/_003a.html#g_t_003a">(manual):</a>
+<p><code class="verb">:</code> <a data-manual="manual" 
href="split-dir-manual/_003a.html#g_t_003a">(manual):</a>
 </p><div class="example">
 <pre class="example-preformatted">mono : manual.html#_003a
 split: ../manual/_003a.html#_003a
 </pre></div>
 
-<p><tt class="verb">Top</tt> <a data-manual="manual" 
href="split-dir-manual/index.html#Top">(manual)top</a><br> 
+<p><code class="verb">Top</code> <a data-manual="manual" 
href="split-dir-manual/index.html#Top">(manual)top</a><br> 
 </p><div class="example">
 <pre class="example-preformatted">mono : manual.html#Top
 split: ../manual/index.html#Top
 </pre></div>
 
-<p><tt class="verb">(mtexinfo)Cross References</tt> <a data-manual="mtexinfo" 
href="../mtexinfo_html/Cross-References.html#Cross-References">(mtexinfo)Cross 
References</a>
+<p><code class="verb">(mtexinfo)Cross References</code> <a 
data-manual="mtexinfo" 
href="../mtexinfo_html/Cross-References.html#Cross-References">(mtexinfo)Cross 
References</a>
 </p><div class="example">
 <pre class="example-preformatted">mono: mtexinfo.html#Cross-References
 split: ../mtexinfo/Cross-References.html#Cross-References
@@ -68,7 +68,7 @@ split: ../mtexinfo/Cross-References.html#Cross-References
 
 <h3 class="subheading" id="Testing-manual-name">Testing manual name</h3>
 
-<p><tt class="verb">../manual/doc.texi</tt> <a data-manual="../manual/doc" 
href="../doc_html/node.html#node">(../manual/doc)node</a><br>
+<p><code class="verb">../manual/doc.texi</code> <a data-manual="../manual/doc" 
href="../doc_html/node.html#node">(../manual/doc)node</a><br>
 </p><div class="example">
 <pre class="example-preformatted">mono : doc.html#node
 split: ../doc/node.html#node
@@ -76,22 +76,22 @@ split: ../doc/node.html#node
 
 <h3 class="subheading" id="Testing-local-nodes">Testing local nodes</h3>
 
-<p><tt class="verb">!_&quot;#$%&amp;'()*+-.</tt> <a class="ref" 
href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html">!_&quot;#$%&amp;'()*+-.</a>
+<p><code class="verb">!_&quot;#$%&amp;'()*+-.</code> <a class="ref" 
href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html">!_&quot;#$%&amp;'()*+-.</a>
 </p><div class="example">
 <pre class="example-preformatted">target: 
#_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
 </pre></div>
 
-<p><tt class="verb">/;&lt;=&gt;?[\]^_`|~</tt> <a class="ref" 
href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html">/;&lt;=&gt;?[\]^_`|~</a><br>
+<p><code class="verb">/;&lt;=&gt;?[\]^_`|~</code> <a class="ref" 
href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html">/;&lt;=&gt;?[\]^_`|~</a><br>
 </p><div class="example">
 <pre class="example-preformatted">target: 
#_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e
 </pre></div>
 
-<p><tt class="verb">Top</tt> <a class="ref" href="#Top">Test refs</a>
+<p><code class="verb">Top</code> <a class="ref" href="#Top">Test refs</a>
 </p><div class="example">
 <pre class="example-preformatted">target: #Top
 </pre></div>
 
-<p><tt class="verb"> local   node</tt> <a class="ref" 
href="local-node.html">local   node</a>
+<p><code class="verb"> local   node</code> <a class="ref" 
href="local-node.html">local   node</a>
 </p><div class="example">
 <pre class="example-preformatted">target: #local-node
 </pre></div>
diff --git a/tp/t/results/htmlxref/htmlxref_nodes/res_html/other-nodes.html 
b/tp/t/results/htmlxref/htmlxref_nodes/res_html/other-nodes.html
index d86a4e2274..3fad3c5c4a 100644
--- a/tp/t/results/htmlxref/htmlxref_nodes/res_html/other-nodes.html
+++ b/tp/t/results/htmlxref/htmlxref_nodes/res_html/other-nodes.html
@@ -46,7 +46,7 @@ span.program-in-footer {font-size: smaller}
 <pre class="example-preformatted">id: other-nodes
 </pre></div>
 
-<p><tt class="verb">Top</tt> <a class="ref" href="index.html">Test refs</a>
+<p><code class="verb">Top</code> <a class="ref" href="index.html">Test refs</a>
 </p><div class="example">
 <pre class="example-preformatted">target: #Top
 </pre></div>
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono/res_html/test_refs.html 
b/tp/t/results/htmlxref/htmlxref_only_mono/res_html/test_refs.html
index d9c5e9cc85..a3b9351486 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono/res_html/test_refs.html
+++ b/tp/t/results/htmlxref/htmlxref_only_mono/res_html/test_refs.html
@@ -41,25 +41,25 @@ span.program-in-footer {font-size: smaller}
 
 <h3 class="subheading" id="Testing-distant-nodes">Testing distant nodes</h3>
 
-<p><tt class="verb"> a  node </tt> <a data-manual="manual" 
href="mono-manual.html#a-node">(manual)a  node</a><br>
+<p><code class="verb"> a  node </code> <a data-manual="manual" 
href="mono-manual.html#a-node">(manual)a  node</a><br>
 </p><div class="example">
 <pre class="example-preformatted">mono : manual.html#a-node
 split: ../manual/a-node.html#a-node
 </pre></div>
 
-<p><tt class="verb">:</tt> <a data-manual="manual" 
href="mono-manual.html#g_t_003a">(manual):</a>
+<p><code class="verb">:</code> <a data-manual="manual" 
href="mono-manual.html#g_t_003a">(manual):</a>
 </p><div class="example">
 <pre class="example-preformatted">mono : manual.html#_003a
 split: ../manual/_003a.html#_003a
 </pre></div>
 
-<p><tt class="verb">Top</tt> <a data-manual="manual" 
href="mono-manual.html#Top">(manual)top</a><br> 
+<p><code class="verb">Top</code> <a data-manual="manual" 
href="mono-manual.html#Top">(manual)top</a><br> 
 </p><div class="example">
 <pre class="example-preformatted">mono : manual.html#Top
 split: ../manual/index.html#Top
 </pre></div>
 
-<p><tt class="verb">(mtexinfo)Cross References</tt> <a data-manual="mtexinfo" 
href="mtexinfo.html#Cross-References">(mtexinfo)Cross References</a>
+<p><code class="verb">(mtexinfo)Cross References</code> <a 
data-manual="mtexinfo" href="mtexinfo.html#Cross-References">(mtexinfo)Cross 
References</a>
 </p><div class="example">
 <pre class="example-preformatted">mono: mtexinfo.html#Cross-References
 split: ../mtexinfo/Cross-References.html#Cross-References
@@ -67,7 +67,7 @@ split: ../mtexinfo/Cross-References.html#Cross-References
 
 <h3 class="subheading" id="Testing-manual-name">Testing manual name</h3>
 
-<p><tt class="verb">../manual/doc.texi</tt> <a data-manual="../manual/doc" 
href="doc.html#node">(../manual/doc)node</a><br>
+<p><code class="verb">../manual/doc.texi</code> <a data-manual="../manual/doc" 
href="doc.html#node">(../manual/doc)node</a><br>
 </p><div class="example">
 <pre class="example-preformatted">mono : doc.html#node
 split: ../doc/node.html#node
@@ -75,22 +75,22 @@ split: ../doc/node.html#node
 
 <h3 class="subheading" id="Testing-local-nodes">Testing local nodes</h3>
 
-<p><tt class="verb">!_&quot;#$%&amp;'()*+-.</tt> <a class="ref" 
href="#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">!_&quot;#$%&amp;'()*+-.</a>
+<p><code class="verb">!_&quot;#$%&amp;'()*+-.</code> <a class="ref" 
href="#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">!_&quot;#$%&amp;'()*+-.</a>
 </p><div class="example">
 <pre class="example-preformatted">target: 
#_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
 </pre></div>
 
-<p><tt class="verb">/;&lt;=&gt;?[\]^_`|~</tt> <a class="ref" 
href="#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e">/;&lt;=&gt;?[\]^_`|~</a><br>
+<p><code class="verb">/;&lt;=&gt;?[\]^_`|~</code> <a class="ref" 
href="#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e">/;&lt;=&gt;?[\]^_`|~</a><br>
 </p><div class="example">
 <pre class="example-preformatted">target: 
#_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e
 </pre></div>
 
-<p><tt class="verb">Top</tt> <a class="ref" href="#Top">Test refs</a>
+<p><code class="verb">Top</code> <a class="ref" href="#Top">Test refs</a>
 </p><div class="example">
 <pre class="example-preformatted">target: #Top
 </pre></div>
 
-<p><tt class="verb"> local   node</tt> <a class="ref" href="#local-node">local 
  node</a>
+<p><code class="verb"> local   node</code> <a class="ref" 
href="#local-node">local   node</a>
 </p><div class="example">
 <pre class="example-preformatted">target: #local-node
 </pre></div>
@@ -118,7 +118,7 @@ split: ../doc/node.html#node
 <pre class="example-preformatted">id: other-nodes
 </pre></div>
 
-<p><tt class="verb">Top</tt> <a class="ref" href="#Top">Test refs</a>
+<p><code class="verb">Top</code> <a class="ref" href="#Top">Test refs</a>
 </p><div class="example">
 <pre class="example-preformatted">target: #Top
 </pre></div>
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/index.html 
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/index.html
index 38e6f07370..4565bc266f 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/index.html
+++ b/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/index.html
@@ -42,25 +42,25 @@ span.program-in-footer {font-size: smaller}
 
 <h3 class="subheading" id="Testing-distant-nodes">Testing distant nodes</h3>
 
-<p><tt class="verb"> a  node </tt> <a data-manual="manual" 
href="mono-manual.html#a-node">(manual)a  node</a><br>
+<p><code class="verb"> a  node </code> <a data-manual="manual" 
href="mono-manual.html#a-node">(manual)a  node</a><br>
 </p><div class="example">
 <pre class="example-preformatted">mono : manual.html#a-node
 split: ../manual/a-node.html#a-node
 </pre></div>
 
-<p><tt class="verb">:</tt> <a data-manual="manual" 
href="mono-manual.html#g_t_003a">(manual):</a>
+<p><code class="verb">:</code> <a data-manual="manual" 
href="mono-manual.html#g_t_003a">(manual):</a>
 </p><div class="example">
 <pre class="example-preformatted">mono : manual.html#_003a
 split: ../manual/_003a.html#_003a
 </pre></div>
 
-<p><tt class="verb">Top</tt> <a data-manual="manual" 
href="mono-manual.html#Top">(manual)top</a><br> 
+<p><code class="verb">Top</code> <a data-manual="manual" 
href="mono-manual.html#Top">(manual)top</a><br> 
 </p><div class="example">
 <pre class="example-preformatted">mono : manual.html#Top
 split: ../manual/index.html#Top
 </pre></div>
 
-<p><tt class="verb">(mtexinfo)Cross References</tt> <a data-manual="mtexinfo" 
href="../mtexinfo_html/Cross-References.html#Cross-References">(mtexinfo)Cross 
References</a>
+<p><code class="verb">(mtexinfo)Cross References</code> <a 
data-manual="mtexinfo" 
href="../mtexinfo_html/Cross-References.html#Cross-References">(mtexinfo)Cross 
References</a>
 </p><div class="example">
 <pre class="example-preformatted">mono: mtexinfo.html#Cross-References
 split: ../mtexinfo/Cross-References.html#Cross-References
@@ -68,7 +68,7 @@ split: ../mtexinfo/Cross-References.html#Cross-References
 
 <h3 class="subheading" id="Testing-manual-name">Testing manual name</h3>
 
-<p><tt class="verb">../manual/doc.texi</tt> <a data-manual="../manual/doc" 
href="../doc_html/node.html#node">(../manual/doc)node</a><br>
+<p><code class="verb">../manual/doc.texi</code> <a data-manual="../manual/doc" 
href="../doc_html/node.html#node">(../manual/doc)node</a><br>
 </p><div class="example">
 <pre class="example-preformatted">mono : doc.html#node
 split: ../doc/node.html#node
@@ -76,22 +76,22 @@ split: ../doc/node.html#node
 
 <h3 class="subheading" id="Testing-local-nodes">Testing local nodes</h3>
 
-<p><tt class="verb">!_&quot;#$%&amp;'()*+-.</tt> <a class="ref" 
href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html">!_&quot;#$%&amp;'()*+-.</a>
+<p><code class="verb">!_&quot;#$%&amp;'()*+-.</code> <a class="ref" 
href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html">!_&quot;#$%&amp;'()*+-.</a>
 </p><div class="example">
 <pre class="example-preformatted">target: 
#_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
 </pre></div>
 
-<p><tt class="verb">/;&lt;=&gt;?[\]^_`|~</tt> <a class="ref" 
href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html">/;&lt;=&gt;?[\]^_`|~</a><br>
+<p><code class="verb">/;&lt;=&gt;?[\]^_`|~</code> <a class="ref" 
href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html">/;&lt;=&gt;?[\]^_`|~</a><br>
 </p><div class="example">
 <pre class="example-preformatted">target: 
#_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e
 </pre></div>
 
-<p><tt class="verb">Top</tt> <a class="ref" href="#Top">Test refs</a>
+<p><code class="verb">Top</code> <a class="ref" href="#Top">Test refs</a>
 </p><div class="example">
 <pre class="example-preformatted">target: #Top
 </pre></div>
 
-<p><tt class="verb"> local   node</tt> <a class="ref" 
href="local-node.html">local   node</a>
+<p><code class="verb"> local   node</code> <a class="ref" 
href="local-node.html">local   node</a>
 </p><div class="example">
 <pre class="example-preformatted">target: #local-node
 </pre></div>
diff --git 
a/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/other-nodes.html 
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/other-nodes.html
index d86a4e2274..3fad3c5c4a 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/other-nodes.html
+++ b/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/other-nodes.html
@@ -46,7 +46,7 @@ span.program-in-footer {font-size: smaller}
 <pre class="example-preformatted">id: other-nodes
 </pre></div>
 
-<p><tt class="verb">Top</tt> <a class="ref" href="index.html">Test refs</a>
+<p><code class="verb">Top</code> <a class="ref" href="index.html">Test refs</a>
 </p><div class="example">
 <pre class="example-preformatted">target: #Top
 </pre></div>
diff --git a/tp/t/results/htmlxref/htmlxref_only_split/res_html/test_refs.html 
b/tp/t/results/htmlxref/htmlxref_only_split/res_html/test_refs.html
index 3f109e130d..a62e20a19a 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split/res_html/test_refs.html
+++ b/tp/t/results/htmlxref/htmlxref_only_split/res_html/test_refs.html
@@ -41,25 +41,25 @@ span.program-in-footer {font-size: smaller}
 
 <h3 class="subheading" id="Testing-distant-nodes">Testing distant nodes</h3>
 
-<p><tt class="verb"> a  node </tt> <a data-manual="manual" 
href="split-dir-manual/a-node.html#a-node">(manual)a  node</a><br>
+<p><code class="verb"> a  node </code> <a data-manual="manual" 
href="split-dir-manual/a-node.html#a-node">(manual)a  node</a><br>
 </p><div class="example">
 <pre class="example-preformatted">mono : manual.html#a-node
 split: ../manual/a-node.html#a-node
 </pre></div>
 
-<p><tt class="verb">:</tt> <a data-manual="manual" 
href="split-dir-manual/_003a.html#g_t_003a">(manual):</a>
+<p><code class="verb">:</code> <a data-manual="manual" 
href="split-dir-manual/_003a.html#g_t_003a">(manual):</a>
 </p><div class="example">
 <pre class="example-preformatted">mono : manual.html#_003a
 split: ../manual/_003a.html#_003a
 </pre></div>
 
-<p><tt class="verb">Top</tt> <a data-manual="manual" 
href="split-dir-manual/index.html#Top">(manual)top</a><br> 
+<p><code class="verb">Top</code> <a data-manual="manual" 
href="split-dir-manual/index.html#Top">(manual)top</a><br> 
 </p><div class="example">
 <pre class="example-preformatted">mono : manual.html#Top
 split: ../manual/index.html#Top
 </pre></div>
 
-<p><tt class="verb">(mtexinfo)Cross References</tt> <a data-manual="mtexinfo" 
href="mtexinfo.html#Cross-References">(mtexinfo)Cross References</a>
+<p><code class="verb">(mtexinfo)Cross References</code> <a 
data-manual="mtexinfo" href="mtexinfo.html#Cross-References">(mtexinfo)Cross 
References</a>
 </p><div class="example">
 <pre class="example-preformatted">mono: mtexinfo.html#Cross-References
 split: ../mtexinfo/Cross-References.html#Cross-References
@@ -67,7 +67,7 @@ split: ../mtexinfo/Cross-References.html#Cross-References
 
 <h3 class="subheading" id="Testing-manual-name">Testing manual name</h3>
 
-<p><tt class="verb">../manual/doc.texi</tt> <a data-manual="../manual/doc" 
href="doc.html#node">(../manual/doc)node</a><br>
+<p><code class="verb">../manual/doc.texi</code> <a data-manual="../manual/doc" 
href="doc.html#node">(../manual/doc)node</a><br>
 </p><div class="example">
 <pre class="example-preformatted">mono : doc.html#node
 split: ../doc/node.html#node
@@ -75,22 +75,22 @@ split: ../doc/node.html#node
 
 <h3 class="subheading" id="Testing-local-nodes">Testing local nodes</h3>
 
-<p><tt class="verb">!_&quot;#$%&amp;'()*+-.</tt> <a class="ref" 
href="#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">!_&quot;#$%&amp;'()*+-.</a>
+<p><code class="verb">!_&quot;#$%&amp;'()*+-.</code> <a class="ref" 
href="#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">!_&quot;#$%&amp;'()*+-.</a>
 </p><div class="example">
 <pre class="example-preformatted">target: 
#_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
 </pre></div>
 
-<p><tt class="verb">/;&lt;=&gt;?[\]^_`|~</tt> <a class="ref" 
href="#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e">/;&lt;=&gt;?[\]^_`|~</a><br>
+<p><code class="verb">/;&lt;=&gt;?[\]^_`|~</code> <a class="ref" 
href="#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e">/;&lt;=&gt;?[\]^_`|~</a><br>
 </p><div class="example">
 <pre class="example-preformatted">target: 
#_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e
 </pre></div>
 
-<p><tt class="verb">Top</tt> <a class="ref" href="#Top">Test refs</a>
+<p><code class="verb">Top</code> <a class="ref" href="#Top">Test refs</a>
 </p><div class="example">
 <pre class="example-preformatted">target: #Top
 </pre></div>
 
-<p><tt class="verb"> local   node</tt> <a class="ref" href="#local-node">local 
  node</a>
+<p><code class="verb"> local   node</code> <a class="ref" 
href="#local-node">local   node</a>
 </p><div class="example">
 <pre class="example-preformatted">target: #local-node
 </pre></div>
@@ -118,7 +118,7 @@ split: ../doc/node.html#node
 <pre class="example-preformatted">id: other-nodes
 </pre></div>
 
-<p><tt class="verb">Top</tt> <a class="ref" href="#Top">Test refs</a>
+<p><code class="verb">Top</code> <a class="ref" href="#Top">Test refs</a>
 </p><div class="example">
 <pre class="example-preformatted">target: #Top
 </pre></div>
diff --git 
a/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/index.html 
b/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/index.html
index f7fcbd5a5a..160cf816ba 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/index.html
+++ b/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/index.html
@@ -42,25 +42,25 @@ span.program-in-footer {font-size: smaller}
 
 <h3 class="subheading" id="Testing-distant-nodes">Testing distant nodes</h3>
 
-<p><tt class="verb"> a  node </tt> <a data-manual="manual" 
href="split-dir-manual/a-node.html#a-node">(manual)a  node</a><br>
+<p><code class="verb"> a  node </code> <a data-manual="manual" 
href="split-dir-manual/a-node.html#a-node">(manual)a  node</a><br>
 </p><div class="example">
 <pre class="example-preformatted">mono : manual.html#a-node
 split: ../manual/a-node.html#a-node
 </pre></div>
 
-<p><tt class="verb">:</tt> <a data-manual="manual" 
href="split-dir-manual/_003a.html#g_t_003a">(manual):</a>
+<p><code class="verb">:</code> <a data-manual="manual" 
href="split-dir-manual/_003a.html#g_t_003a">(manual):</a>
 </p><div class="example">
 <pre class="example-preformatted">mono : manual.html#_003a
 split: ../manual/_003a.html#_003a
 </pre></div>
 
-<p><tt class="verb">Top</tt> <a data-manual="manual" 
href="split-dir-manual/index.html#Top">(manual)top</a><br> 
+<p><code class="verb">Top</code> <a data-manual="manual" 
href="split-dir-manual/index.html#Top">(manual)top</a><br> 
 </p><div class="example">
 <pre class="example-preformatted">mono : manual.html#Top
 split: ../manual/index.html#Top
 </pre></div>
 
-<p><tt class="verb">(mtexinfo)Cross References</tt> <a data-manual="mtexinfo" 
href="../mtexinfo_html/Cross-References.html#Cross-References">(mtexinfo)Cross 
References</a>
+<p><code class="verb">(mtexinfo)Cross References</code> <a 
data-manual="mtexinfo" 
href="../mtexinfo_html/Cross-References.html#Cross-References">(mtexinfo)Cross 
References</a>
 </p><div class="example">
 <pre class="example-preformatted">mono: mtexinfo.html#Cross-References
 split: ../mtexinfo/Cross-References.html#Cross-References
@@ -68,7 +68,7 @@ split: ../mtexinfo/Cross-References.html#Cross-References
 
 <h3 class="subheading" id="Testing-manual-name">Testing manual name</h3>
 
-<p><tt class="verb">../manual/doc.texi</tt> <a data-manual="../manual/doc" 
href="../doc_html/node.html#node">(../manual/doc)node</a><br>
+<p><code class="verb">../manual/doc.texi</code> <a data-manual="../manual/doc" 
href="../doc_html/node.html#node">(../manual/doc)node</a><br>
 </p><div class="example">
 <pre class="example-preformatted">mono : doc.html#node
 split: ../doc/node.html#node
@@ -76,22 +76,22 @@ split: ../doc/node.html#node
 
 <h3 class="subheading" id="Testing-local-nodes">Testing local nodes</h3>
 
-<p><tt class="verb">!_&quot;#$%&amp;'()*+-.</tt> <a class="ref" 
href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html">!_&quot;#$%&amp;'()*+-.</a>
+<p><code class="verb">!_&quot;#$%&amp;'()*+-.</code> <a class="ref" 
href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html">!_&quot;#$%&amp;'()*+-.</a>
 </p><div class="example">
 <pre class="example-preformatted">target: 
#_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
 </pre></div>
 
-<p><tt class="verb">/;&lt;=&gt;?[\]^_`|~</tt> <a class="ref" 
href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html">/;&lt;=&gt;?[\]^_`|~</a><br>
+<p><code class="verb">/;&lt;=&gt;?[\]^_`|~</code> <a class="ref" 
href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html">/;&lt;=&gt;?[\]^_`|~</a><br>
 </p><div class="example">
 <pre class="example-preformatted">target: 
#_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e
 </pre></div>
 
-<p><tt class="verb">Top</tt> <a class="ref" href="#Top">Test refs</a>
+<p><code class="verb">Top</code> <a class="ref" href="#Top">Test refs</a>
 </p><div class="example">
 <pre class="example-preformatted">target: #Top
 </pre></div>
 
-<p><tt class="verb"> local   node</tt> <a class="ref" 
href="local-node.html">local   node</a>
+<p><code class="verb"> local   node</code> <a class="ref" 
href="local-node.html">local   node</a>
 </p><div class="example">
 <pre class="example-preformatted">target: #local-node
 </pre></div>
diff --git 
a/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/other-nodes.html 
b/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/other-nodes.html
index d86a4e2274..3fad3c5c4a 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/other-nodes.html
+++ b/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/other-nodes.html
@@ -46,7 +46,7 @@ span.program-in-footer {font-size: smaller}
 <pre class="example-preformatted">id: other-nodes
 </pre></div>
 
-<p><tt class="verb">Top</tt> <a class="ref" href="index.html">Test refs</a>
+<p><code class="verb">Top</code> <a class="ref" href="index.html">Test refs</a>
 </p><div class="example">
 <pre class="example-preformatted">target: #Top
 </pre></div>
diff --git a/tp/t/results/menu/verb_in_menu_description.pl 
b/tp/t/results/menu/verb_in_menu_description.pl
index bcc6470cc7..10bf3034f5 100644
--- a/tp/t/results/menu/verb_in_menu_description.pl
+++ b/tp/t/results/menu/verb_in_menu_description.pl
@@ -449,9 +449,9 @@ pre.menu-comment-preformatted {font-family: serif}
 
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a href="manual.html#Top" 
accesskey="1">(manual)</a>:</td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top">
-<tt class="verb"> in verb
+<code class="verb"> in verb
 
-</tt>
+</code>
 </td></tr>
 <tr><th colspan="3" align="left" valign="top"><pre 
class="menu-comment-preformatted">
 
diff --git a/tp/tests/formatting/res_parser/cpp_lines/cpp_lines.html 
b/tp/tests/formatting/res_parser/cpp_lines/cpp_lines.html
index d07733d1ad..72f262d89f 100644
--- a/tp/tests/formatting/res_parser/cpp_lines/cpp_lines.html
+++ b/tp/tests/formatting/res_parser/cpp_lines/cpp_lines.html
@@ -50,9 +50,9 @@ span.program-in-footer {font-size: smaller}
 </p>
 <p><a class="email" href="mailto:after inc">after inc</a>. 
 </p>
-<p><tt class="verb">
+<p><code class="verb">
 #line 5 &quot;in verb&quot;
-</tt>
+</code>
 </p>
 <p><a class="email" href="mailto:after verb">after verb</a>
 </p>
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html 
b/tp/tests/layout/res_parser/formatting/formatting.html
index 7ef3310880..61e22113c7 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -1030,8 +1030,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -2090,8 +2090,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -3205,8 +3205,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -4263,8 +4263,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -5328,8 +5328,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> --b
 <code class="code">@var{--a}</code> <var class="var">--a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> --a&#779;
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter.html 
b/tp/tests/layout/res_parser/formatting_chm/chapter.html
index 5a00c0cc7d..09be8ea66d 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter.html
@@ -1031,8 +1031,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -2089,8 +2089,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -3154,8 +3154,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> --b
 <code class="code">@var{--a}</code> <var class="var">--a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> --a&#779;
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.html 
b/tp/tests/layout/res_parser/formatting_chm/formatting.html
index 5a2f35185f..8b39fb1685 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting.html
@@ -1023,8 +1023,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -2083,8 +2083,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
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 9ea068c592..b070c454d5 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
@@ -1030,8 +1030,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> –b
 <code class="code">@var{--a}</code> <var class="var">–a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
 <code class="code">@H{a}</code> a̋
 <code class="code">@H{--a}</code> –a̋
@@ -2090,8 +2090,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> –b
 <code class="code">@var{--a}</code> <var class="var">–a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
 <code class="code">@H{a}</code> a̋
 <code class="code">@H{--a}</code> –a̋
@@ -3205,8 +3205,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> –b
 <code class="code">@var{--a}</code> <var class="var">–a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
 <code class="code">@H{a}</code> a̋
 <code class="code">@H{--a}</code> –a̋
@@ -4263,8 +4263,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> –b
 <code class="code">@var{--a}</code> <var class="var">–a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
 <code class="code">@H{a}</code> a̋
 <code class="code">@H{--a}</code> –a̋
@@ -5328,8 +5328,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> --b
 <code class="code">@var{--a}</code> <var class="var">--a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
 <code class="code">@H{a}</code> a̋
 <code class="code">@H{--a}</code> --a̋
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index 419e46af5c..424d2e7261 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
@@ -1029,8 +1029,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &#8211;b
 <code class="code">@var{--a}</code> <var class="var">&#8211;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &#8211;a&#779;
@@ -2089,8 +2089,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &#8211;b
 <code class="code">@var{--a}</code> <var class="var">&#8211;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &#8211;a&#779;
@@ -3166,8 +3166,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &#8211;b
 <code class="code">@var{--a}</code> <var class="var">&#8211;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &#8211;a&#779;
@@ -4224,8 +4224,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &#8211;b
 <code class="code">@var{--a}</code> <var class="var">&#8211;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &#8211;a&#779;
@@ -5289,8 +5289,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> --b
 <code class="code">@var{--a}</code> <var class="var">--a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> --a&#779;
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 d594131fc2..bb38494e19 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
@@ -1036,8 +1036,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &#8211;b
 <code class="code">@var{--a}</code> <var class="var">&#8211;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &#8211;a&#779;
@@ -2094,8 +2094,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &#8211;b
 <code class="code">@var{--a}</code> <var class="var">&#8211;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &#8211;a&#779;
@@ -3159,8 +3159,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> --b
 <code class="code">@var{--a}</code> <var class="var">--a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> --a&#779;
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index 5df3b8f262..d2c8a3e092 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
@@ -1026,8 +1026,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &#8211;b
 <code class="code">@var{--a}</code> <var class="var">&#8211;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &#8211;a&#779;
@@ -2086,8 +2086,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &#8211;b
 <code class="code">@var{--a}</code> <var class="var">&#8211;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &#8211;a&#779;
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter.html 
b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index 17dc73ebdd..63df8535be 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
@@ -1048,8 +1048,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -2106,8 +2106,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -3171,8 +3171,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> --b
 <code class="code">@var{--a}</code> <var class="var">--a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> --a&#779;
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 4f05d7bf68..1845ce6845 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -1030,8 +1030,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -2090,8 +2090,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -3205,8 +3205,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -4263,8 +4263,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -5328,8 +5328,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> --b
 <code class="code">@var{--a}</code> <var class="var">--a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> --a&#779;
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html 
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index 7ef3310880..61e22113c7 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -1030,8 +1030,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -2090,8 +2090,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -3205,8 +3205,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -4263,8 +4263,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -5328,8 +5328,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> --b
 <code class="code">@var{--a}</code> <var class="var">--a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> --a&#779;
diff --git a/tp/tests/layout/res_parser/formatting_html32/formatting.html 
b/tp/tests/layout/res_parser/formatting_html32/formatting.html
index a3a74eecb3..b05e5ee140 100644
--- a/tp/tests/layout/res_parser/formatting_html32/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html32/formatting.html
@@ -1002,8 +1002,8 @@ but , ,
 <code>@url{--a,}</code> <a href="--a">--a</a>
 <code>@url{,--b}</code> -b
 <code>@var{--a}</code> <var>-a</var>
-<code>@verb{:--a:}</code> <tt>--a</tt>
-<code>@verb{:a  &lt; &amp; @ % &#34; --    b:}</code> <tt>a  &lt; &amp; @ % 
&#34; --    b</tt>
+<code>@verb{:--a:}</code> <code>--a</code>
+<code>@verb{:a  &lt; &amp; @ % &#34; --    b:}</code> <code>a  &lt; &amp; @ % 
&#34; --    b</code>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code>@H{a}</code> a&#779;
 <code>@H{--a}</code> -a&#779;
@@ -2036,8 +2036,8 @@ but , ,
 <code>@url{--a,}</code> <a href="--a">--a</a>
 <code>@url{,--b}</code> -b
 <code>@var{--a}</code> <var>-a</var>
-<code>@verb{:--a:}</code> <tt>--a</tt>
-<code>@verb{:a  &lt; &amp; @ % &#34; --    b:}</code> <tt>a  &lt; &amp; @ % 
&#34; --    b</tt>
+<code>@verb{:--a:}</code> <code>--a</code>
+<code>@verb{:a  &lt; &amp; @ % &#34; --    b:}</code> <code>a  &lt; &amp; @ % 
&#34; --    b</code>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code>@H{a}</code> a&#779;
 <code>@H{--a}</code> -a&#779;
@@ -3125,8 +3125,8 @@ but , ,
 <code>@url{--a,}</code> <a href="--a">--a</a>
 <code>@url{,--b}</code> -b
 <code>@var{--a}</code> <var>-a</var>
-<code>@verb{:--a:}</code> <tt>--a</tt>
-<code>@verb{:a  &lt; &amp; @ % &#34; --    b:}</code> <tt>a  &lt; &amp; @ % 
&#34; --    b</tt>
+<code>@verb{:--a:}</code> <code>--a</code>
+<code>@verb{:a  &lt; &amp; @ % &#34; --    b:}</code> <code>a  &lt; &amp; @ % 
&#34; --    b</code>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code>@H{a}</code> a&#779;
 <code>@H{--a}</code> -a&#779;
@@ -4157,8 +4157,8 @@ but , ,
 <code>@url{--a,}</code> <a href="--a">--a</a>
 <code>@url{,--b}</code> -b
 <code>@var{--a}</code> <var>-a</var>
-<code>@verb{:--a:}</code> <tt>--a</tt>
-<code>@verb{:a  &lt; &amp; @ % &#34; --    b:}</code> <tt>a  &lt; &amp; @ % 
&#34; --    b</tt>
+<code>@verb{:--a:}</code> <code>--a</code>
+<code>@verb{:a  &lt; &amp; @ % &#34; --    b:}</code> <code>a  &lt; &amp; @ % 
&#34; --    b</code>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code>@H{a}</code> a&#779;
 <code>@H{--a}</code> -a&#779;
@@ -5195,8 +5195,8 @@ but , ,
 <code>@url{--a,}</code> <a href="--a">--a</a>
 <code>@url{,--b}</code> --b
 <code>@var{--a}</code> <var>--a</var>
-<code>@verb{:--a:}</code> <tt>--a</tt>
-<code>@verb{:a  &lt; &amp; @ % &#34; --    b:}</code> <tt>a  &lt; &amp; @ % 
&#34; --    b</tt>
+<code>@verb{:--a:}</code> <code>--a</code>
+<code>@verb{:a  &lt; &amp; @ % &#34; --    b:}</code> <code>a  &lt; &amp; @ % 
&#34; --    b</code>
 <code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a<!-- /@w -->
 <code>@H{a}</code> a&#779;
 <code>@H{--a}</code> --a&#779;
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 97d6f10ceb..bd1bbdf31d 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
@@ -1088,8 +1088,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -2146,8 +2146,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -3211,8 +3211,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> --b
 <code class="code">@var{--a}</code> <var class="var">--a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> --a&#779;
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 ffb28cfe5d..81a66c38bf 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -1051,8 +1051,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -2109,8 +2109,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -3174,8 +3174,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> --b
 <code class="code">@var{--a}</code> <var class="var">--a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> --a&#779;
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/index.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
index 6e71a211e6..6e332371f1 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
@@ -1025,8 +1025,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -2085,8 +2085,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
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 165e120739..f2ec31314f 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
@@ -1002,8 +1002,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -2062,8 +2062,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -3177,8 +3177,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -4235,8 +4235,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -5300,8 +5300,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> --b
 <code class="code">@var{--a}</code> <var class="var">--a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> --a&#779;
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html 
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index 6d99095a03..7447b029bc 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -1040,8 +1040,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -2098,8 +2098,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -3211,8 +3211,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -4267,8 +4267,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -5330,8 +5330,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> --b
 <code class="code">@var{--a}</code> <var class="var">--a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> --a&#779;
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter.html 
b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
index ffb28cfe5d..81a66c38bf 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -1051,8 +1051,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -2109,8 +2109,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -3174,8 +3174,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> --b
 <code class="code">@var{--a}</code> <var class="var">--a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> --a&#779;
diff --git a/tp/tests/layout/res_parser/formatting_nodes/index.html 
b/tp/tests/layout/res_parser/formatting_nodes/index.html
index 6e71a211e6..6e332371f1 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/index.html
@@ -1025,8 +1025,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -2085,8 +2085,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
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 06d639b1f5..dd8bf329b3 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
@@ -1030,8 +1030,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &#8211;b
 <code class="code">@var{--a}</code> <var class="var">&#8211;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &#8211;a&#779;
@@ -2090,8 +2090,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &#8211;b
 <code class="code">@var{--a}</code> <var class="var">&#8211;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &#8211;a&#779;
@@ -3205,8 +3205,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &#8211;b
 <code class="code">@var{--a}</code> <var class="var">&#8211;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &#8211;a&#779;
@@ -4263,8 +4263,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &#8211;b
 <code class="code">@var{--a}</code> <var class="var">&#8211;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &#8211;a&#779;
@@ -5328,8 +5328,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> --b
 <code class="code">@var{--a}</code> <var class="var">--a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> --a&#779;
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 35424a7967..ed1b6fb79c 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -1030,8 +1030,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -2089,8 +2089,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -3181,8 +3181,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -4245,8 +4245,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> --b
 <code class="code">@var{--a}</code> <var class="var">--a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> --a&#779;
@@ -5455,8 +5455,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
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 887054994f..140e84beb6 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -1030,8 +1030,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -2090,8 +2090,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -3205,8 +3205,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -4263,8 +4263,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -5328,8 +5328,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> --b
 <code class="code">@var{--a}</code> <var class="var">--a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> --a&#779;
diff --git a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html 
b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
index 1831b00914..28e7d846b8 100644
--- a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
@@ -1030,8 +1030,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -2090,8 +2090,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -3205,8 +3205,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -4263,8 +4263,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> &ndash;b
 <code class="code">@var{--a}</code> <var class="var">&ndash;a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> 
a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!--
 /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> &ndash;a&#779;
@@ -5328,8 +5328,8 @@ but , ,
 <code class="code">@url{--a,}</code> <a class="url" href="--a">--a</a>
 <code class="code">@url{,--b}</code> --b
 <code class="code">@var{--a}</code> <var class="var">--a</var>
-<code class="code">@verb{:--a:}</code> <tt class="verb">--a</tt>
-<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <tt 
class="verb">a  &lt; &amp; @ % &quot; --    b</tt>
+<code class="code">@verb{:--a:}</code> <code class="verb">--a</code>
+<code class="code">@verb{:a  &lt; &amp; @ % &quot; --    b:}</code> <code 
class="verb">a  &lt; &amp; @ % &quot; --    b</code>
 <code class="code">@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a a a a a<!-- /@w -->
 <code class="code">@H{a}</code> a&#779;
 <code class="code">@H{--a}</code> --a&#779;
reply via email to
[Prev in Thread] Current Thread [Next in Thread]