texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: Update test results


From: Patrice Dumas
Subject: branch master updated: Update test results
Date: Tue, 23 Aug 2022 15:19:34 -0400

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

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 3f41a2c4c9 Update test results
3f41a2c4c9 is described below

commit 3f41a2c4c9f5714a4fb3929a13dd4ab927f4ce7e
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Aug 23 21:19:10 2022 +0200

    Update test results
---
 .../layout/res_parser/formatting/formatting.html   | 40 +++++++++++-----------
 .../layout/res_parser/formatting_chm/chapter.html  | 24 ++++++-------
 .../res_parser/formatting_chm/formatting.html      | 16 ++++-----
 .../formatting_enable_encoding/formatting.html     | 40 +++++++++++-----------
 .../EPUB/xhtml/chapter.xhtml                       | 24 ++++++-------
 .../EPUB/xhtml/formatting.xhtml                    | 16 ++++-----
 .../EPUB/xhtml/chapter.xhtml                       | 24 ++++++-------
 .../EPUB/xhtml/formatting.xhtml                    | 16 ++++-----
 .../res_parser/formatting_exotic/chapter.html      | 24 ++++++-------
 .../res_parser/formatting_fr_icons/formatting.html | 40 +++++++++++-----------
 .../res_parser/formatting_html/formatting.html     | 40 +++++++++++-----------
 .../res_parser/formatting_html32/formatting.html   | 40 +++++++++++-----------
 .../formatting_html_no_texi2html/formatting.html   | 24 ++++++-------
 .../res_parser/formatting_html_nodes/chapter.html  | 24 ++++++-------
 .../res_parser/formatting_html_nodes/index.html    | 16 ++++-----
 .../formatting_inline_css/formatting.html          | 40 +++++++++++-----------
 .../res_parser/formatting_latex/formatting.tex     | 40 +++++++++++-----------
 .../res_parser/formatting_mathjax/formatting.html  | 40 +++++++++++-----------
 .../res_parser/formatting_nodes/chapter.html       | 24 ++++++-------
 .../layout/res_parser/formatting_nodes/index.html  | 16 ++++-----
 .../formatting_numerical_entities/formatting.html  | 40 +++++++++++-----------
 .../formatting_regions/formatting_regions.html     | 40 +++++++++++-----------
 .../formatting_weird_quotes/formatting.html        | 40 +++++++++++-----------
 .../res_parser/formatting_xhtml/formatting.html    | 40 +++++++++++-----------
 .../res_parser/formatting_singular/chapter.html    | 24 ++++++-------
 25 files changed, 376 insertions(+), 376 deletions(-)

diff --git a/tp/tests/layout/res_parser/formatting/formatting.html 
b/tp/tests/layout/res_parser/formatting/formatting.html
index 8aff66fecf..4de62f9992 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -1146,14 +1146,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -2224,14 +2224,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -3358,14 +3358,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -4434,14 +4434,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -5529,14 +5529,14 @@ error&rarr; &rarr; - -| &rArr;
 </div>
 <pre class="example-preformatted">
 
-<code class="code as-code-kbd">example kbdinputstyle</code>
+<kbd class="kbd">example kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&para;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem example 
kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&para;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&para;</a></span></dt>
 </dl>
 </div>
 <pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter.html 
b/tp/tests/layout/res_parser/formatting_chm/chapter.html
index 1da67c5d03..428d3cc2e8 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter.html
@@ -1142,14 +1142,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -2218,14 +2218,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -3313,14 +3313,14 @@ error&rarr; &rarr; - -| &rArr;
 </div>
 <pre class="example-preformatted">
 
-<code class="code as-code-kbd">example kbdinputstyle</code>
+<kbd class="kbd">example kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&para;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem example 
kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&para;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&para;</a></span></dt>
 </dl>
 </div>
 <pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.html 
b/tp/tests/layout/res_parser/formatting_chm/formatting.html
index ec3cb24132..600d64b9ff 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting.html
@@ -1130,14 +1130,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -2208,14 +2208,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
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 5c67d06290..27d2ed7712 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
@@ -1146,14 +1146,14 @@ error→ ↦ − ⊣ ⇒
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'> 
¶</a></span></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'> 
¶</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
¶</a></span></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
¶</a></span></dt>
 </dl>
 </div>
 
@@ -2224,14 +2224,14 @@ error→ ↦ − ⊣ ⇒
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
¶</a></span></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
¶</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
¶</a></span></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
¶</a></span></dt>
 </dl>
 </div>
 
@@ -3358,14 +3358,14 @@ error→ ↦ − ⊣ ⇒
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
¶</a></span></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
¶</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
¶</a></span></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
¶</a></span></dt>
 </dl>
 </div>
 
@@ -4434,14 +4434,14 @@ error→ ↦ − ⊣ ⇒
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> ¶</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> ¶</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
¶</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
¶</a></span></dt>
 </dl>
 </div>
 
@@ -5529,14 +5529,14 @@ error→ ↦ − ⊣ ⇒
 </div>
 <pre class="example-preformatted">
 
-<code class="code as-code-kbd">example kbdinputstyle</code>
+<kbd class="kbd">example kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> ¶</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem example 
kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> ¶</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
¶</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
¶</a></span></dt>
 </dl>
 </div>
 <pre class="example-preformatted">
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
index de6690bdb7..1958a4ec06 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
@@ -1142,14 +1142,14 @@ error&#8594; &#8614; &#8722; &#8867; &#8658;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code></dt>
 </dl>
 </div>
 
@@ -2218,14 +2218,14 @@ error&#8594; &#8614; &#8722; &#8867; &#8658;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><code class="code 
as-code-kbd">vtable i--tem example kbdinputstyle</code></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code></dt>
+<dt id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code></dt>
 </dl>
 </div>
 
@@ -3313,14 +3313,14 @@ error&#8594; &#8614; &#8722; &#8867; &#8658;
 </div>
 <pre class="example-preformatted">
 
-<code class="code as-code-kbd">example kbdinputstyle</code>
+<kbd class="kbd">example kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem example kbdinputstyle</code></code></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem example 
kbdinputstyle</kbd></code></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code></dt>
+<dt id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code></dt>
 </dl>
 </div>
 <pre class="example-preformatted">
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index 0053a997dc..7a5451733c 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
@@ -1129,14 +1129,14 @@ error&#8594; &#8614; &#8722; &#8867; &#8658;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd></dt>
+<dt id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code></dt>
 </dl>
 </div>
 
@@ -2207,14 +2207,14 @@ error&#8594; &#8614; &#8722; &#8867; &#8658;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code></dt>
 </dl>
 </div>
 
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 825ad69e4a..fedf8429a8 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
@@ -1143,14 +1143,14 @@ error&#8594; &#8614; &#8722; &#8867; &#8658;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code></dt>
 </dl>
 </div>
 
@@ -2219,14 +2219,14 @@ error&#8594; &#8614; &#8722; &#8867; &#8658;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><code class="code 
as-code-kbd">vtable i--tem example kbdinputstyle</code></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code></dt>
+<dt id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code></dt>
 </dl>
 </div>
 
@@ -3314,14 +3314,14 @@ error&#8594; &#8614; &#8722; &#8867; &#8658;
 </div>
 <pre class="example-preformatted">
 
-<code class="code as-code-kbd">example kbdinputstyle</code>
+<kbd class="kbd">example kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem example kbdinputstyle</code></code></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem example 
kbdinputstyle</kbd></code></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code></dt>
+<dt id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code></dt>
 </dl>
 </div>
 <pre class="example-preformatted">
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index d5754cd07f..adeaf0874c 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
@@ -1131,14 +1131,14 @@ error&#8594; &#8614; &#8722; &#8867; &#8658;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd></dt>
+<dt id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code></dt>
 </dl>
 </div>
 
@@ -2209,14 +2209,14 @@ error&#8594; &#8614; &#8722; &#8867; &#8658;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code></dt>
 </dl>
 </div>
 
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter.html 
b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index 11e7596f60..fdab438fcd 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
@@ -1161,14 +1161,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -2237,14 +2237,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -3332,14 +3332,14 @@ error&rarr; &rarr; - -| &rArr;
 </div>
 <pre class="example-preformatted">
 
-<code class="code as-code-kbd">example kbdinputstyle</code>
+<kbd class="kbd">example kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&para;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem example 
kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&para;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&para;</a></span></dt>
 </dl>
 </div>
 <pre class="example-preformatted">
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 f862f17f3c..3f309bf426 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -1146,14 +1146,14 @@ erreur&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -2224,14 +2224,14 @@ erreur&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -3358,14 +3358,14 @@ erreur&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -4434,14 +4434,14 @@ erreur&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -5529,14 +5529,14 @@ erreur&rarr; &rarr; - -| &rArr;
 </div>
 <pre class="example-preformatted">
 
-<code class="code as-code-kbd">example kbdinputstyle</code>
+<kbd class="kbd">example kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&para;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem example 
kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&para;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&para;</a></span></dt>
 </dl>
 </div>
 <pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html 
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index 8aff66fecf..4de62f9992 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -1146,14 +1146,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -2224,14 +2224,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -3358,14 +3358,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -4434,14 +4434,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -5529,14 +5529,14 @@ error&rarr; &rarr; - -| &rArr;
 </div>
 <pre class="example-preformatted">
 
-<code class="code as-code-kbd">example kbdinputstyle</code>
+<kbd class="kbd">example kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&para;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem example 
kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&para;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&para;</a></span></dt>
 </dl>
 </div>
 <pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_html32/formatting.html 
b/tp/tests/layout/res_parser/formatting_html32/formatting.html
index 5411d55f5f..391f9c6a1a 100644
--- a/tp/tests/layout/res_parser/formatting_html32/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html32/formatting.html
@@ -1106,13 +1106,13 @@ error-&gt; ==&gt; - -| =&gt;
 </dl>
 </td></tr></table>
 
-<p><kbd>example kbdinputstyle</kbd>
+<p><code>example kbdinputstyle</code>
 </p><dl>
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><kbd>vtable 
i--tem example kbdinputstyle</kbd></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><code>vtable 
i--tem example kbdinputstyle</code></dt>
 </dl>
-<table><tr><td>&nbsp;</td><td><pre><code>in example example 
kbdinputstyle</code>
+<table><tr><td>&nbsp;</td><td><pre><kbd>in example example kbdinputstyle</kbd>
 </pre><dl>
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><code><code>vtable
 i--tem in example example kbdinputstyle</code></code></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><code><kbd>vtable
 i--tem in example example kbdinputstyle</kbd></code></dt>
 </dl>
 </td></tr></table>
 
@@ -2158,13 +2158,13 @@ error-&gt; ==&gt; - -| =&gt;
 </dl>
 </td></tr></table>
 
-<p><kbd>example kbdinputstyle</kbd>
+<p><code>example kbdinputstyle</code>
 </p><dl>
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><kbd>vtable 
i--tem example kbdinputstyle</kbd></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><code>vtable 
i--tem example kbdinputstyle</code></dt>
 </dl>
-<table><tr><td>&nbsp;</td><td><pre><code>in example example 
kbdinputstyle</code>
+<table><tr><td>&nbsp;</td><td><pre><kbd>in example example kbdinputstyle</kbd>
 </pre><dl>
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><code><code>vtable
 i--tem in example example kbdinputstyle</code></code></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><code><kbd>vtable
 i--tem in example example kbdinputstyle</kbd></code></dt>
 </dl>
 </td></tr></table>
 
@@ -3266,13 +3266,13 @@ error-&gt; ==&gt; - -| =&gt;
 </dl>
 </td></tr></table>
 
-<p><kbd>example kbdinputstyle</kbd>
+<p><code>example kbdinputstyle</code>
 </p><dl>
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><kbd>vtable 
i--tem example kbdinputstyle</kbd></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><code>vtable 
i--tem example kbdinputstyle</code></dt>
 </dl>
-<table><tr><td>&nbsp;</td><td><pre><code>in example example 
kbdinputstyle</code>
+<table><tr><td>&nbsp;</td><td><pre><kbd>in example example kbdinputstyle</kbd>
 </pre><dl>
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><code><code>vtable
 i--tem in example example kbdinputstyle</code></code></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><code><kbd>vtable
 i--tem in example example kbdinputstyle</kbd></code></dt>
 </dl>
 </td></tr></table>
 
@@ -4316,13 +4316,13 @@ error-&gt; ==&gt; - -| =&gt;
 </dl>
 </td></tr></table>
 
-<p><kbd>example kbdinputstyle</kbd>
+<p><code>example kbdinputstyle</code>
 </p><dl>
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><kbd>vtable i--tem 
example kbdinputstyle</kbd></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><code>vtable i--tem 
example kbdinputstyle</code></dt>
 </dl>
-<table><tr><td>&nbsp;</td><td><pre><code>in example example 
kbdinputstyle</code>
+<table><tr><td>&nbsp;</td><td><pre><kbd>in example example kbdinputstyle</kbd>
 </pre><dl>
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><code><code>vtable
 i--tem in example example kbdinputstyle</code></code></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><code><kbd>vtable
 i--tem in example example kbdinputstyle</kbd></code></dt>
 </dl>
 </td></tr></table>
 
@@ -5384,13 +5384,13 @@ error-&gt; ==&gt; - -| =&gt;
 </td></tr></table>
 <pre>
 
-<code>example kbdinputstyle</code>
+<kbd>example kbdinputstyle</kbd>
 </pre><dl>
-<dt 
id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><code><code>vtable 
i--tem example kbdinputstyle</code></code></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><code><kbd>vtable 
i--tem example kbdinputstyle</kbd></code></dt>
 </dl>
-<table><tr><td>&nbsp;</td><td><pre><code>in example example 
kbdinputstyle</code>
+<table><tr><td>&nbsp;</td><td><pre><kbd>in example example kbdinputstyle</kbd>
 </pre><dl>
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><code><code>vtable
 i--tem in example example kbdinputstyle</code></code></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><code><kbd>vtable
 i--tem in example example kbdinputstyle</kbd></code></dt>
 </dl>
 </td></tr></table>
 <pre>
diff --git 
a/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html 
b/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
index 177ae029c7..da4f6fbe85 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
@@ -1200,14 +1200,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -2276,14 +2276,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -3371,14 +3371,14 @@ error&rarr; &rarr; - -| &rArr;
 </div>
 <pre class="example-preformatted">
 
-<code class="code as-code-kbd">example kbdinputstyle</code>
+<kbd class="kbd">example kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&para;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem example 
kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&para;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&para;</a></span></dt>
 </dl>
 </div>
 <pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
index 3da664e225..e7184f4e30 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -1162,14 +1162,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -2238,14 +2238,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -3333,14 +3333,14 @@ error&rarr; &rarr; - -| &rArr;
 </div>
 <pre class="example-preformatted">
 
-<code class="code as-code-kbd">example kbdinputstyle</code>
+<kbd class="kbd">example kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&para;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem example 
kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&para;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&para;</a></span></dt>
 </dl>
 </div>
 <pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/index.html 
b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
index ac7f6a9216..09b499f72d 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
@@ -1135,14 +1135,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -2213,14 +2213,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
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 13f70ae76b..8d58214ec9 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
@@ -1108,14 +1108,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd" style="font-style: oblique">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd" style="font-style: oblique">vtable i--tem example 
kbdinputstyle</kbd><a class="copiable-link" style="visibility: hidden; 
text-decoration: none; line-height: 0em" 
href='#index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" 
href='#index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example" style="margin-left: 3.2em">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd" style="font-style: 
oblique">in example example kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd" style="font-style: 
oblique">vtable i--tem in example example kbdinputstyle</kbd></code><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" 
href='#index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -2186,14 +2186,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd" style="font-style: oblique">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd" style="font-style: oblique">vtable i--tem example 
kbdinputstyle</kbd><a class="copiable-link" style="visibility: hidden; 
text-decoration: none; line-height: 0em" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example" style="margin-left: 3.2em">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd" style="font-style: 
oblique">in example example kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd" style="font-style: 
oblique">vtable i--tem in example example kbdinputstyle</kbd></code><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -3320,14 +3320,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd" style="font-style: oblique">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd" style="font-style: oblique">vtable i--tem example 
kbdinputstyle</kbd><a class="copiable-link" style="visibility: hidden; 
text-decoration: none; line-height: 0em" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example" style="margin-left: 3.2em">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd" style="font-style: 
oblique">in example example kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd" style="font-style: 
oblique">vtable i--tem in example example kbdinputstyle</kbd></code><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -4396,14 +4396,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd" style="font-style: oblique">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd" style="font-style: oblique">vtable i--tem example 
kbdinputstyle</kbd><a class="copiable-link" style="visibility: hidden; 
text-decoration: none; line-height: 0em" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example" style="margin-left: 3.2em">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd" style="font-style: 
oblique">in example example kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><kbd class="kbd" style="font-style: 
oblique">vtable i--tem in example example kbdinputstyle</kbd></code><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -5491,14 +5491,14 @@ error&rarr; &rarr; - -| &rArr;
 </div>
 <pre class="example-preformatted">
 
-<code class="code as-code-kbd">example kbdinputstyle</code>
+<kbd class="kbd" style="font-style: oblique">example kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem example kbdinputstyle</code></code><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&para;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd" style="font-style: 
oblique">vtable i--tem example kbdinputstyle</kbd></code><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&para;</a></span></dt>
 </dl>
 <div class="example" style="margin-left: 3.2em">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd" style="font-style: 
oblique">in example example kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
style="visibility: hidden; text-decoration: none; line-height: 0em" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&para;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd" style="font-style: 
oblique">vtable i--tem in example example kbdinputstyle</kbd></code><a 
class="copiable-link" style="visibility: hidden; text-decoration: none; 
line-height: 0em" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&para;</a></span></dt>
 </dl>
 </div>
 <pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.tex 
b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
index d9d5a6d139..3f3b86c158 100644
--- a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
+++ b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
@@ -402,20 +402,20 @@ $$
 }}]
 \end{description}
 
-\GNUTexinfocommandstyletextkbd{example kbdinputstyle}
+\texttt{example kbdinputstyle}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem example kbdinputstyle}
+\texttt{vtable i{-}{-}tem example kbdinputstyle}
 \index[cp]{vtable i--tem example kbdinputstyle@\texttt{vtable i{-}{-}tem 
example kbdinputstyle}}%
 }}]
 \end{description}
 \begin{GNUTexinfopreformatted}
 \leftskip=2em\relax\ttfamily%
-\texttt{in example example kbdinputstyle}
+\GNUTexinfocommandstyletextkbd{in example example kbdinputstyle}
 \end{GNUTexinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\texttt{vtable i{-}{-}tem in example example kbdinputstyle}
+\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem in example example 
kbdinputstyle}
 \index[cp]{vtable i--tem in example example kbdinputstyle@\texttt{vtable 
i{-}{-}tem in example example kbdinputstyle}}%
 }}]
 \end{description}
@@ -2099,20 +2099,20 @@ $$
 }}]
 \end{description}
 
-\GNUTexinfocommandstyletextkbd{example kbdinputstyle}
+\texttt{example kbdinputstyle}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem example kbdinputstyle}
+\texttt{vtable i{-}{-}tem example kbdinputstyle}
 \index[cp]{vtable i--tem example kbdinputstyle@\texttt{vtable i{-}{-}tem 
example kbdinputstyle}}%
 }}]
 \end{description}
 \begin{GNUTexinfopreformatted}
 \leftskip=2em\relax\ttfamily%
-\texttt{in example example kbdinputstyle}
+\GNUTexinfocommandstyletextkbd{in example example kbdinputstyle}
 \end{GNUTexinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\texttt{vtable i{-}{-}tem in example example kbdinputstyle}
+\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem in example example 
kbdinputstyle}
 \index[cp]{vtable i--tem in example example kbdinputstyle@\texttt{vtable 
i{-}{-}tem in example example kbdinputstyle}}%
 }}]
 \end{description}
@@ -3817,20 +3817,20 @@ $$
 }}]
 \end{description}
 
-\GNUTexinfocommandstyletextkbd{example kbdinputstyle}
+\texttt{example kbdinputstyle}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem example kbdinputstyle}
+\texttt{vtable i{-}{-}tem example kbdinputstyle}
 \index[cp]{vtable i--tem example kbdinputstyle@\texttt{vtable i{-}{-}tem 
example kbdinputstyle}}%
 }}]
 \end{description}
 \begin{GNUTexinfopreformatted}
 \leftskip=2em\relax\ttfamily%
-\texttt{in example example kbdinputstyle}
+\GNUTexinfocommandstyletextkbd{in example example kbdinputstyle}
 \end{GNUTexinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\texttt{vtable i{-}{-}tem in example example kbdinputstyle}
+\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem in example example 
kbdinputstyle}
 \index[cp]{vtable i--tem in example example kbdinputstyle@\texttt{vtable 
i{-}{-}tem in example example kbdinputstyle}}%
 }}]
 \end{description}
@@ -5513,20 +5513,20 @@ $$
 }}]
 \end{description}
 
-\GNUTexinfocommandstyletextkbd{example kbdinputstyle}
+\texttt{example kbdinputstyle}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem example kbdinputstyle}
+\texttt{vtable i{-}{-}tem example kbdinputstyle}
 \index[cp]{vtable i--tem example kbdinputstyle@\texttt{vtable i{-}{-}tem 
example kbdinputstyle}}%
 }}]
 \end{description}
 \begin{GNUTexinfopreformatted}
 \leftskip=2em\relax\ttfamily%
-\texttt{in example example kbdinputstyle}
+\GNUTexinfocommandstyletextkbd{in example example kbdinputstyle}
 \end{GNUTexinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\texttt{vtable i{-}{-}tem in example example kbdinputstyle}
+\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem in example example 
kbdinputstyle}
 \index[cp]{vtable i--tem in example example kbdinputstyle@\texttt{vtable 
i{-}{-}tem in example example kbdinputstyle}}%
 }}]
 \end{description}
@@ -7250,11 +7250,11 @@ $$
 \begin{GNUTexinfopreformatted}
 \leftskip=2em\relax\ttfamily%
 
-\texttt{example kbdinputstyle}
+\GNUTexinfocommandstyletextkbd{example kbdinputstyle}
 \end{GNUTexinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\texttt{vtable i{-}{-}tem example kbdinputstyle}
+\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem example kbdinputstyle}
 \index[cp]{vtable i--tem example kbdinputstyle@\texttt{vtable i{-}{-}tem 
example kbdinputstyle}}%
 }}]
 \end{description}
@@ -7263,11 +7263,11 @@ $$
 \end{GNUTexinfopreformatted}
 \begin{GNUTexinfopreformatted}
 \leftskip=2em\relax\ttfamily%
-\texttt{in example example kbdinputstyle}
+\GNUTexinfocommandstyletextkbd{in example example kbdinputstyle}
 \end{GNUTexinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\texttt{vtable i{-}{-}tem in example example kbdinputstyle}
+\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem in example example 
kbdinputstyle}
 \index[cp]{vtable i--tem in example example kbdinputstyle@\texttt{vtable 
i{-}{-}tem in example example kbdinputstyle}}%
 }}]
 \end{description}
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html 
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index 04bc5a74f4..41f9a4d714 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -1154,14 +1154,14 @@ u
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -2230,14 +2230,14 @@ u
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -3362,14 +3362,14 @@ u
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -4436,14 +4436,14 @@ u
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -5529,14 +5529,14 @@ u
 </div>
 <pre class="example-preformatted">
 
-<code class="code as-code-kbd">example kbdinputstyle</code>
+<kbd class="kbd">example kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&para;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem example 
kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&para;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&para;</a></span></dt>
 </dl>
 </div>
 <pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter.html 
b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
index 3da664e225..e7184f4e30 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -1162,14 +1162,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -2238,14 +2238,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -3333,14 +3333,14 @@ error&rarr; &rarr; - -| &rArr;
 </div>
 <pre class="example-preformatted">
 
-<code class="code as-code-kbd">example kbdinputstyle</code>
+<kbd class="kbd">example kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&para;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem example 
kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&para;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&para;</a></span></dt>
 </dl>
 </div>
 <pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_nodes/index.html 
b/tp/tests/layout/res_parser/formatting_nodes/index.html
index ac7f6a9216..09b499f72d 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/index.html
@@ -1135,14 +1135,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -2213,14 +2213,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
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 1586c44fc9..546c00ffe4 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
@@ -1146,14 +1146,14 @@ error&#8594; &#8614; &#8722; &#8867; &#8658;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&#182;</a></span></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&#182;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&#182;</a></span></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&#182;</a></span></dt>
 </dl>
 </div>
 
@@ -2224,14 +2224,14 @@ error&#8594; &#8614; &#8722; &#8867; &#8658;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&#182;</a></span></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&#182;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&#182;</a></span></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&#182;</a></span></dt>
 </dl>
 </div>
 
@@ -3358,14 +3358,14 @@ error&#8594; &#8614; &#8722; &#8867; &#8658;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&#182;</a></span></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&#182;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&#182;</a></span></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&#182;</a></span></dt>
 </dl>
 </div>
 
@@ -4434,14 +4434,14 @@ error&#8594; &#8614; &#8722; &#8867; &#8658;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&#182;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&#182;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&#182;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&#182;</a></span></dt>
 </dl>
 </div>
 
@@ -5529,14 +5529,14 @@ error&#8594; &#8614; &#8722; &#8867; &#8658;
 </div>
 <pre class="example-preformatted">
 
-<code class="code as-code-kbd">example kbdinputstyle</code>
+<kbd class="kbd">example kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&#182;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem example 
kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&#182;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&#182;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&#182;</a></span></dt>
 </dl>
 </div>
 <pre class="example-preformatted">
diff --git 
a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html 
b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
index 98d89fb0a8..d6d4732589 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -1145,14 +1145,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -2222,14 +2222,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -3332,14 +3332,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -4426,14 +4426,14 @@ error&rarr; &rarr; - -| &rArr;
 </div>
 <pre class="example-preformatted">
 
-<code class="code as-code-kbd">example kbdinputstyle</code>
+<kbd class="kbd">example kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&para;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem example 
kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&para;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&para;</a></span></dt>
 </dl>
 </div>
 <pre class="example-preformatted">
@@ -5638,14 +5638,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
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 cc2be219bb..30a2b7ffbe 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -1146,14 +1146,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -2224,14 +2224,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -3358,14 +3358,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -4434,14 +4434,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -5529,14 +5529,14 @@ error&rarr; &rarr; - -| &rArr;
 </div>
 <pre class="example-preformatted">
 
-<code class="code as-code-kbd">example kbdinputstyle</code>
+<kbd class="kbd">example kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&para;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem example 
kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&para;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&para;</a></span></dt>
 </dl>
 </div>
 <pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html 
b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
index 3376df8abc..485224d6d9 100644
--- a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
@@ -1146,14 +1146,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-titlepage-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -2224,14 +2224,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -3358,14 +3358,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -4434,14 +4434,14 @@ error&rarr; &rarr; - -| &rArr;
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -5529,14 +5529,14 @@ error&rarr; &rarr; - -| &rArr;
 </div>
 <pre class="example-preformatted">
 
-<code class="code as-code-kbd">example kbdinputstyle</code>
+<kbd class="kbd">example kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&para;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem example 
kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&para;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&para;</a></span></dt>
 </dl>
 </div>
 <pre class="example-preformatted">
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html 
b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
index b9fdb54765..27110fc446 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
@@ -1271,14 +1271,14 @@ $">
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code
 class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-copying-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -2484,14 +2484,14 @@ $">
 </dl>
 </div>
 
-<p><kbd class="kbd">example kbdinputstyle</kbd>
+<p><code class="code as-code-kbd">example kbdinputstyle</code>
 </p><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><kbd 
class="kbd">vtable i--tem example kbdinputstyle</kbd><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle'><span><code 
class="code as-code-kbd">vtable i--tem example kbdinputstyle</code><a 
class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle'> 
&para;</a></span></dt>
 </dl>
 </div>
 
@@ -3716,14 +3716,14 @@ $">
 </div>
 <pre class="example-preformatted">
 
-<code class="code as-code-kbd">example kbdinputstyle</code>
+<kbd class="kbd">example kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&para;</a></span></dt>
+<dt id='index-vtable-i_002d_002dtem-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem example 
kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-example-kbdinputstyle-1'> 
&para;</a></span></dt>
 </dl>
 <div class="example">
-<pre class="example-preformatted"><code class="code as-code-kbd">in example 
example kbdinputstyle</code>
+<pre class="example-preformatted"><kbd class="kbd">in example example 
kbdinputstyle</kbd>
 </pre><dl class="vtable">
-<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><code class="code as-code-kbd">vtable 
i--tem in example example kbdinputstyle</code></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&para;</a></span></dt>
+<dt 
id='index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'><span><code 
class="table-term-preformatted-code"><kbd class="kbd">vtable i--tem in example 
example kbdinputstyle</kbd></code><a class="copiable-link" 
href='#index-vtable-i_002d_002dtem-in-example-example-kbdinputstyle-1'> 
&para;</a></span></dt>
 </dl>
 </div>
 <pre class="example-preformatted">



reply via email to

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